diff --git a/source/Irrlicht/CColorConverter.cpp b/source/Irrlicht/CColorConverter.cpp
index f7c92f18..93dd19a1 100644
--- a/source/Irrlicht/CColorConverter.cpp
+++ b/source/Irrlicht/CColorConverter.cpp
@@ -3,9 +3,8 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CColorConverter.h"
-#include "SColor.h"
+#include "IImage.h"
 #include "os.h"
-#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CColorConverter.h b/source/Irrlicht/CColorConverter.h
index eaab9e14..37e189eb 100644
--- a/source/Irrlicht/CColorConverter.h
+++ b/source/Irrlicht/CColorConverter.h
@@ -6,7 +6,7 @@
 #define IRR_C_COLOR_CONVERTER_H_INCLUDED
 
 #include "irrTypes.h"
-#include "IImage.h"
+#include "SColor.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CImage.cpp b/source/Irrlicht/CImage.cpp
index a076a585..c69448a4 100644
--- a/source/Irrlicht/CImage.cpp
+++ b/source/Irrlicht/CImage.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CImage.h"
-#include "irrString.h"
 #include "CColorConverter.h"
 #include "CBlit.h"
 #include "os.h"
diff --git a/source/Irrlicht/CImageLoaderBMP.cpp b/source/Irrlicht/CImageLoaderBMP.cpp
index 4bb27af5..d91c844b 100644
--- a/source/Irrlicht/CImageLoaderBMP.cpp
+++ b/source/Irrlicht/CImageLoaderBMP.cpp
@@ -11,7 +11,6 @@
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "os.h"
-#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CImageLoaderDDS.cpp b/source/Irrlicht/CImageLoaderDDS.cpp
index 68e1164e..e48d7086 100644
--- a/source/Irrlicht/CImageLoaderDDS.cpp
+++ b/source/Irrlicht/CImageLoaderDDS.cpp
@@ -18,9 +18,7 @@
 
 #include "IReadFile.h"
 #include "os.h"
-#include "CColorConverter.h"
 #include "CImage.h"
-#include "irrString.h"
 
 // Header flag values
 #define DDSD_CAPS			0x00000001
@@ -721,9 +719,8 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
 
 		image = new CImage(ECF_A8R8G8B8, core::dimension2d<u32>(width, height));
 
-		if (DDSDecompress(&header, memFile, (u8*)image->lock()) == -1)
+		if (DDSDecompress(&header, memFile, (u8*)image->getData()) == -1)
 		{
-			image->unlock();
 			image->drop();
 			image = 0;
 		}
diff --git a/source/Irrlicht/CImageLoaderPCX.cpp b/source/Irrlicht/CImageLoaderPCX.cpp
index 1c594472..4f5c8f61 100644
--- a/source/Irrlicht/CImageLoaderPCX.cpp
+++ b/source/Irrlicht/CImageLoaderPCX.cpp
@@ -11,7 +11,6 @@
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "os.h"
-#include "irrString.h"
 
 
 namespace irr
diff --git a/source/Irrlicht/CImageLoaderPNG.cpp b/source/Irrlicht/CImageLoaderPNG.cpp
index 076871f3..6aacbb3f 100644
--- a/source/Irrlicht/CImageLoaderPNG.cpp
+++ b/source/Irrlicht/CImageLoaderPNG.cpp
@@ -15,7 +15,7 @@
 #endif // _IRR_COMPILE_WITH_LIBPNG_
 
 #include "CImage.h"
-#include "CReadFile.h"
+#include "IReadFile.h"
 #include "os.h"
 
 namespace irr
diff --git a/source/Irrlicht/CImageLoaderPSD.cpp b/source/Irrlicht/CImageLoaderPSD.cpp
index 00aadd69..b380b989 100644
--- a/source/Irrlicht/CImageLoaderPSD.cpp
+++ b/source/Irrlicht/CImageLoaderPSD.cpp
@@ -9,7 +9,6 @@
 #include "IReadFile.h"
 #include "os.h"
 #include "CImage.h"
-#include "irrString.h"
 
 
 namespace irr
diff --git a/source/Irrlicht/CImageLoaderPVR.cpp b/source/Irrlicht/CImageLoaderPVR.cpp
index ceae56fe..d565aea0 100644
--- a/source/Irrlicht/CImageLoaderPVR.cpp
+++ b/source/Irrlicht/CImageLoaderPVR.cpp
@@ -9,7 +9,6 @@
 #include "IReadFile.h"
 #include "os.h"
 #include "CImage.h"
-#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CImageLoaderRGB.cpp b/source/Irrlicht/CImageLoaderRGB.cpp
index dfb4b8b0..c516fd3c 100644
--- a/source/Irrlicht/CImageLoaderRGB.cpp
+++ b/source/Irrlicht/CImageLoaderRGB.cpp
@@ -130,7 +130,6 @@ DUMMY -		This 404 bytes of data should be set to 0. This makes the Header exactl
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "os.h"
-#include "irrString.h"
 
 
 namespace irr
diff --git a/source/Irrlicht/CImageLoaderTGA.cpp b/source/Irrlicht/CImageLoaderTGA.cpp
index 8d91bd08..b75f3243 100644
--- a/source/Irrlicht/CImageLoaderTGA.cpp
+++ b/source/Irrlicht/CImageLoaderTGA.cpp
@@ -10,7 +10,6 @@
 #include "os.h"
 #include "CColorConverter.h"
 #include "CImage.h"
-#include "irrString.h"
 
 
 namespace irr
diff --git a/source/Irrlicht/CImageLoaderWAL.cpp b/source/Irrlicht/CImageLoaderWAL.cpp
index cd210ded..219f9520 100644
--- a/source/Irrlicht/CImageLoaderWAL.cpp
+++ b/source/Irrlicht/CImageLoaderWAL.cpp
@@ -9,8 +9,6 @@
 #include "CImage.h"
 #include "os.h"
 #include "dimension2d.h"
-#include "IVideoDriver.h"
-#include "IFileSystem.h"
 #include "IReadFile.h"
 #include "irrString.h"
 
diff --git a/source/Irrlicht/CImageWriterBMP.cpp b/source/Irrlicht/CImageWriterBMP.cpp
index 04d39731..73838054 100644
--- a/source/Irrlicht/CImageWriterBMP.cpp
+++ b/source/Irrlicht/CImageWriterBMP.cpp
@@ -9,7 +9,6 @@
 #include "CImageLoaderBMP.h"
 #include "IWriteFile.h"
 #include "CColorConverter.h"
-#include "irrString.h"
 #include "os.h"
 
 namespace irr
diff --git a/source/Irrlicht/CImageWriterJPG.cpp b/source/Irrlicht/CImageWriterJPG.cpp
index 793aed22..4c937b83 100644
--- a/source/Irrlicht/CImageWriterJPG.cpp
+++ b/source/Irrlicht/CImageWriterJPG.cpp
@@ -8,8 +8,7 @@
 
 #include "CColorConverter.h"
 #include "IWriteFile.h"
-#include "CImage.h"
-#include "irrString.h"
+#include "IImage.h"
 #include "os.h"
 
 #ifdef _IRR_COMPILE_WITH_LIBJPEG_
diff --git a/source/Irrlicht/CImageWriterPCX.cpp b/source/Irrlicht/CImageWriterPCX.cpp
index 5ace3426..0edec0ec 100644
--- a/source/Irrlicht/CImageWriterPCX.cpp
+++ b/source/Irrlicht/CImageWriterPCX.cpp
@@ -6,10 +6,9 @@
 
 #ifdef _IRR_COMPILE_WITH_PCX_WRITER_
 
-#include "CImageLoaderPCX.h"
 #include "IWriteFile.h"
+#include "IImage.h"
 #include "os.h" // for logging
