diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h
index c47f3e69..bad56e3d 100644
--- a/include/SIrrCreationParameters.h
+++ b/include/SIrrCreationParameters.h
@@ -11,7 +11,7 @@
 #include "ILogger.h"
 #include "position2d.h"
 #include "path.h"
-#include "IrrCompileConfig.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_SDK_VERSION
 
 namespace irr
 {
diff --git a/include/SMaterial.h b/include/SMaterial.h
index 92dc822a..88460e00 100644
--- a/include/SMaterial.h
+++ b/include/SMaterial.h
@@ -12,6 +12,7 @@
 #include "EMaterialTypes.h"
 #include "EMaterialFlags.h"
 #include "SMaterialLayer.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
 
 namespace irr
 {
diff --git a/include/exampleHelper.h b/include/exampleHelper.h
index 803ed6ee..a98ed960 100755
--- a/include/exampleHelper.h
+++ b/include/exampleHelper.h
@@ -5,7 +5,6 @@
 #ifndef __EXAMPLE_HELPER_H_INCLUDED__
 #define __EXAMPLE_HELPER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "path.h"
 
 namespace irr
diff --git a/include/irrMath.h b/include/irrMath.h
index af00f440..c4e86190 100644
--- a/include/irrMath.h
+++ b/include/irrMath.h
@@ -5,7 +5,6 @@
 #ifndef __IRR_MATH_H_INCLUDED__
 #define __IRR_MATH_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "irrTypes.h"
 #include <math.h>
 #include <float.h>
diff --git a/include/irrTypes.h b/include/irrTypes.h
index eda3a21c..98b1ed6d 100644
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -5,7 +5,6 @@
 #ifndef __IRR_TYPES_H_INCLUDED__
 #define __IRR_TYPES_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include <stdint.h>
 
 namespace irr
diff --git a/include/irrlicht.h b/include/irrlicht.h
index 065ed60a..e099cf79 100644
--- a/include/irrlicht.h
+++ b/include/irrlicht.h
@@ -29,7 +29,6 @@
 #ifndef __IRRLICHT_H_INCLUDED__
 #define __IRRLICHT_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "aabbox3d.h"
 #include "CIndexBuffer.h"
 #include "CMeshBuffer.h"
@@ -135,6 +134,7 @@
 #include "triangle3d.h"
 #include "vector2d.h"
 #include "vector3d.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API and IRRCALLCONV
 
 /*! \mainpage Irrlicht Engine 1.9 API documentation
  *
diff --git a/include/matrix4.h b/include/matrix4.h
index c4109737..efd353de 100644
--- a/include/matrix4.h
+++ b/include/matrix4.h
@@ -12,6 +12,7 @@
 #include "aabbox3d.h"
 #include "rect.h"
 #include "irrString.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
 
 // enable this to keep track of changes to the matrix
 // and make simpler identity check for seldom changing matrices
diff --git a/include/mt_opengl.h b/include/mt_opengl.h
index e7876cf9..7b76cd98 100755
--- a/include/mt_opengl.h
+++ b/include/mt_opengl.h
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <unordered_set>
-#include "IrrCompileConfig.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
 #include "irrTypes.h"
 #include "IContextManager.h"
 #include <KHR/khrplatform.h>
diff --git a/scripts/BindingGenerator.lua b/scripts/BindingGenerator.lua
index 0774cdd6..ba777489 100755
--- a/scripts/BindingGenerator.lua
+++ b/scripts/BindingGenerator.lua
@@ -349,7 +349,7 @@ f:write[[
 
 #include <string>
 #include <unordered_set>
-#include "IrrCompileConfig.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_API
 #include "irrTypes.h"
 #include "IContextManager.h"
 #include <KHR/khrplatform.h>
diff --git a/source/Irrlicht/Android/CAndroidAssetFileArchive.cpp b/source/Irrlicht/Android/CAndroidAssetFileArchive.cpp
index 53d06f8c..f5c02d16 100644
--- a/source/Irrlicht/Android/CAndroidAssetFileArchive.cpp
+++ b/source/Irrlicht/Android/CAndroidAssetFileArchive.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #ifdef   _IRR_COMPILE_ANDROID_ASSET_READER_
 
diff --git a/source/Irrlicht/Android/CAndroidAssetFileArchive.h b/source/Irrlicht/Android/CAndroidAssetFileArchive.h
index 7d7ab351..24a62f05 100644
--- a/source/Irrlicht/Android/CAndroidAssetFileArchive.h
+++ b/source/Irrlicht/Android/CAndroidAssetFileArchive.h
@@ -6,7 +6,6 @@
 #define __C_ANDROID_ASSET_FILE_ARCHIVE_H_INCLUDED__
 
 
-#include "IrrCompileConfig.h"
 
 #ifdef  _IRR_COMPILE_ANDROID_ASSET_READER_
 
diff --git a/source/Irrlicht/Android/CAndroidAssetReader.cpp b/source/Irrlicht/Android/CAndroidAssetReader.cpp
index ef1529be..55383e28 100644
--- a/source/Irrlicht/Android/CAndroidAssetReader.cpp
+++ b/source/Irrlicht/Android/CAndroidAssetReader.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #ifdef   _IRR_COMPILE_ANDROID_ASSET_READER_
 
diff --git a/source/Irrlicht/Android/CAndroidAssetReader.h b/source/Irrlicht/Android/CAndroidAssetReader.h
index c9d96a54..7791a771 100644
--- a/source/Irrlicht/Android/CAndroidAssetReader.h
+++ b/source/Irrlicht/Android/CAndroidAssetReader.h
@@ -6,7 +6,6 @@
 #define __C_ANDROID_ASSET_READER_H_INCLUDED__
 
 
-#include "IrrCompileConfig.h"
 
 #ifdef  _IRR_COMPILE_ANDROID_ASSET_READER_
 
diff --git a/source/Irrlicht/Android/CIrrDeviceAndroid.h b/source/Irrlicht/Android/CIrrDeviceAndroid.h
index a1f13c3a..4a3cd953 100644
--- a/source/Irrlicht/Android/CIrrDeviceAndroid.h
+++ b/source/Irrlicht/Android/CIrrDeviceAndroid.h
@@ -5,7 +5,6 @@
 #ifndef __C_IRR_DEVICE_ANDROID_H_INCLUDED__
 #define __C_IRR_DEVICE_ANDROID_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
 
diff --git a/source/Irrlicht/Android/CKeyEventWrapper.h b/source/Irrlicht/Android/CKeyEventWrapper.h
index bac23ad6..b6bc09bf 100644
--- a/source/Irrlicht/Android/CKeyEventWrapper.h
+++ b/source/Irrlicht/Android/CKeyEventWrapper.h
@@ -4,7 +4,6 @@
 #ifndef __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
 #define __C_IRR_KEY_EVENT_WRAPPER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_
 
diff --git a/source/Irrlicht/BuiltInFont.h b/source/Irrlicht/BuiltInFont.h
index be3a7f93..5d88937d 100644
--- a/source/Irrlicht/BuiltInFont.h
+++ b/source/Irrlicht/BuiltInFont.h
@@ -5,7 +5,6 @@
 #ifndef __BUILD_IN_FONT_H_INCLUDED__
 #define __BUILD_IN_FONT_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 // header file generated by Bin2H, copyright 2002 by N.Gebhardt.
 // Bin2H is Freeware. Download it freely from www.code3d.com.
diff --git a/source/Irrlicht/CAttributes.h b/source/Irrlicht/CAttributes.h
index 7156b8ee..3d881156 100644
--- a/source/Irrlicht/CAttributes.h
+++ b/source/Irrlicht/CAttributes.h
@@ -5,7 +5,6 @@
 #ifndef __C_ATTRIBUTES_H_INCLUDED__
 #define __C_ATTRIBUTES_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IAttributes.h"
 #include "IAttribute.h"
diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp
index 83ec3736..448030ba 100644
--- a/source/Irrlicht/CB3DMeshFileLoader.cpp
+++ b/source/Irrlicht/CB3DMeshFileLoader.cpp
@@ -6,7 +6,6 @@
 // File format designed by Mark Sibly for the Blitz3D engine and has been
 // declared public domain
 
-#include "IrrCompileConfig.h"
 #include "CB3DMeshFileLoader.h"
 
 #include "IVideoDriver.h"
diff --git a/source/Irrlicht/CB3DMeshFileLoader.h b/source/Irrlicht/CB3DMeshFileLoader.h
index 765405f7..d19f190e 100644
--- a/source/Irrlicht/CB3DMeshFileLoader.h
+++ b/source/Irrlicht/CB3DMeshFileLoader.h
@@ -6,7 +6,6 @@
 // File format designed by Mark Sibly for the Blitz3D engine and has been
 // declared public domain
 
-#include "IrrCompileConfig.h"
 
 #ifndef __C_B3D_MESH_LOADER_H_INCLUDED__
 #define __C_B3D_MESH_LOADER_H_INCLUDED__
diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp
index 0b588fc0..ac68f77e 100644
--- a/source/Irrlicht/CB3DMeshWriter.cpp
+++ b/source/Irrlicht/CB3DMeshWriter.cpp
@@ -4,7 +4,6 @@
 
 // TODO: replace printf's by logging messages
 
-#include "IrrCompileConfig.h"
 
 #include "CB3DMeshWriter.h"
 #include "os.h"
diff --git a/source/Irrlicht/CBillboardSceneNode.cpp b/source/Irrlicht/CBillboardSceneNode.cpp
index c297978e..da90c3a1 100644
--- a/source/Irrlicht/CBillboardSceneNode.cpp
+++ b/source/Irrlicht/CBillboardSceneNode.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "CBillboardSceneNode.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
diff --git a/source/Irrlicht/CBoneSceneNode.cpp b/source/Irrlicht/CBoneSceneNode.cpp
index 4f05b842..3d0f812b 100644
--- a/source/Irrlicht/CBoneSceneNode.cpp
+++ b/source/Irrlicht/CBoneSceneNode.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "CBoneSceneNode.h"
 
 namespace irr
diff --git a/source/Irrlicht/CEAGLManager.h b/source/Irrlicht/CEAGLManager.h
index c1f88455..65caa7aa 100644
--- a/source/Irrlicht/CEAGLManager.h
+++ b/source/Irrlicht/CEAGLManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_EAGL_MANAGER_H_INCLUDED__
 #define __C_EAGL_MANAGER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_EAGL_MANAGER_
 
diff --git a/source/Irrlicht/CEGLManager.h b/source/Irrlicht/CEGLManager.h
index 2d61bd2c..78e96c88 100755
--- a/source/Irrlicht/CEGLManager.h
+++ b/source/Irrlicht/CEGLManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_EGL_MANAGER_H_INCLUDED__
 #define __C_EGL_MANAGER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_EGL_MANAGER_
 
diff --git a/source/Irrlicht/CFileList.cpp b/source/Irrlicht/CFileList.cpp
index 15d5410e..720b8bb5 100644
--- a/source/Irrlicht/CFileList.cpp
+++ b/source/Irrlicht/CFileList.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CFileList.h"
-#include "IrrCompileConfig.h"
 #include "irrArray.h"
 #include "coreutil.h"
 
diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index 17ae7b33..ba4a332c 100644
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #include "CFileSystem.h"
 #include "IReadFile.h"
diff --git a/source/Irrlicht/CGLXManager.h b/source/Irrlicht/CGLXManager.h
index 85c3c94d..9e4ce74e 100644
--- a/source/Irrlicht/CGLXManager.h
+++ b/source/Irrlicht/CGLXManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_GLX_MANAGER_H_INCLUDED__
 #define __C_GLX_MANAGER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_GLX_MANAGER_
 
diff --git a/source/Irrlicht/CGUIButton.h b/source/Irrlicht/CGUIButton.h
index 6c718b1a..0e429573 100644
--- a/source/Irrlicht/CGUIButton.h
+++ b/source/Irrlicht/CGUIButton.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_BUTTON_H_INCLUDED__
 #define __C_GUI_BUTTON_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIButton.h"
 #include "IGUISpriteBank.h"
 #include "ITexture.h"
diff --git a/source/Irrlicht/CGUICheckBox.h b/source/Irrlicht/CGUICheckBox.h
index facbfb05..8319243e 100644
--- a/source/Irrlicht/CGUICheckBox.h
+++ b/source/Irrlicht/CGUICheckBox.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_CHECKBOX_H_INCLUDED__
 #define __C_GUI_CHECKBOX_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUICheckBox.h"
 
 namespace irr
diff --git a/source/Irrlicht/CGUIComboBox.h b/source/Irrlicht/CGUIComboBox.h
index 13996f0d..2dab66f1 100644
--- a/source/Irrlicht/CGUIComboBox.h
+++ b/source/Irrlicht/CGUIComboBox.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_COMBO_BOX_H_INCLUDED__
 #define __C_GUI_COMBO_BOX_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIComboBox.h"
 #include "IGUIStaticText.h"
 #include "irrString.h"
diff --git a/source/Irrlicht/CGUIEditBox.h b/source/Irrlicht/CGUIEditBox.h
index 0626fec4..4a1b6e8f 100644
--- a/source/Irrlicht/CGUIEditBox.h
+++ b/source/Irrlicht/CGUIEditBox.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_EDIT_BOX_H_INCLUDED__
 #define __C_GUI_EDIT_BOX_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIEditBox.h"
 #include "irrArray.h"
 #include "IOSOperator.h"
diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h
index 2a6097c0..f68b0daf 100644
--- a/source/Irrlicht/CGUIEnvironment.h
+++ b/source/Irrlicht/CGUIEnvironment.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_ENVIRONMENT_H_INCLUDED__
 #define __C_GUI_ENVIRONMENT_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIEnvironment.h"
 #include "IGUIElement.h"
 #include "irrArray.h"
diff --git a/source/Irrlicht/CGUIFileOpenDialog.h b/source/Irrlicht/CGUIFileOpenDialog.h
index c51f6049..a1d633c4 100644
--- a/source/Irrlicht/CGUIFileOpenDialog.h
+++ b/source/Irrlicht/CGUIFileOpenDialog.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
 #define __C_GUI_FILE_OPEN_DIALOG_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIFileOpenDialog.h"
 #include "IGUIButton.h"
 #include "IGUIListBox.h"
diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h
index c7b93374..449df086 100644
--- a/source/Irrlicht/CGUIFont.h
+++ b/source/Irrlicht/CGUIFont.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_FONT_H_INCLUDED__
 #define __C_GUI_FONT_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIFontBitmap.h"
 #include "irrString.h"
 #include "IReadFile.h"
diff --git a/source/Irrlicht/CGUIImage.h b/source/Irrlicht/CGUIImage.h
index 37d0abc6..c8a46f26 100644
--- a/source/Irrlicht/CGUIImage.h
+++ b/source/Irrlicht/CGUIImage.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_IMAGE_H_INCLUDED__
 #define __C_GUI_IMAGE_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIImage.h"
 
 namespace irr
diff --git a/source/Irrlicht/CGUIListBox.h b/source/Irrlicht/CGUIListBox.h
index a615ed4e..a3e7255a 100644
--- a/source/Irrlicht/CGUIListBox.h
+++ b/source/Irrlicht/CGUIListBox.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_LIST_BOX_H_INCLUDED__
 #define __C_GUI_LIST_BOX_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIListBox.h"
 #include "irrArray.h"
 
diff --git a/source/Irrlicht/CGUIScrollBar.h b/source/Irrlicht/CGUIScrollBar.h
index 1a6d6837..d1d04b89 100644
--- a/source/Irrlicht/CGUIScrollBar.h
+++ b/source/Irrlicht/CGUIScrollBar.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_SCROLL_BAR_H_INCLUDED__
 #define __C_GUI_SCROLL_BAR_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIScrollBar.h"
 #include "IGUIButton.h"
 
diff --git a/source/Irrlicht/CGUISkin.h b/source/Irrlicht/CGUISkin.h
index 436124b6..d6f8ef8f 100644
--- a/source/Irrlicht/CGUISkin.h
+++ b/source/Irrlicht/CGUISkin.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_SKIN_H_INCLUDED__
 #define __C_GUI_SKIN_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUISkin.h"
 #include "irrString.h"
 
diff --git a/source/Irrlicht/CGUISpriteBank.h b/source/Irrlicht/CGUISpriteBank.h
index 2a324a70..affd6bfd 100644
--- a/source/Irrlicht/CGUISpriteBank.h
+++ b/source/Irrlicht/CGUISpriteBank.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_SPRITE_BANK_H_INCLUDED__
 #define __C_GUI_SPRITE_BANK_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUISpriteBank.h"
 
 namespace irr
diff --git a/source/Irrlicht/CGUIStaticText.h b/source/Irrlicht/CGUIStaticText.h
index 41045d0a..8e1babe9 100644
--- a/source/Irrlicht/CGUIStaticText.h
+++ b/source/Irrlicht/CGUIStaticText.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__
 #define __C_GUI_STATIC_TEXT_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUIStaticText.h"
 #include "irrArray.h"
 
diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h
index 5bca2b64..4c2a0549 100644
--- a/source/Irrlicht/CGUITabControl.h
+++ b/source/Irrlicht/CGUITabControl.h
@@ -5,7 +5,6 @@
 #ifndef __C_GUI_TAB_CONTROL_H_INCLUDED__
 #define __C_GUI_TAB_CONTROL_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #include "IGUITabControl.h"
 #include "irrArray.h"
 #include "IGUISkin.h"
diff --git a/source/Irrlicht/CImageLoaderBMP.h b/source/Irrlicht/CImageLoaderBMP.h
index 6217f1b2..1f944032 100644
--- a/source/Irrlicht/CImageLoaderBMP.h
+++ b/source/Irrlicht/CImageLoaderBMP.h
@@ -5,7 +5,6 @@
 #ifndef __C_IMAGE_LOADER_BMP_H_INCLUDED__
 #define __C_IMAGE_LOADER_BMP_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IImageLoader.h"
 
diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h
index 7e727a38..03163941 100644
--- a/source/Irrlicht/CImageLoaderJPG.h
+++ b/source/Irrlicht/CImageLoaderJPG.h
@@ -5,7 +5,6 @@
 #ifndef __C_IMAGE_LOADER_JPG_H_INCLUDED__
 #define __C_IMAGE_LOADER_JPG_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IImageLoader.h"
 
diff --git a/source/Irrlicht/CImageLoaderPNG.h b/source/Irrlicht/CImageLoaderPNG.h
index ed135db9..45a37fd3 100644
--- a/source/Irrlicht/CImageLoaderPNG.h
+++ b/source/Irrlicht/CImageLoaderPNG.h
@@ -9,7 +9,6 @@
 #ifndef __C_IMAGE_LOADER_PNG_H_INCLUDED__
 #define __C_IMAGE_LOADER_PNG_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IImageLoader.h"
 
diff --git a/source/Irrlicht/CImageLoaderTGA.h b/source/Irrlicht/CImageLoaderTGA.h
index f31c6825..4e675793 100644
--- a/source/Irrlicht/CImageLoaderTGA.h
+++ b/source/Irrlicht/CImageLoaderTGA.h
@@ -5,7 +5,6 @@
 #ifndef __C_IMAGE_LOADER_TGA_H_INCLUDED__
 #define __C_IMAGE_LOADER_TGA_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IImageLoader.h"
 
diff --git a/source/Irrlicht/CImageWriterJPG.h b/source/Irrlicht/CImageWriterJPG.h
index facf67d2..dd98e913 100644
--- a/source/Irrlicht/CImageWriterJPG.h
+++ b/source/Irrlicht/CImageWriterJPG.h
@@ -5,7 +5,6 @@
 #ifndef _C_IMAGE_WRITER_JPG_H_INCLUDED__
 #define _C_IMAGE_WRITER_JPG_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IImageWriter.h"
 
diff --git a/source/Irrlicht/CImageWriterPNG.h b/source/Irrlicht/CImageWriterPNG.h
index 4d6619f5..181d0c50 100644
--- a/source/Irrlicht/CImageWriterPNG.h
+++ b/source/Irrlicht/CImageWriterPNG.h
@@ -5,7 +5,6 @@
 #ifndef _C_IMAGE_WRITER_PNG_H_INCLUDED__
 #define _C_IMAGE_WRITER_PNG_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IImageWriter.h"
 
diff --git a/source/Irrlicht/CIrrDeviceLinux.h b/source/Irrlicht/CIrrDeviceLinux.h
index c456a1a7..45d3f10c 100644
--- a/source/Irrlicht/CIrrDeviceLinux.h
+++ b/source/Irrlicht/CIrrDeviceLinux.h
@@ -5,7 +5,6 @@
 #ifndef __C_IRR_DEVICE_LINUX_H_INCLUDED__
 #define __C_IRR_DEVICE_LINUX_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_X11_DEVICE_
 
diff --git a/source/Irrlicht/CIrrDeviceOSX.h b/source/Irrlicht/CIrrDeviceOSX.h
index b8cdb42b..d1b2049e 100644
--- a/source/Irrlicht/CIrrDeviceOSX.h
+++ b/source/Irrlicht/CIrrDeviceOSX.h
@@ -6,7 +6,6 @@
 #ifndef __C_IRR_DEVICE_OSX_H_INCLUDED__
 #define __C_IRR_DEVICE_OSX_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
diff --git a/source/Irrlicht/CIrrDeviceOSX.mm b/source/Irrlicht/CIrrDeviceOSX.mm
index e3b2a9ab..4069cf19 100644
--- a/source/Irrlicht/CIrrDeviceOSX.mm
+++ b/source/Irrlicht/CIrrDeviceOSX.mm
@@ -4,7 +4,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
 
diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp
index 23f00d25..8dee4d1f 100644
--- a/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
 
diff --git a/source/Irrlicht/CIrrDeviceSDL.h b/source/Irrlicht/CIrrDeviceSDL.h
index 7657718f..4dbb2e76 100644
--- a/source/Irrlicht/CIrrDeviceSDL.h
+++ b/source/Irrlicht/CIrrDeviceSDL.h
@@ -7,7 +7,6 @@
 #ifndef __C_IRR_DEVICE_SDL_H_INCLUDED__
 #define __C_IRR_DEVICE_SDL_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
 
diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp
index 16028c8c..92cda75d 100644
--- a/source/Irrlicht/CIrrDeviceStub.cpp
+++ b/source/Irrlicht/CIrrDeviceStub.cpp
@@ -9,10 +9,10 @@
 #include "IGUIElement.h"
 #include "IGUIEnvironment.h"
 #include "os.h"
-#include "IrrCompileConfig.h"
 #include "CTimer.h"
 #include "CLogger.h"
 #include "irrString.h"
+#include "IrrCompileConfig.h" // for IRRLICHT_SDK_VERSION
 
 namespace irr
 {
diff --git a/source/Irrlicht/CIrrDeviceWin32.cpp b/source/Irrlicht/CIrrDeviceWin32.cpp
index ddff014b..1033f9ed 100644
--- a/source/Irrlicht/CIrrDeviceWin32.cpp
+++ b/source/Irrlicht/CIrrDeviceWin32.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 
diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h
index 4af8d027..9ca44acc 100644
--- a/source/Irrlicht/CIrrDeviceWin32.h
+++ b/source/Irrlicht/CIrrDeviceWin32.h
@@ -5,7 +5,6 @@
 #ifndef __C_IRR_DEVICE_WIN32_H_INCLUDED__
 #define __C_IRR_DEVICE_WIN32_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 
 #include "CIrrDeviceStub.h"
diff --git a/source/Irrlicht/CIrrDeviceiOS.h b/source/Irrlicht/CIrrDeviceiOS.h
index d383c182..6130d275 100644
--- a/source/Irrlicht/CIrrDeviceiOS.h
+++ b/source/Irrlicht/CIrrDeviceiOS.h
@@ -7,7 +7,6 @@
 #ifndef __C_IRR_DEVICE_IOS_H_INCLUDED__
 #define __C_IRR_DEVICE_IOS_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_IOS_DEVICE_
 
diff --git a/source/Irrlicht/CNSOGLManager.h b/source/Irrlicht/CNSOGLManager.h
index efe0b421..8744d16e 100644
--- a/source/Irrlicht/CNSOGLManager.h
+++ b/source/Irrlicht/CNSOGLManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_NSOGL_MANAGER_H_INCLUDED__
 #define __C_NSOGL_MANAGER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_NSOGL_MANAGER_
 
diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp
index 11fa484a..c4be102d 100644
--- a/source/Irrlicht/COBJMeshFileLoader.cpp
+++ b/source/Irrlicht/COBJMeshFileLoader.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "COBJMeshFileLoader.h"
 #include "IMeshManipulator.h"
 #include "IVideoDriver.h"
diff --git a/source/Irrlicht/COGLES2Common.h b/source/Irrlicht/COGLES2Common.h
index 2c844ce3..a69f6674 100644
--- a/source/Irrlicht/COGLES2Common.h
+++ b/source/Irrlicht/COGLES2Common.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES2_COMMON_H_INCLUDED__
 #define __C_OGLES2_COMMON_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
diff --git a/source/Irrlicht/COGLES2Driver.h b/source/Irrlicht/COGLES2Driver.h
index 8d31ff63..eaf4d99f 100644
--- a/source/Irrlicht/COGLES2Driver.h
+++ b/source/Irrlicht/COGLES2Driver.h
@@ -6,7 +6,6 @@
 #ifndef __C_OGLES2_DRIVER_H_INCLUDED__
 #define __C_OGLES2_DRIVER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "SIrrCreationParameters.h"
 
diff --git a/source/Irrlicht/COGLES2ExtensionHandler.h b/source/Irrlicht/COGLES2ExtensionHandler.h
index 2e81b373..73db08a8 100644
--- a/source/Irrlicht/COGLES2ExtensionHandler.h
+++ b/source/Irrlicht/COGLES2ExtensionHandler.h
@@ -6,7 +6,6 @@
 #ifndef __C_OGLES2_EXTENSION_HANDLER_H_INCLUDED__
 #define __C_OGLES2_EXTENSION_HANDLER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
diff --git a/source/Irrlicht/COGLES2FixedPipelineRenderer.h b/source/Irrlicht/COGLES2FixedPipelineRenderer.h
index f5882f17..b50ef74e 100644
--- a/source/Irrlicht/COGLES2FixedPipelineRenderer.h
+++ b/source/Irrlicht/COGLES2FixedPipelineRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES2_FIXED_PIPELINE_SHADER_H_INCLUDED__
 #define __C_OGLES2_FIXED_PIPELINE_SHADER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
diff --git a/source/Irrlicht/COGLES2MaterialRenderer.h b/source/Irrlicht/COGLES2MaterialRenderer.h
index 9c4c2c9f..5483263e 100644
--- a/source/Irrlicht/COGLES2MaterialRenderer.h
+++ b/source/Irrlicht/COGLES2MaterialRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES2_SL_MATERIAL_RENDERER_H_INCLUDED__
 #define __C_OGLES2_SL_MATERIAL_RENDERER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
diff --git a/source/Irrlicht/COGLES2Renderer2D.h b/source/Irrlicht/COGLES2Renderer2D.h
index 25217580..1d69828b 100644
--- a/source/Irrlicht/COGLES2Renderer2D.h
+++ b/source/Irrlicht/COGLES2Renderer2D.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES2_RENDERER_2D_H_INCLUDED__
 #define __C_OGLES2_RENDERER_2D_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES2_
 
diff --git a/source/Irrlicht/COGLESCommon.h b/source/Irrlicht/COGLESCommon.h
index a7b8eb3e..57e5b7bd 100644
--- a/source/Irrlicht/COGLESCommon.h
+++ b/source/Irrlicht/COGLESCommon.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES_COMMON_H_INCLUDED__
 #define __C_OGLES_COMMON_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
diff --git a/source/Irrlicht/COGLESCoreExtensionHandler.h b/source/Irrlicht/COGLESCoreExtensionHandler.h
index a5578447..ce6ea1d0 100644
--- a/source/Irrlicht/COGLESCoreExtensionHandler.h
+++ b/source/Irrlicht/COGLESCoreExtensionHandler.h
@@ -5,7 +5,6 @@
 #ifndef __E_OGLES_CORE_EXTENSION_HANDLER_H_INCLUDED__
 #define __E_OGLES_CORE_EXTENSION_HANDLER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 // Can be included from different ES versions
 // (this is also the reason why this file is header-only as correct OGL ES headers have to be included first)
diff --git a/source/Irrlicht/COGLESDriver.h b/source/Irrlicht/COGLESDriver.h
index eb27f076..74280946 100644
--- a/source/Irrlicht/COGLESDriver.h
+++ b/source/Irrlicht/COGLESDriver.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES1_DRIVER_H_INCLUDED__
 #define __C_OGLES1_DRIVER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "SIrrCreationParameters.h"
 
diff --git a/source/Irrlicht/COGLESExtensionHandler.h b/source/Irrlicht/COGLESExtensionHandler.h
index efed7939..bcc3278b 100644
--- a/source/Irrlicht/COGLESExtensionHandler.h
+++ b/source/Irrlicht/COGLESExtensionHandler.h
@@ -6,7 +6,6 @@
 #ifndef __C_OGLES_EXTENSION_HANDLER_H_INCLUDED__
 #define __C_OGLES_EXTENSION_HANDLER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
diff --git a/source/Irrlicht/COGLESMaterialRenderer.h b/source/Irrlicht/COGLESMaterialRenderer.h
index 5af6f73e..b2f88611 100644
--- a/source/Irrlicht/COGLESMaterialRenderer.h
+++ b/source/Irrlicht/COGLESMaterialRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLES1_MATERIAL_RENDERER_H_INCLUDED__
 #define __C_OGLES1_MATERIAL_RENDERER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_OGLES1_
 
 #include "COGLESDriver.h"
diff --git a/source/Irrlicht/COpenGLCacheHandler.h b/source/Irrlicht/COpenGLCacheHandler.h
index f7d14c03..11c8a296 100644
--- a/source/Irrlicht/COpenGLCacheHandler.h
+++ b/source/Irrlicht/COpenGLCacheHandler.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_CACHE_HANDLER_H_INCLUDED__
 #define __C_OPENGL_CACHE_HANDLER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h
index 6f7b790f..52a0604a 100644
--- a/source/Irrlicht/COpenGLCommon.h
+++ b/source/Irrlicht/COpenGLCommon.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_COMMON_H_INCLUDED__
 #define __C_OPENGL_COMMON_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h
index 5726e5f2..79b28007 100644
--- a/source/Irrlicht/COpenGLCoreCacheHandler.h
+++ b/source/Irrlicht/COpenGLCoreCacheHandler.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
 #define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
diff --git a/source/Irrlicht/COpenGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h
index 6ec58227..fe86f955 100644
--- a/source/Irrlicht/COpenGLCoreFeature.h
+++ b/source/Irrlicht/COpenGLCoreFeature.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLCORE_FEATURE_H_INCLUDED__
 #define __C_OGLCORE_FEATURE_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h
index 6c542f5d..0dd08ebc 100644
--- a/source/Irrlicht/COpenGLCoreRenderTarget.h
+++ b/source/Irrlicht/COpenGLCoreRenderTarget.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
 #define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index 8897c585..c19215b8 100644
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -5,7 +5,6 @@
 #ifndef __C_OGLCORE_TEXTURE_H_INCLUDED__
 #define __C_OGLCORE_TEXTURE_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h
index 34540368..c60d2ba8 100644
--- a/source/Irrlicht/COpenGLDriver.h
+++ b/source/Irrlicht/COpenGLDriver.h
@@ -5,7 +5,6 @@
 #ifndef __C_VIDEO_OPEN_GL_H_INCLUDED__
 #define __C_VIDEO_OPEN_GL_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "SIrrCreationParameters.h"
 
diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h
index 960b7f6d..5d748d59 100644
--- a/source/Irrlicht/COpenGLExtensionHandler.h
+++ b/source/Irrlicht/COpenGLExtensionHandler.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
 #define __C_OPEN_GL_FEATURE_MAP_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
diff --git a/source/Irrlicht/COpenGLMaterialRenderer.h b/source/Irrlicht/COpenGLMaterialRenderer.h
index ed37e5d5..6d330561 100644
--- a/source/Irrlicht/COpenGLMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLMaterialRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
 #define __C_OPENGL_MATERIAL_RENDERER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
 #include "IMaterialRenderer.h"
diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h
index b6a4f821..a870a6eb 100644
--- a/source/Irrlicht/COpenGLSLMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__
 #define __C_OPENGL_SHADER_LANGUAGE_MATERIAL_RENDERER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
diff --git a/source/Irrlicht/COpenGLShaderMaterialRenderer.h b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
index 80ca4332..81f8c811 100644
--- a/source/Irrlicht/COpenGLShaderMaterialRenderer.h
+++ b/source/Irrlicht/COpenGLShaderMaterialRenderer.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
 #define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
diff --git a/source/Irrlicht/CSDLManager.h b/source/Irrlicht/CSDLManager.h
index 6b0f254d..3d9648c6 100644
--- a/source/Irrlicht/CSDLManager.h
+++ b/source/Irrlicht/CSDLManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_SDL_MANAGER_H_INCLUDED__
 #define __C_SDL_MANAGER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(_IRR_COMPILE_WITH_OPENGL_)
 
diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index fd837ccf..e22ddd59 100644
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "CSceneManager.h"
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
diff --git a/source/Irrlicht/CSkinnedMesh.cpp b/source/Irrlicht/CSkinnedMesh.cpp
index 5e01e060..f7cf1f05 100644
--- a/source/Irrlicht/CSkinnedMesh.cpp
+++ b/source/Irrlicht/CSkinnedMesh.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 #include "CSkinnedMesh.h"
 #include "CBoneSceneNode.h"
 #include "IAnimatedMeshSceneNode.h"
diff --git a/source/Irrlicht/CWGLManager.h b/source/Irrlicht/CWGLManager.h
index bd750650..e2d15130 100644
--- a/source/Irrlicht/CWGLManager.h
+++ b/source/Irrlicht/CWGLManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_WGL_MANAGER_H_INCLUDED__
 #define __C_WGL_MANAGER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #ifdef _IRR_COMPILE_WITH_WGL_MANAGER_
 
diff --git a/source/Irrlicht/CWebGL1Driver.h b/source/Irrlicht/CWebGL1Driver.h
index ce264322..73c5a21f 100644
--- a/source/Irrlicht/CWebGL1Driver.h
+++ b/source/Irrlicht/CWebGL1Driver.h
@@ -5,7 +5,6 @@
 #ifndef __C_WEBGL1_DRIVER_H_INCLUDED__
 #define __C_WEBGL1_DRIVER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "SIrrCreationParameters.h"
 
diff --git a/source/Irrlicht/CWebGLExtensionHandler.h b/source/Irrlicht/CWebGLExtensionHandler.h
index 67ffaf75..9a78df3c 100644
--- a/source/Irrlicht/CWebGLExtensionHandler.h
+++ b/source/Irrlicht/CWebGLExtensionHandler.h
@@ -5,7 +5,6 @@
 #ifndef __E_WEGL_EXTENSION_HANDLER_H_INCLUDED__
 #define __E_WEGL_EXTENSION_HANDLER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #if defined(_IRR_COMPILE_WITH_WEBGL1_)	// Note: should also work with WebGL2 once we add that to Irrlicht
 
diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index dfeefd33..7603ec58 100644
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 #include "CXMeshFileLoader.h"
 #include "os.h"
diff --git a/source/Irrlicht/CZipReader.cpp b/source/Irrlicht/CZipReader.cpp
index 500db900..071f735b 100644
--- a/source/Irrlicht/CZipReader.cpp
+++ b/source/Irrlicht/CZipReader.cpp
@@ -11,7 +11,6 @@
 #include "CReadFile.h"
 #include "coreutil.h"
 
-#include "IrrCompileConfig.h"
 #include <zlib.h> // use system lib
 
 namespace irr
diff --git a/source/Irrlicht/CZipReader.h b/source/Irrlicht/CZipReader.h
index 02de98fb..6b16ab9d 100644
--- a/source/Irrlicht/CZipReader.h
+++ b/source/Irrlicht/CZipReader.h
@@ -5,7 +5,6 @@
 #ifndef __C_ZIP_READER_H_INCLUDED__
 #define __C_ZIP_READER_H_INCLUDED__
 
-#include "IrrCompileConfig.h"
 
 #include "IReadFile.h"
 #include "irrArray.h"
diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp
index 4438b51c..826414fb 100644
--- a/source/Irrlicht/Irrlicht.cpp
+++ b/source/Irrlicht/Irrlicht.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "IrrCompileConfig.h"
 
 static const char* const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Gebhardt";	// put string in binary
 
diff --git a/source/Irrlicht/SB3DStructs.h b/source/Irrlicht/SB3DStructs.h
index 8f88a850..ddd8bd63 100644
--- a/source/Irrlicht/SB3DStructs.h
+++ b/source/Irrlicht/SB3DStructs.h
@@ -6,7 +6,6 @@
 // File format designed by Mark Sibly for the Blitz3D engine and has been
 // declared public domain
 
-#include "IrrCompileConfig.h"
 
 #ifndef SB3DSTRUCTS_H
 #define SB3DSTRUCTS_H
diff --git a/source/Irrlicht/os.cpp b/source/Irrlicht/os.cpp
index 2b894bcd..6b386574 100644
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -4,7 +4,6 @@
 
 #include "os.h"
 #include "irrString.h"
-#include "IrrCompileConfig.h"
 #include "irrMath.h"
 
 #if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h
index 77012c28..c0aa83b0 100644
--- a/source/Irrlicht/os.h
+++ b/source/Irrlicht/os.h
@@ -5,7 +5,6 @@
 #ifndef __IRR_OS_H_INCLUDED__
 #define __IRR_OS_H_INCLUDED__
 
-#include "IrrCompileConfig.h" // for endian check
 #include "irrTypes.h"
 #include "irrString.h"
 #include "path.h"