Index: code/branches/libraries2/src/modules/objects/Attacher.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Attacher.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/Attacher.h	(revision 5735)
@@ -35,5 +35,5 @@
 #include <string>
 #include "core/XMLNameListener.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/ForceField.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/ForceField.cc	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/ForceField.cc	(revision 5735)
@@ -31,5 +31,5 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/worldentities/MobileEntity.h"
+#include "worldentities/MobileEntity.h"
 
 namespace orxonox
@@ -53,5 +53,5 @@
     {
         SUPER(ForceField, XMLPort, xmlelement, mode);
- 
+
         //For correct xml import use: position, direction, velocity, scale
         XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);
Index: code/branches/libraries2/src/modules/objects/ForceField.h
===================================================================
--- code/branches/libraries2/src/modules/objects/ForceField.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/ForceField.h	(revision 5735)
@@ -34,5 +34,5 @@
 
 #include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/Planet.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.cc	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/Planet.cc	(revision 5735)
@@ -36,6 +36,6 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
-#include "objects/worldentities/Camera.h"
+#include "Scene.h"
+#include "worldentities/Camera.h"
 #include "CameraManager.h"
 
Index: code/branches/libraries2/src/modules/objects/Planet.h
===================================================================
--- code/branches/libraries2/src/modules/objects/Planet.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/Planet.h	(revision 5735)
@@ -35,5 +35,5 @@
 #include "tools/BillboardSet.h"
 #include "tools/Mesh.h"
-#include "objects/worldentities/MovableEntity.h"
+#include "worldentities/MovableEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h	(revision 5735)
@@ -33,5 +33,5 @@
 
 #include "util/Math.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h	(revision 5735)
@@ -31,5 +31,5 @@
 
 #include "objects/ObjectsPrereqs.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h	(revision 5735)
@@ -33,5 +33,5 @@
 
 #include "util/Math.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h
===================================================================
--- code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h	(revision 5735)
@@ -31,5 +31,5 @@
 
 #include "objects/ObjectsPrereqs.h"
-#include "objects/collisionshapes/CollisionShape.h"
+#include "collisionshapes/CollisionShape.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/triggers/CheckPoint.cc	(revision 5735)
@@ -31,6 +31,6 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/gametypes/Asteroids.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "gametypes/Asteroids.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc	(revision 5735)
@@ -31,5 +31,5 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/Trigger.cc	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/triggers/Trigger.cc	(revision 5735)
@@ -33,5 +33,5 @@
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
-#include "objects/Scene.h"
+#include "Scene.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/objects/triggers/Trigger.h
===================================================================
--- code/branches/libraries2/src/modules/objects/triggers/Trigger.h	(revision 5730)
+++ code/branches/libraries2/src/modules/objects/triggers/Trigger.h	(revision 5735)
@@ -37,5 +37,5 @@
 #include "tools/BillboardSet.h"
 #include "tools/interfaces/Tickable.h"
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
