diff --git a/test/BtPhysTest.cpp b/test/BtPhysTest.cpp
index 6d863a49..4cc3e96c 100644
--- a/test/BtPhysTest.cpp
+++ b/test/BtPhysTest.cpp
@@ -104,7 +104,7 @@ BtPhysTest::BtPhysTest(bool editor)
 			NewPhyobj->SetTransform(NewPosition, NewRotation);
 			Ticker::Ref(NewPhyobj);
 			m_ground_list << NewPhyobj;
-		}
+		}	
 	}
 
 	if (USE_PLATFORM)
diff --git a/test/Physics/Include/EasyCharacterController.h b/test/Physics/Include/EasyCharacterController.h
index 0af018e1..66cd6531 100644
--- a/test/Physics/Include/EasyCharacterController.h
+++ b/test/Physics/Include/EasyCharacterController.h
@@ -18,9 +18,8 @@
 #define __EASYCHARACTERCONTROLLER_EASYCHARACTERCONTROLLER_H__
 
 #ifdef HAVE_PHYS_USE_BULLET
-#include "core.h"
-#include "EasyPhysics.h"
 #include <BulletDynamics/Character/btKinematicCharacterController.h>
+#include "EasyPhysics.h"
 #endif
 
 namespace lol
diff --git a/test/Physics/Include/EasyConstraint.h b/test/Physics/Include/EasyConstraint.h
index 9e376d84..1a356685 100644
--- a/test/Physics/Include/EasyConstraint.h
+++ b/test/Physics/Include/EasyConstraint.h
@@ -18,7 +18,6 @@
 #define __EASYCONSTRAINT_EASYCONSTRAINT_H__
 
 #ifdef HAVE_PHYS_USE_BULLET
-#include "core.h"
 #include "EasyPhysics.h"
 #endif
 
diff --git a/test/Physics/Include/EasyPhysics.h b/test/Physics/Include/EasyPhysics.h
index 2cd770ae..04ff9137 100644
--- a/test/Physics/Include/EasyPhysics.h
+++ b/test/Physics/Include/EasyPhysics.h
@@ -19,9 +19,7 @@
 
 #ifdef HAVE_PHYS_USE_BULLET
 #include "core.h"
-#include <bullet/btBulletDynamicsCommon.h>
-#include <bullet/btBulletCollisionCommon.h>
-#include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
+#include "LolPhysics.h"
 #endif
 
 namespace lol
diff --git a/test/Physics/Include/LolPhysics.h b/test/Physics/Include/LolPhysics.h
index 745969c4..a5eddccd 100644
--- a/test/Physics/Include/LolPhysics.h
+++ b/test/Physics/Include/LolPhysics.h
@@ -11,9 +11,8 @@
 #ifdef HAVE_PHYS_USE_BULLET
 #include <bullet/btBulletDynamicsCommon.h>
 #include <bullet/btBulletCollisionCommon.h>
+#include <bullet/BulletCollision/CollisionDispatch/btGhostObject.h>
 #include "LolBtPhysicsIntegration.h"
-#include "EasyPhysics.h"
-#include "EasyConstraint.h"
 #endif
 
 namespace lol
diff --git a/test/Physics/Src/EasyCharacterController.cpp b/test/Physics/Src/EasyCharacterController.cpp
index d0221f19..dbdde39e 100644
--- a/test/Physics/Src/EasyCharacterController.cpp
+++ b/test/Physics/Src/EasyCharacterController.cpp
@@ -14,9 +14,9 @@
 #   include "config.h"
 #endif
 
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
+#ifdef HAVE_PHYS_USE_BULLET
 #include "../Include/EasyCharacterController.h"
+#endif //HAVE_PHYS_USE_BULLET
 
 namespace lol
 {
diff --git a/test/Physics/Src/EasyConstraint.cpp b/test/Physics/Src/EasyConstraint.cpp
index fea878a4..dc35354f 100644
--- a/test/Physics/Src/EasyConstraint.cpp
+++ b/test/Physics/Src/EasyConstraint.cpp
@@ -1,6 +1,22 @@
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
+//
+// Lol Engine
+//
+// Copyright: (c) 2010-2012 Sam Hocevar <sam@hocevar.net>
+//            (c) 2009-2012 Cédric Lecacheur <jordx@free.fr>
+//            (c) 2009-2012 Benjamin Huet <huet.benjamin@gmail.com>
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the Do What The Fuck You Want To
+//   Public License, Version 2, as published by Sam Hocevar. See
+//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
+//
+
+#if defined HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
+#ifdef HAVE_PHYS_USE_BULLET
 #include "../Include/EasyConstraint.h"
+#endif //HAVE_PHYS_USE_BULLET
 
 namespace lol
 {
diff --git a/test/Physics/Src/EasyPhysics.cpp b/test/Physics/Src/EasyPhysics.cpp
index 077a048a..7f23625a 100644
--- a/test/Physics/Src/EasyPhysics.cpp
+++ b/test/Physics/Src/EasyPhysics.cpp
@@ -14,8 +14,9 @@
 #   include "config.h"
 #endif
 
-#include "../Include/LolBtPhysicsIntegration.h"
-#include "../Include/LolPhysics.h"
+#ifdef HAVE_PHYS_USE_BULLET
+#include "../Include/EasyPhysics.h"
+#endif // HAVE_PHYS_USE_BULLET
 
 namespace lol
 {