Index: orxonox/trunk/src/lib/graphics/graphics_engine.h
===================================================================
--- orxonox/trunk/src/lib/graphics/graphics_engine.h	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/graphics_engine.h	(revision 4381)
@@ -10,8 +10,10 @@
 #define _GRAPHICS_ENGINE_H
 
-#include "glincl.h"
 #include "base_object.h"
 
+#include "sdlincl.h"
+#include "glincl.h"
 
+// Forward Declaration
 class Text;
 
Index: orxonox/trunk/src/lib/graphics/importer/texture.h
===================================================================
--- orxonox/trunk/src/lib/graphics/importer/texture.h	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/importer/texture.h	(revision 4381)
@@ -10,4 +10,5 @@
 #define _TEXTURE_H
 
+#include "sdlincl.h"
 #include "glincl.h"
 
Index: orxonox/trunk/src/lib/graphics/light.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/light.cc	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/light.cc	(revision 4381)
@@ -22,4 +22,5 @@
 #include "glincl.h"
 #include "vector.h"
+#include "debug.h"
 
 using namespace std;
Index: orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc	(revision 4381)
@@ -20,4 +20,7 @@
 #include "particle_system.h"
 #include "particle_engine.h"
+
+#include "debug.h"
+#include "stdlibincl.h"
 
 using namespace std;
Index: orxonox/trunk/src/lib/graphics/particles/particle_emitter.h
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_emitter.h	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/particles/particle_emitter.h	(revision 4381)
@@ -1,4 +1,4 @@
 /*! 
-    \file particle_e,otter.h
+    \file particle_emitter.h
     \brief Definition of a ParticleEmitter
 */
@@ -19,5 +19,5 @@
 			   EMITTER_CUBE  = 8};
 
-//! A default singleton class.
+//! A class to handle an Emitter.
 class ParticleEmitter : public PNode {
 
Index: orxonox/trunk/src/lib/graphics/particles/particle_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_engine.cc	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/particles/particle_engine.cc	(revision 4381)
@@ -22,4 +22,6 @@
 
 #include "list.h"
+#include "debug.h"
+#include "stdlibincl.h"
 
 using namespace std;
Index: orxonox/trunk/src/lib/graphics/particles/particle_system.h
===================================================================
--- orxonox/trunk/src/lib/graphics/particles/particle_system.h	(revision 4378)
+++ orxonox/trunk/src/lib/graphics/particles/particle_system.h	(revision 4381)
@@ -10,4 +10,5 @@
 #include "physics_interface.h"
 
+#include "glincl.h"
 #include "vector.h"
 
Index: orxonox/trunk/src/lib/gui/gui/gui_video.cc
===================================================================
--- orxonox/trunk/src/lib/gui/gui/gui_video.cc	(revision 4378)
+++ orxonox/trunk/src/lib/gui/gui/gui_video.cc	(revision 4381)
@@ -28,5 +28,5 @@
 
 #include "gui_gtk.h"
-#include "glincl.h"
+#include "sdlincl.h"
 #include <stdlib.h>
 
Index: orxonox/trunk/src/lib/lang/base_object.h
===================================================================
--- orxonox/trunk/src/lib/lang/base_object.h	(revision 4378)
+++ orxonox/trunk/src/lib/lang/base_object.h	(revision 4381)
@@ -8,5 +8,4 @@
 #define _BASE_OBJECT_H
 
-#include "stdincl.h"
 #include "class_list.h"
 
Index: orxonox/trunk/src/lib/physics/physics_connection.h
===================================================================
--- orxonox/trunk/src/lib/physics/physics_connection.h	(revision 4378)
+++ orxonox/trunk/src/lib/physics/physics_connection.h	(revision 4381)
@@ -7,4 +7,5 @@
 #define _PHYSICS_CONNECTION_H
 
+#include "base_object.h"
 // Forward Declaration
 class PhysicsInterface;
@@ -20,5 +21,6 @@
 
 //! A class that Handles Physical Connection between subjects
-class PhysicsConnection {
+class PhysicsConnection : virtual public BaseObject
+{
 
  public:
Index: orxonox/trunk/src/lib/physics/physics_engine.cc
===================================================================
--- orxonox/trunk/src/lib/physics/physics_engine.cc	(revision 4378)
+++ orxonox/trunk/src/lib/physics/physics_engine.cc	(revision 4381)
@@ -14,7 +14,9 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
 
 #include "physics_engine.h"
+
+#include "debug.h"
 
 #include "list.h"
Index: orxonox/trunk/src/lib/util/ini_parser.cc
===================================================================
--- orxonox/trunk/src/lib/util/ini_parser.cc	(revision 4378)
+++ orxonox/trunk/src/lib/util/ini_parser.cc	(revision 4381)
@@ -16,5 +16,7 @@
 
 #include "ini_parser.h"
+
 #include "resource_manager.h"
+#include "debug.h"
 
 using namespace std;
