diff --git a/src/modules/graphic/osggraph/Car/OsgCar.cpp b/src/modules/graphic/osggraph/Car/OsgCar.cpp
index 38330605f..c2c5e059e 100644
--- a/src/modules/graphic/osggraph/Car/OsgCar.cpp
+++ b/src/modules/graphic/osggraph/Car/OsgCar.cpp
@@ -45,6 +45,8 @@
 #include "OsgShader.h"
 #include "OsgReflectionMapping.h"
 #include "OsgNodeMask.h"
+#include <car.h>
+#include <raceman.h>
 
 namespace osggraph {
 
diff --git a/src/modules/graphic/osggraph/Car/OsgCar.h b/src/modules/graphic/osggraph/Car/OsgCar.h
index f0d9d4821..ec83f82a7 100644
--- a/src/modules/graphic/osggraph/Car/OsgCar.h
+++ b/src/modules/graphic/osggraph/Car/OsgCar.h
@@ -19,17 +19,19 @@
 #ifndef _OSGCAR_H_
 #define _OSGCAR_H_
 
-#include <car.h>
-#include <raceman.h>
 #include <vector>
 
 #include <osg/TextureCubeMap>
 #include <osg/LOD>
 
+#include "OsgLoader.h"
 #include "OsgWheel.h"
 //#include "OsgBackFire.h"
 #include "OsgCarLight.h"
 
+struct CarElt;
+typedef struct CarElt tCarElt;
+
 namespace osggraph {
 
 class SDCarShader;
diff --git a/src/modules/graphic/osggraph/OsgMain.cpp b/src/modules/graphic/osggraph/OsgMain.cpp
index 1d1bbefef..1722bc645 100644
--- a/src/modules/graphic/osggraph/OsgMain.cpp
+++ b/src/modules/graphic/osggraph/OsgMain.cpp
@@ -38,6 +38,8 @@
 #include "OsgHUD.h"
 #include "OsgParticles.h"
 
+#include <raceman.h>	//tSituation
+
 namespace osggraph {
 
 //extern	osg::Timer m_timer;
diff --git a/src/modules/graphic/osggraph/OsgMain.h b/src/modules/graphic/osggraph/OsgMain.h
index 59ab06343..86abfe288 100644
--- a/src/modules/graphic/osggraph/OsgMain.h
+++ b/src/modules/graphic/osggraph/OsgMain.h
@@ -21,7 +21,11 @@
 
 #include <camera.h>
 #include <graphic.h>
-#include <raceman.h>	//tSituation
+#include <track.h>
+#include <tgf.h>
+
+struct Situation;
+typedef struct Situation tSituation;
 
 namespace osggraph {
 
diff --git a/src/modules/graphic/osggraph/Viewer/OsgCamera.cpp b/src/modules/graphic/osggraph/Viewer/OsgCamera.cpp
index 0c8d55d0d..48a49f379 100644
--- a/src/modules/graphic/osggraph/Viewer/OsgCamera.cpp
+++ b/src/modules/graphic/osggraph/Viewer/OsgCamera.cpp
@@ -24,6 +24,12 @@
 #include <osg/Matrix>
 #include <osg/ValueObject>
 
+#include "OsgCamera.h"
+#include "OsgView.h"
+#include "OsgScenery.h"
+#include "OsgMain.h"
+#include "OsgNodeMask.h"
+
 #include <car.h>
 #include <raceman.h>
 #include <robottools.h>
@@ -32,12 +38,6 @@
 #include <guiscreen.h>
 #include <graphic.h>
 
-#include "OsgCamera.h"
-#include "OsgView.h"
-#include "OsgScenery.h"
-#include "OsgMain.h"
-#include "OsgNodeMask.h"
-
 namespace osggraph {
 
 static char path[1024];
@@ -2621,4 +2621,3 @@ void SDCameras::loadSpanValues()
 }
 
 } // namespace osggraph
-
diff --git a/src/modules/graphic/osggraph/Viewer/OsgCamera.h b/src/modules/graphic/osggraph/Viewer/OsgCamera.h
index 96e767deb..d6c5dbfb4 100644
--- a/src/modules/graphic/osggraph/Viewer/OsgCamera.h
+++ b/src/modules/graphic/osggraph/Viewer/OsgCamera.h
@@ -20,9 +20,15 @@
 #define _OSGCAMERA_H_
 
 #include <osg/Vec3>
+#include <tgf.h>
 #include <vector>
 #include <camera.h>
 
+struct CarElt;
+struct Situation;
+typedef struct CarElt tCarElt;
+typedef struct Situation tSituation;
+
 namespace osggraph {
 
 #define GR_ZOOM_IN 	0
diff --git a/src/modules/graphic/osggraph/Viewer/OsgScreens.cpp b/src/modules/graphic/osggraph/Viewer/OsgScreens.cpp
index b6f798621..91717ab8b 100644
--- a/src/modules/graphic/osggraph/Viewer/OsgScreens.cpp
+++ b/src/modules/graphic/osggraph/Viewer/OsgScreens.cpp
@@ -38,6 +38,7 @@
 #include "OsgMain.h"
 #include "OsgCar.h"
 #include "OsgHUD.h"
+#include <raceman.h>        //tSituation
 
 namespace osggraph {
 
diff --git a/src/modules/graphic/osggraph/Viewer/OsgScreens.h b/src/modules/graphic/osggraph/Viewer/OsgScreens.h
index ce329ea31..fdf52330a 100644
--- a/src/modules/graphic/osggraph/Viewer/OsgScreens.h
+++ b/src/modules/graphic/osggraph/Viewer/OsgScreens.h
@@ -18,13 +18,15 @@
 #ifndef _OSGSCREENS_H_
 #define _OSGSCREENS_H_
 
-#include <raceman.h>        //tSituation
 #include <vector>
 
 #include <osg/Group>
 
 #include "OsgView.h"
 
+struct Situation;
+typedef struct Situation tSituation;
+
 namespace osggraph {
 
 class SDDebugHUD;
diff --git a/src/modules/graphic/osggraph/Viewer/OsgView.cpp b/src/modules/graphic/osggraph/Viewer/OsgView.cpp
index 21d9ef857..6968f6a41 100644
--- a/src/modules/graphic/osggraph/Viewer/OsgView.cpp
+++ b/src/modules/graphic/osggraph/Viewer/OsgView.cpp
@@ -30,6 +30,9 @@
 #include "OsgCar.h"
 #include "OsgNodeMask.h"
 
+#include <raceman.h>        	//tSituation
+#include <car.h>		//tCarElt
+
 namespace osggraph {
 
 static char buf[1024];
diff --git a/src/modules/graphic/osggraph/Viewer/OsgView.h b/src/modules/graphic/osggraph/Viewer/OsgView.h
index 5d1ccf4b1..69ccaa0d3 100644
--- a/src/modules/graphic/osggraph/Viewer/OsgView.h
+++ b/src/modules/graphic/osggraph/Viewer/OsgView.h
@@ -19,13 +19,16 @@
 #define _OSGVIEWER_H_
 
 #include <camera.h>
-#include <raceman.h>        	//tSituation
-#include <car.h>		//tCarElt
 
 #include "OsgCamera.h"		//SDCameras
 
 #include <osg/FrontFace>
 
+struct Situation;
+struct CarElt;
+typedef struct CarElt tCarElt;
+typedef struct Situation tSituation;
+
 namespace osggraph {
 
 class SDFrameInfo;