Index: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc	(revision 10818)
@@ -142,5 +142,5 @@
     }
 
-    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
 
Index: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h	(revision 10818)
@@ -70,4 +70,6 @@
             virtual void updateLevel();
 
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+
             float speed, damping, posforeward;
             bool isFireing;
@@ -77,5 +79,4 @@
 
         private:
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             DodgeRace* getGame();
             WeakPtr<DodgeRace> game;
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc	(revision 10818)
@@ -64,5 +64,5 @@
     }
 
-    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         if(orxonox_cast<InvaderShip*>(otherObject))
Index: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h	(revision 10818)
@@ -47,5 +47,5 @@
 
             virtual void tick(float dt) override;
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
             virtual void setPlayer(InvaderShip* player){this->player = player;}
Index: code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc	(revision 10818)
@@ -148,5 +148,5 @@
                 getGame()->end();
     }
-    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
Index: code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.h	(revision 10818)
@@ -64,5 +64,5 @@
             virtual void updateLevel();
 
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
         protected:
Index: code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc	(revision 10818)
@@ -28,4 +28,5 @@
 
 #include "TeamTargetProxy.h"
+#include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"
Index: code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc	(revision 10818)
@@ -30,4 +30,6 @@
 #include "worldentities/pawns/Pawn.h"
 #include "objects/Turret.h"
+#include "core/object/ObjectList.h"
+#include "core/CoreIncludes.h"
 
  namespace orxonox
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc	(revision 10818)
@@ -55,5 +55,5 @@
     }
 
-    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
         Pawn::damage(damage, healthdamage, shielddamage, originator);
Index: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h	(revision 10817)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h	(revision 10818)
@@ -38,5 +38,5 @@
 
         virtual void tick(float dt) override;
-        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
 
     private:
