diff --git a/include/IImage.h b/include/IImage.h
index 7675959a..c3f304f3 100644
--- a/include/IImage.h
+++ b/include/IImage.h
@@ -8,7 +8,7 @@
 #include "position2d.h"
 #include "rect.h"
 #include "SColor.h"
-#include <string.h>
+#include <cstring>
 
 namespace irr
 {
diff --git a/include/irrMath.h b/include/irrMath.h
index 0bd0be69..553a4c89 100644
--- a/include/irrMath.h
+++ b/include/irrMath.h
@@ -6,9 +6,9 @@
 
 #include "irrTypes.h"
 #include <cmath>
-#include <float.h>
+#include <cfloat>
 #include <cstdlib> // for abs() etc.
-#include <limits.h> // For INT_MAX / UINT_MAX
+#include <climits> // For INT_MAX / UINT_MAX
 #include <type_traits>
 
 namespace irr
diff --git a/include/irrTypes.h b/include/irrTypes.h
index 726885e3..54d2eef1 100644
--- a/include/irrTypes.h
+++ b/include/irrTypes.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 
 namespace irr
 {
diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index 58982154..5015a52e 100644
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -25,10 +25,10 @@
 	#include <io.h> // for _access
 	#include <tchar.h>
 #elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))
-		#include <stdio.h>
-		#include <stdlib.h>
-		#include <string.h>
-		#include <limits.h>
+		#include <cstdio>
+		#include <cstdlib>
+		#include <cstring>
+		#include <climits>
 		#include <sys/types.h>
 		#include <dirent.h>
 		#include <sys/stat.h>
diff --git a/source/Irrlicht/CImageLoaderJPG.h b/source/Irrlicht/CImageLoaderJPG.h
index b59daeb1..ab2f8191 100644
--- a/source/Irrlicht/CImageLoaderJPG.h
+++ b/source/Irrlicht/CImageLoaderJPG.h
@@ -6,7 +6,7 @@
 
 #include "IImageLoader.h"
 
-#include <stdio.h> // required for jpeglib.h
+#include <cstdio> // required for jpeglib.h
 #include <jpeglib.h> // use system lib
 #include <setjmp.h>
 
diff --git a/source/Irrlicht/CImageWriterJPG.cpp b/source/Irrlicht/CImageWriterJPG.cpp
index a640dffe..304ee13f 100644
--- a/source/Irrlicht/CImageWriterJPG.cpp
+++ b/source/Irrlicht/CImageWriterJPG.cpp
@@ -10,7 +10,7 @@
 #include "irrString.h"
 #include "os.h"
 
-#include <stdio.h> // required for jpeglib.h
+#include <cstdio> // required for jpeglib.h
 extern "C"
 {
 	#include <jpeglib.h>
diff --git a/source/Irrlicht/CIrrDeviceLinux.cpp b/source/Irrlicht/CIrrDeviceLinux.cpp
index 3e4dcb8e..42bae191 100644
--- a/source/Irrlicht/CIrrDeviceLinux.cpp
+++ b/source/Irrlicht/CIrrDeviceLinux.cpp
@@ -6,11 +6,11 @@
 
 #ifdef _IRR_COMPILE_WITH_X11_DEVICE_
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/utsname.h>
-#include <time.h>
-#include <locale.h>
+#include <ctime>
+#include <clocale>
 #include "IEventReceiver.h"
 #include "ISceneManager.h"
 #include "IGUIElement.h"
diff --git a/source/Irrlicht/CIrrDeviceSDL.cpp b/source/Irrlicht/CIrrDeviceSDL.cpp
index 19fb888e..735a89e4 100644
--- a/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@ -16,8 +16,8 @@
 #include "irrString.h"
 #include "Keycodes.h"
 #include "COSOperator.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include "SIrrCreationParameters.h"
 #include <SDL_video.h>
 
diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
index 778872aa..bc428c2d 100644
--- a/source/Irrlicht/COSOperator.cpp
+++ b/source/Irrlicht/COSOperator.cpp
@@ -7,7 +7,7 @@
 #ifdef _IRR_WINDOWS_API_
 #include <windows.h>
 #else
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #ifndef _IRR_ANDROID_PLATFORM_
 #include <sys/types.h>
diff --git a/source/Irrlicht/CReadFile.h b/source/Irrlicht/CReadFile.h
index a599e066..1a4c15c2 100644
--- a/source/Irrlicht/CReadFile.h
+++ b/source/Irrlicht/CReadFile.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include "IReadFile.h"
 #include "irrString.h"
 
diff --git a/source/Irrlicht/CWriteFile.cpp b/source/Irrlicht/CWriteFile.cpp
index a9d8d405..322a6b2b 100644
--- a/source/Irrlicht/CWriteFile.cpp
+++ b/source/Irrlicht/CWriteFile.cpp
@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CWriteFile.h"
-#include <stdio.h>
+#include <cstdio>
 
 namespace irr
 {
diff --git a/source/Irrlicht/os.cpp b/source/Irrlicht/os.cpp
index a2d8834a..a3087f6e 100644
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -12,7 +12,7 @@
 	#define bswap_32(X) SDL_Swap32(X)
 	#define bswap_64(X) SDL_Swap64(X)
 #elif defined(_IRR_WINDOWS_API_) && defined(_MSC_VER)
-	#include <stdlib.h>
+	#include <cstdlib>
 	#define bswap_16(X) _byteswap_ushort(X)
 	#define bswap_32(X) _byteswap_ulong(X)
 	#define bswap_64(X) _byteswap_uint64(X)
@@ -60,7 +60,7 @@ namespace os
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <time.h>
+#include <ctime>
 
 namespace irr
 {
@@ -171,7 +171,7 @@ namespace os
 // ----------------------------------------------------------------
 
 #include <emscripten.h>
-#include <time.h>
+#include <ctime>
 #include <sys/time.h>
 
 namespace irr
@@ -222,8 +222,8 @@ namespace os
 // linux/ansi version
 // ----------------------------------------------------------------
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <sys/time.h>
 
 namespace irr