diff --git a/include/EGUIAlignment.h b/include/EGUIAlignment.h
index 85f81b4..4876503 100644
--- a/include/EGUIAlignment.h
+++ b/include/EGUIAlignment.h
@@ -5,6 +5,8 @@
 #ifndef __E_GUI_ALIGNMENT_H_INCLUDED__
 #define __E_GUI_ALIGNMENT_H_INCLUDED__
 
+#include "irrTypes.h"
+
 namespace irr
 {
 namespace gui
@@ -35,4 +37,3 @@ const c8* const GUIAlignmentNames[] =
 } // namespace irr
 
 #endif // __E_GUI_ALIGNMENT_H_INCLUDED__
-
diff --git a/include/IIndexBuffer.h b/include/IIndexBuffer.h
index 5599b0f..6aee1a1 100644
--- a/include/IIndexBuffer.h
+++ b/include/IIndexBuffer.h
@@ -7,7 +7,7 @@
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
-
+#include "EHardwareBufferFlags.h"
 #include "SVertexIndex.h"
 
 namespace irr
diff --git a/include/ILightManager.h b/include/ILightManager.h
index ff66798..297e981 100644
--- a/include/ILightManager.h
+++ b/include/ILightManager.h
@@ -8,12 +8,13 @@
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
+#include "ISceneManager.h" // for E_SCENE_NODE_RENDER_PASS, could probably move that to own header?
 
 namespace irr
 {
 namespace scene
 {
-	class ILightSceneNode;
+	class ISceneNode;
 
 	//! ILightManager provides an interface for user applications to manipulate the list of lights in the scene.
 	/** The light list can be trimmed or re-ordered before device/ hardware
diff --git a/include/IVertexBuffer.h b/include/IVertexBuffer.h
index 87603de..8467d7c 100644
--- a/include/IVertexBuffer.h
+++ b/include/IVertexBuffer.h
@@ -7,6 +7,7 @@
 
 #include "IReferenceCounted.h"
 #include "irrArray.h"
+#include "EHardwareBufferFlags.h"
 #include "S3DVertex.h"
 
 namespace irr
diff --git a/include/SLight.h b/include/SLight.h
index 60df5f6..8f72594 100644
--- a/include/SLight.h
+++ b/include/SLight.h
@@ -6,6 +6,7 @@
 #define __S_LIGHT_H_INCLUDED__
 
 #include "SColor.h"
+#include "vector3d.h"
 
 namespace irr
 {
@@ -98,4 +99,3 @@ struct SLight
 } // end namespace irr
 
 #endif
-
diff --git a/include/SVertexManipulator.h b/include/SVertexManipulator.h
index 3fda59d..3cb1477 100644
--- a/include/SVertexManipulator.h
+++ b/include/SVertexManipulator.h
@@ -5,6 +5,7 @@
 #ifndef __S_VERTEX_MANIPULATOR_H_INCLUDED__
 #define __S_VERTEX_MANIPULATOR_H_INCLUDED__
 
+#include "matrix4.h"
 #include "S3DVertex.h"
 #include "SColor.h"
 
diff --git a/include/SceneParameters.h b/include/SceneParameters.h
index 4e24690..6e2aace 100644
--- a/include/SceneParameters.h
+++ b/include/SceneParameters.h
@@ -5,6 +5,8 @@
 #ifndef __I_SCENE_PARAMETERS_H_INCLUDED__
 #define __I_SCENE_PARAMETERS_H_INCLUDED__
 
+#include "irrTypes.h"
+
 /*! \file SceneParameters.h
 	\brief Header file containing all scene parameters for modifying mesh loading etc.
 
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj b/source/Irrlicht/Irrlicht10.0.vcxproj
index 9426f97..7da2e07 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj
@@ -844,6 +844,7 @@
     <ClInclude Include="..\..\include\fast_atof.h" />
     <ClInclude Include="..\..\include\IAnimatedMeshMD3.h" />
     <ClInclude Include="..\..\include\IEventReceiver.h" />
+    <ClInclude Include="..\..\include\ILightManager.h" />
     <ClInclude Include="..\..\include\ILogger.h" />
     <ClInclude Include="..\..\include\IOctreeSceneNode.h" />
     <ClInclude Include="..\..\include\IOSOperator.h" />
@@ -896,6 +897,7 @@
     <ClInclude Include="..\..\include\rect.h" />
     <ClInclude Include="..\..\include\SOverrideMaterial.h" />
     <ClInclude Include="..\..\include\SSharedMeshBuffer.h" />
+    <ClInclude Include="..\..\include\SVertexManipulator.h" />
     <ClInclude Include="..\..\include\triangle3d.h" />
     <ClInclude Include="..\..\include\vector2d.h" />
     <ClInclude Include="..\..\include\vector3d.h" />
diff --git a/source/Irrlicht/Irrlicht10.0.vcxproj.filters b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
index 8122468..af995b0 100644
--- a/source/Irrlicht/Irrlicht10.0.vcxproj.filters
+++ b/source/Irrlicht/Irrlicht10.0.vcxproj.filters
@@ -1369,6 +1369,12 @@
     <ClInclude Include="..\..\include\fast_atof.h">
       <Filter>include\core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\ILightManager.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SVertexManipulator.h">
+      <Filter>include\scene</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\changes.txt">