diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h
index d6803c6..b754c87 100644
--- a/include/IVideoDriver.h
+++ b/include/IVideoDriver.h
@@ -13,12 +13,13 @@
 #include "plane3d.h"
 #include "dimension2d.h"
 #include "position2d.h"
-#include "IMeshBuffer.h"
 #include "triangle3d.h"
 #include "EDriverTypes.h"
 #include "EDriverFeatures.h"
+#include "EPrimitiveTypes.h"
 #include "SExposedVideoData.h"
-#include "SOverrideMaterial.h"
+#include "S3DVertex.h"
+#include "SVertexIndex.h"
 
 namespace irr
 {
@@ -43,6 +44,8 @@ namespace video
 	struct S3DVertex2TCoords;
 	struct S3DVertexTangents;
 	struct SLight;
+	struct SOverrideMaterial;
+	class SMaterial;
 	class IImageLoader;
 	class IImageWriter;
 	class IMaterialRenderer;
diff --git a/include/irrlicht.h b/include/irrlicht.h
index 3c00a4b..8d0f696 100644
--- a/include/irrlicht.h
+++ b/include/irrlicht.h
@@ -179,6 +179,7 @@
 #include "SKeyMap.h"
 #include "SLight.h"
 #include "SMaterial.h"
+#include "SOverrideMaterial.h"
 #include "SMesh.h"
 #include "SMeshBuffer.h"
 #include "SMeshBufferLightMap.h"
diff --git a/source/Irrlicht/CGUIMeshViewer.cpp b/source/Irrlicht/CGUIMeshViewer.cpp
index fa310f8..f513298 100644
--- a/source/Irrlicht/CGUIMeshViewer.cpp
+++ b/source/Irrlicht/CGUIMeshViewer.cpp
@@ -9,6 +9,7 @@
 #include "IVideoDriver.h"
 #include "IAnimatedMesh.h"
 #include "IMesh.h"
+#include "IMeshBuffer.h"
 #include "os.h"
 #include "IGUISkin.h"
 
diff --git a/source/Irrlicht/CIrrMeshWriter.cpp b/source/Irrlicht/CIrrMeshWriter.cpp
index cb33fe9..cc62a90 100644
--- a/source/Irrlicht/CIrrMeshWriter.cpp
+++ b/source/Irrlicht/CIrrMeshWriter.cpp
@@ -11,6 +11,7 @@
 #include "IWriteFile.h"
 #include "IXMLWriter.h"
 #include "IMesh.h"
+#include "IMeshBuffer.h"
 #include "IAttributes.h"
 
 namespace irr
diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index a799aa6..2851a41 100644
--- a/source/Irrlicht/CNullDriver.h
+++ b/source/Irrlicht/CNullDriver.h
@@ -21,6 +21,7 @@
 #include "SVertexIndex.h"
 #include "SLight.h"
 #include "SExposedVideoData.h"
+#include "SOverrideMaterial.h"
 
 #ifdef _MSC_VER
 #pragma warning( disable: 4996)
diff --git a/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp b/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp
index c054991..52f7dcd 100644
--- a/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp
+++ b/source/Irrlicht/CParticleAnimatedMeshSceneNodeEmitter.cpp
@@ -5,6 +5,7 @@
 #include "CParticleAnimatedMeshSceneNodeEmitter.h"
 #include "IAnimatedMeshSceneNode.h"
 #include "IMesh.h"
+#include "IMeshBuffer.h"
 #include "os.h"
 
 namespace irr
diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index 9084274..6255cfe 100644
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -7,6 +7,7 @@
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
 #include "SAnimatedMesh.h"
+#include "SOverrideMaterial.h"
 #include "CMeshCache.h"
 #include "IXMLWriter.h"
 #include "ISceneUserDataSerializer.h"