Index: code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/AmmunitionDump.cc	(revision 1039)
@@ -27,4 +27,5 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "AmmunitionDump.h"
 
 #include "orxonox/Orxonox.h"
@@ -32,6 +33,4 @@
 #include "util/tinyxml/tinyxml.h"
 #include "core/CoreIncludes.h"
-
-#include "AmmunitionDump.h"
 
 
Index: code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/AmmunitionDump.h	(revision 1039)
@@ -30,9 +30,9 @@
 #define _AmmunitionDump_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"
Index: code/trunk/src/orxonox/objects/weapon/BarrelGun.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BarrelGun.cc	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/BarrelGun.cc	(revision 1039)
@@ -27,4 +27,5 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BarrelGun.h"
 
 #include <OgreStringConverter.h>
@@ -39,6 +40,4 @@
 #include "BaseWeapon.h"
 #include "core/CoreIncludes.h"
-
-#include "BarrelGun.h"
 
 
Index: code/trunk/src/orxonox/objects/weapon/BarrelGun.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BarrelGun.h	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/BarrelGun.h	(revision 1039)
@@ -30,7 +30,7 @@
 #define _BarrelGun_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "BaseWeapon.h"
Index: code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc	(revision 1039)
@@ -27,4 +27,5 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BaseWeapon.h"
 
 #include <OgreStringConverter.h>
@@ -39,6 +40,4 @@
 #include "AmmunitionDump.h"
 #include "core/CoreIncludes.h"
-
-#include "BaseWeapon.h"
 
 
Index: code/trunk/src/orxonox/objects/weapon/BaseWeapon.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BaseWeapon.h	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/BaseWeapon.h	(revision 1039)
@@ -30,7 +30,7 @@
 #define _BaseWeapon_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "../Model.h"
Index: code/trunk/src/orxonox/objects/weapon/Bullet.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/Bullet.cc	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/Bullet.cc	(revision 1039)
@@ -27,7 +27,8 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Bullet.h"
+
 #include "core/CoreIncludes.h"
 
-#include "Bullet.h"
 
 namespace orxonox {
Index: code/trunk/src/orxonox/objects/weapon/Bullet.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/Bullet.h	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/Bullet.h	(revision 1039)
@@ -30,7 +30,7 @@
 #define _Bullet_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "../Model.h"
Index: code/trunk/src/orxonox/objects/weapon/BulletManager.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BulletManager.cc	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/BulletManager.cc	(revision 1039)
@@ -27,6 +27,6 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "BulletManager.h"
 
-#include "BulletManager.h"
 #include "Bullet.h"
 #include "core/CoreIncludes.h"
Index: code/trunk/src/orxonox/objects/weapon/BulletManager.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/BulletManager.h	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/BulletManager.h	(revision 1039)
@@ -30,9 +30,9 @@
 #define _BulletManager_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <string>
 
 #include <OgrePrerequisites.h>
-
-#include "../../OrxonoxPrereqs.h"
 
 #include "network/Synchronisable.h"
Index: code/trunk/src/orxonox/objects/weapon/WeaponStation.cc
===================================================================
--- code/trunk/src/orxonox/objects/weapon/WeaponStation.cc	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/WeaponStation.cc	(revision 1039)
@@ -27,7 +27,7 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "WeaponStation.h"
 
 #include "BaseWeapon.h"
-#include "WeaponStation.h"
 
 
Index: code/trunk/src/orxonox/objects/weapon/WeaponStation.h
===================================================================
--- code/trunk/src/orxonox/objects/weapon/WeaponStation.h	(revision 1032)
+++ code/trunk/src/orxonox/objects/weapon/WeaponStation.h	(revision 1039)
@@ -32,5 +32,5 @@
 #include <OgrePrerequisites.h>
 
-#include "../../OrxonoxPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 