-#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CImageWriterPNG.cpp b/source/Irrlicht/CImageWriterPNG.cpp
index c08100f2..6dc1e6ff 100644
--- a/source/Irrlicht/CImageWriterPNG.cpp
+++ b/source/Irrlicht/CImageWriterPNG.cpp
@@ -6,10 +6,9 @@
 
 #ifdef _IRR_COMPILE_WITH_PNG_WRITER_
 
-#include "CImageLoaderPNG.h"
+#include "IImage.h"
 #include "CColorConverter.h"
 #include "IWriteFile.h"
-#include "irrString.h"
 #include "os.h" // for logging
 
 #ifdef _IRR_COMPILE_WITH_LIBPNG_
diff --git a/source/Irrlicht/CImageWriterPPM.cpp b/source/Irrlicht/CImageWriterPPM.cpp
index fd0db971..ed765925 100644
--- a/source/Irrlicht/CImageWriterPPM.cpp
+++ b/source/Irrlicht/CImageWriterPPM.cpp
@@ -9,7 +9,6 @@
 #include "IWriteFile.h"
 #include "IImage.h"
 #include "dimension2d.h"
-#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CImageWriterPSD.cpp b/source/Irrlicht/CImageWriterPSD.cpp
index 952eb0b3..cf0ce086 100644
--- a/source/Irrlicht/CImageWriterPSD.cpp
+++ b/source/Irrlicht/CImageWriterPSD.cpp
@@ -9,7 +9,6 @@
 #include "CImageLoaderPSD.h"
 #include "IWriteFile.h"
 #include "os.h" // for logging
-#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CImageWriterTGA.cpp b/source/Irrlicht/CImageWriterTGA.cpp
index 35f7afef..12a9662b 100644
--- a/source/Irrlicht/CImageWriterTGA.cpp
+++ b/source/Irrlicht/CImageWriterTGA.cpp
@@ -9,7 +9,6 @@
 #include "CImageLoaderTGA.h"
 #include "IWriteFile.h"
 #include "CColorConverter.h"
-#include "irrString.h"
 #include "os.h"
 
 namespace irr
diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h
index c367478a..caa169ae 100644
--- a/source/Irrlicht/CIrrDeviceWin32.h
+++ b/source/Irrlicht/CIrrDeviceWin32.h
@@ -9,7 +9,6 @@
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 
 #include "CIrrDeviceStub.h"
-#include "IImagePresenter.h"
 
 #define WIN32_LEAN_AND_MEAN
 #if !defined(_IRR_XBOX_PLATFORM_)
diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp
index dc439de5..dbb9dcfb 100644
--- a/source/Irrlicht/CNullDriver.cpp
+++ b/source/Irrlicht/CNullDriver.cpp
@@ -11,6 +11,7 @@
 #include "IImageLoader.h"
 #include "IImageWriter.h"
 #include "IMaterialRenderer.h"
+#include "IMeshSceneNode.h"
 #include "IAnimatedMeshSceneNode.h"
 #include "CMeshManipulator.h"
 #include "CColorConverter.h"
diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index 2851a41b..1570ee5d 100644
--- a/source/Irrlicht/CNullDriver.h
+++ b/source/Irrlicht/CNullDriver.h
@@ -7,7 +7,6 @@
 
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
-#include "IImagePresenter.h"
 #include "IGPUProgrammingServices.h"
 #include "irrArray.h"
 #include "irrString.h"
diff --git a/source/Irrlicht/COpenGLCacheHandler.h b/source/Irrlicht/COpenGLCacheHandler.h
index 54365ba4..9472e8b4 100644
--- a/source/Irrlicht/COpenGLCacheHandler.h
+++ b/source/Irrlicht/COpenGLCacheHandler.h
@@ -11,8 +11,6 @@
 
 #include "COpenGLCommon.h"
 
-#include "COpenGLCoreFeature.h"
-#include "COpenGLCoreTexture.h"
 #include "COpenGLCoreCacheHandler.h"
 
 namespace irr
diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h
index 7173f248..6a3eb822 100644
--- a/source/Irrlicht/COpenGLCoreCacheHandler.h
+++ b/source/Irrlicht/COpenGLCoreCacheHandler.h
@@ -9,6 +9,8 @@
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
+#include "COpenGLCoreFeature.h"
+#include "COpenGLCoreTexture.h"
 #include "SMaterial.h"
 #include "ITexture.h"
 
diff --git a/source/Irrlicht/COpenGLNormalMapRenderer.cpp b/source/Irrlicht/COpenGLNormalMapRenderer.cpp
index 5bbad4f0..d6591fc7 100644
--- a/source/Irrlicht/COpenGLNormalMapRenderer.cpp
+++ b/source/Irrlicht/COpenGLNormalMapRenderer.cpp
@@ -6,8 +6,6 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
-#include "IShaderConstantSetCallBack.h"
 #include "IVideoDriver.h"
 #include "os.h"
 
diff --git a/source/Irrlicht/COpenGLParallaxMapRenderer.cpp b/source/Irrlicht/COpenGLParallaxMapRenderer.cpp
index d0edb742..cc33bf15 100644
--- a/source/Irrlicht/COpenGLParallaxMapRenderer.cpp
+++ b/source/Irrlicht/COpenGLParallaxMapRenderer.cpp
@@ -6,8 +6,6 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
-#include "IShaderConstantSetCallBack.h"
 #include "IVideoDriver.h"
 #include "os.h"
 
diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.cpp b/source/Irrlicht/COpenGLSLMaterialRenderer.cpp
index 6dcb369d..6cae88d9 100644
--- a/source/Irrlicht/COpenGLSLMaterialRenderer.cpp
+++ b/source/Irrlicht/COpenGLSLMaterialRenderer.cpp
@@ -14,7 +14,6 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
 #include "IShaderConstantSetCallBack.h"
 #include "IMaterialRendererServices.h"
 #include "IVideoDriver.h"
@@ -22,7 +21,6 @@
 
 #include "COpenGLDriver.h"
 #include "COpenGLCacheHandler.h"
-#include "COpenGLMaterialRenderer.h"
 
 #include "COpenGLCoreFeature.h"
 
diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp b/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp
index 1dabd311..ef5d10cd 100644
--- a/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp
+++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.cpp
@@ -6,14 +6,12 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
 #include "IShaderConstantSetCallBack.h"
 #include "IVideoDriver.h"
 #include "os.h"
 
 #include "COpenGLDriver.h"
 #include "COpenGLCacheHandler.h"
-#include "COpenGLMaterialRenderer.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CSoftwareDriver.cpp b/source/Irrlicht/CSoftwareDriver.cpp
index 426aac29..eb2d5b7e 100644
--- a/source/Irrlicht/CSoftwareDriver.cpp
+++ b/source/Irrlicht/CSoftwareDriver.cpp
@@ -11,6 +11,7 @@
 #include "CBlit.h"
 #include "os.h"
 #include "S3DVertex.h"
+#include "SViewFrustum.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CSoftwareDriver.h b/source/Irrlicht/CSoftwareDriver.h
index c51eb29b..d121b072 100644
--- a/source/Irrlicht/CSoftwareDriver.h
+++ b/source/Irrlicht/CSoftwareDriver.h
@@ -6,8 +6,8 @@
 #define IRR_C_SOFTWARE_DRIVER_H_INCLUDED
 
 #include "ITriangleRenderer.h"
+#include "IImagePresenter.h"
 #include "CNullDriver.h"
-#include "SViewFrustum.h"
 #include "CImage.h"
 
 namespace irr
diff --git a/source/Irrlicht/CSoftwareDriver2.h b/source/Irrlicht/CSoftwareDriver2.h
index 01ae8127..1716200a 100644
--- a/source/Irrlicht/CSoftwareDriver2.h
+++ b/source/Irrlicht/CSoftwareDriver2.h
@@ -7,6 +7,7 @@
 
 #include "SoftwareDriver2_compile_config.h"
 #include "IBurningShader.h"
+#include "IImagePresenter.h"
 #include "CNullDriver.h"
 #include "CImage.h"
 #include "os.h"