diff --git a/source/Irrlicht/CIrrDeviceWin32.h b/source/Irrlicht/CIrrDeviceWin32.h
index f2641e47..c367478a 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 "IrrlichtDevice.h"
 #include "IImagePresenter.h"
 
 #define WIN32_LEAN_AND_MEAN
@@ -71,7 +70,7 @@ namespace irr
 		virtual video::IVideoModeList* getVideoModeList() IRR_OVERRIDE;
 
 		//! Notifies the device, that it has been resized
-		/** Must be publis as it is called from free function (event handler) */
+		/** Must be public as it is called from free function (event handler) */
 		void OnResized();
 
 		//! Sets if the window should be resizable in windowed mode.
diff --git a/source/Irrlicht/CLogger.cpp b/source/Irrlicht/CLogger.cpp
index 5b3feeca..f01c3cad 100644
--- a/source/Irrlicht/CLogger.cpp
+++ b/source/Irrlicht/CLogger.cpp
@@ -3,6 +3,8 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CLogger.h"
+#include "os.h"
+#include "irrString.h"
 
 namespace irr
 {
diff --git a/source/Irrlicht/CLogger.h b/source/Irrlicht/CLogger.h
index c6357874..e484b30a 100644
--- a/source/Irrlicht/CLogger.h
+++ b/source/Irrlicht/CLogger.h
@@ -6,8 +6,6 @@
 #define IRR_C_LOGGER_H_INCLUDED
 
 #include "ILogger.h"
-#include "os.h"
-#include "irrString.h"
 #include "IEventReceiver.h"
 
 namespace irr
diff --git a/source/Irrlicht/CProfiler.cpp b/source/Irrlicht/CProfiler.cpp
index 537bea44..a313169b 100644
--- a/source/Irrlicht/CProfiler.cpp
+++ b/source/Irrlicht/CProfiler.cpp
@@ -3,6 +3,7 @@
 // Written by Michael Zeilfelder
 
 #include "CProfiler.h"
+#include "IrrCompileConfig.h"
 #include "CTimer.h"
 
 namespace irr
diff --git a/source/Irrlicht/CProfiler.h b/source/Irrlicht/CProfiler.h
index ac4c1f2f..3fbb8203 100644
--- a/source/Irrlicht/CProfiler.h
+++ b/source/Irrlicht/CProfiler.h
@@ -5,7 +5,6 @@
 #ifndef IRR_C_PROFILER_H_INCLUDED
 #define IRR_C_PROFILER_H_INCLUDED
 
-#include "IrrCompileConfig.h"
 #include "IProfiler.h"
 
 namespace irr
diff --git a/source/Irrlicht/CTimer.h b/source/Irrlicht/CTimer.h
index 6cfc64ed..3a942edf 100644
--- a/source/Irrlicht/CTimer.h
+++ b/source/Irrlicht/CTimer.h
@@ -53,7 +53,7 @@ namespace irr
 		//! Stops the game timer.
 		/** The timer is reference counted, which means everything which calls
 		stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
-		corretly again. */
+		correctly again. */
 		virtual void stop() IRR_OVERRIDE
 		{
 			os::Timer::stopTimer();
@@ -62,7 +62,7 @@ namespace irr
 		//! Starts the game timer.
 		/** The timer is reference counted, which means everything which calls
 		stopTimer() will also have to call startTimer(), otherwise the timer may not start/stop
-		corretly again. */
+		correctly again. */
 		virtual void start() IRR_OVERRIDE
 		{
 			os::Timer::startTimer();
diff --git a/source/Irrlicht/EProfileIDs.h b/source/Irrlicht/EProfileIDs.h
index 69a08a15..a2a26148 100644
--- a/source/Irrlicht/EProfileIDs.h
+++ b/source/Irrlicht/EProfileIDs.h
@@ -5,11 +5,12 @@
 #define E_PROFILE_IDS_H_INCLUDED__
 
 #include "IrrCompileConfig.h"
+
+#ifdef _IRR_COMPILE_WITH_PROFILING_
 #include "limits.h"
 
 namespace irr
 {
-#ifdef _IRR_COMPILE_WITH_PROFILING_
     enum EPROFILE_ID
     {
 		// We use negative ID's to avoid clashing with user application id's.
@@ -32,7 +33,8 @@ namespace irr
 		EPID_OC_RENDER,
 		EPID_OC_CALCPOLYS
     };
-#endif
 } // end namespace irr
 
+#endif
+
 #endif // E_PROFILE_IDS_H_INCLUDED__
diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h
index a8d3ab2e..25cfa180 100644
--- a/source/Irrlicht/os.h
+++ b/source/Irrlicht/os.h
@@ -7,7 +7,6 @@
 
 #include "IrrCompileConfig.h" // for endian check
 #include "irrTypes.h"
-#include "irrString.h"
 #include "path.h"
 #include "ILogger.h"
 #include "ITimer.h"
diff --git a/source/Irrlicht/utf8.cpp b/source/Irrlicht/utf8.cpp
index 806296b5..d745fe85 100644
--- a/source/Irrlicht/utf8.cpp
+++ b/source/Irrlicht/utf8.cpp
@@ -3,7 +3,6 @@
 // under the zlib license, reproduced below.
 
 #include "irrTypes.h"
-#include "irrString.h"
 
 namespace irr
 {