Index: code/branches/cpp11_v2/src/modules/invader/Invader.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.cc	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.cc	(revision 10733)
@@ -129,4 +129,9 @@
     }
 
+    void Invader::setCenterpoint(InvaderCenterPoint* center)
+    {
+        this->center_ = center;
+    }
+
     void Invader::costLife()
     {
Index: code/branches/cpp11_v2/src/modules/invader/Invader.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.h	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.h	(revision 10733)
@@ -39,7 +39,4 @@
 
 #include "gametypes/Deathmatch.h"
-
-#include "InvaderCenterPoint.h"
-
 #include "tools/Timer.h"
 
@@ -58,6 +55,5 @@
             void spawnEnemy();
 
-            void setCenterpoint(InvaderCenterPoint* center)
-            { this->center_ = center; }
+            void setCenterpoint(InvaderCenterPoint* center);
 
             int getLives(){return this->lives;}
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc	(revision 10733)
@@ -32,6 +32,8 @@
 */
 
-#include "invader/InvaderPrereqs.h"
 #include "InvaderEnemy.h"
+
+#include "core/CoreIncludes.h"
+#include "Invader.h"
 #include "InvaderShip.h"
 
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10733)
@@ -37,5 +37,5 @@
 #include "invader/InvaderPrereqs.h"
 
-#include "worldentities/pawns/SpaceShip.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc	(revision 10733)
@@ -32,7 +32,10 @@
 */
 
-#include "invader/InvaderPrereqs.h"
 #include "InvaderEnemyShooter.h"
-// #include "worldentities/pawns/SpaceShip.h"
+
+#include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "Invader.h"
+#include "InvaderShip.h"
 
 namespace orxonox
Index: code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc	(revision 10733)
@@ -30,5 +30,5 @@
 #include "core/XMLPort.h"
 #include "util/Convert.h"
-// #include "Invader.h"
+#include "Invader.h"
 
 namespace orxonox
Index: code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc	(revision 10733)
@@ -37,4 +37,7 @@
 #include "core/XMLPort.h"
 #include "Invader.h"
+#include "InvaderEnemy.h"
+#include "graphics/Camera.h"
+#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -139,4 +142,10 @@
         isFireing = bBoost;
     }
+    void InvaderShip::rotateRoll(const Vector2& value)
+    {
+        if (getGame())
+            if (getGame()->bEndGame)
+                getGame()->end();
+    }
     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
Index: code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10733)
@@ -37,7 +37,6 @@
 #include "invader/InvaderPrereqs.h"
 
+#include "weapons/WeaponsPrereqs.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "graphics/Camera.h"
-#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -61,5 +60,5 @@
             virtual void rotatePitch(const Vector2& value){};
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+            virtual void rotateRoll(const Vector2& value);
 
             virtual void updateLevel();
Index: code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h	(revision 10733)
@@ -35,8 +35,8 @@
 #define _InvaderWeapon_H__
 
+#include "invader/InvaderPrereqs.h"
+
+#include "weapons/WeaponsPrereqs.h"
 #include "weapons/weaponmodes/HsW01.h"
-#include "weapons/WeaponsPrereqs.h"
-
-#include "tools/Timer.h"
 
 namespace orxonox
Index: code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.cc	(revision 10733)
@@ -34,4 +34,7 @@
 #include "InvaderWeaponEnemy.h"
 
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/Projectile.h"
+
 namespace orxonox
 {
Index: code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h	(revision 10732)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h	(revision 10733)
@@ -35,7 +35,7 @@
 #define _InvaderWeaponEnemy_H__
 
-// #include "weapons/weaponmodes/HsW01.h"
-// #include "weapons/WeaponsPrereqs.h"
-#include "invader/InvaderWeapon.h"
+#include "invader/InvaderPrereqs.h"
+
+#include "InvaderWeapon.h"
 #include "tools/Timer.h"
 
