diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h
index 7bdf5637e4..ab97f17a06 100644
--- a/src/common/Collision/BoundingIntervalHierarchy.h
+++ b/src/common/Collision/BoundingIntervalHierarchy.h
@@ -13,12 +13,12 @@
 
 #include "Define.h"
 
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <limits>
 #include <stdexcept>
 #include <vector>
-#include <algorithm>
-#include <limits>
-#include <cmath>
-#include "string.h"
 
 #define MAX_STACK_SIZE 64
 
diff --git a/src/common/Common.h b/src/common/Common.h
index 717e9c1c98..3e777f825e 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -49,16 +49,16 @@
 
 #include "Define.h"
 
+#include <cassert>
+#include <cerrno>
+#include <cmath>
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <unordered_map>
 #include <unordered_set>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-#include <errno.h>
-#include <signal.h>
-#include <assert.h>
 
 #if AC_PLATFORM == AC_PLATFORM_WINDOWS
 #define STRCASECMP stricmp
diff --git a/src/common/Threading/LockedQueue.h b/src/common/Threading/LockedQueue.h
index 6f53b90cd2..92c7443ad8 100644
--- a/src/common/Threading/LockedQueue.h
+++ b/src/common/Threading/LockedQueue.h
@@ -7,11 +7,11 @@
 #ifndef LOCKEDQUEUE_H
 #define LOCKEDQUEUE_H
 
+#include "Debugging/Errors.h"
 #include <ace/Guard_T.h>
 #include <ace/Thread_Mutex.h>
+#include <cassert>
 #include <deque>
-#include <assert.h>
-#include "Debugging/Errors.h"
 
 namespace ACE_Based
 {
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index 6571b053d0..353907d529 100644
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -1196,8 +1196,8 @@ void PatcherRunnable::run() { }
 
 // Preload MD5 hashes of existing patch files on server
 #ifndef _WIN32
+#include <cerrno>
 #include <dirent.h>
-#include <errno.h>
 void Patcher::LoadPatchesInfo()
 {
     DIR* dirp;
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 8b45d1b103..3bf7493102 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -6,10 +6,10 @@
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstdlib>
 #include <deque>
 #include <set>
-#include <cstdlib>
 
 #ifdef _WIN32
 #include "direct.h"
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index c8eb824996..1e0e30406f 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -19,7 +19,7 @@ typedef unsigned __int32   uint32;
 typedef unsigned __int16   uint16;
 typedef unsigned __int8    uint8;
 #else
-#include <stdint.h>
+#include <cstdint>
 #ifndef uint64_t
 #ifdef __linux__
 #include <linux/types.h>
diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h
index ea75e5e189..6af3a91747 100644
--- a/src/tools/map_extractor/mpq_libmpq04.h
+++ b/src/tools/map_extractor/mpq_libmpq04.h
@@ -7,13 +7,13 @@
 #ifndef MPQ_H
 #define MPQ_H
 
-#include "loadlib/loadlib.h"
 #include "libmpq/mpq.h"
-#include <string.h>
-#include <ctype.h>
-#include <vector>
-#include <iostream>
+#include "loadlib/loadlib.h"
+#include <cctype>
+#include <cstring>
 #include <deque>
+#include <iostream>
+#include <vector>
 
 using namespace std;
 
diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index 79ec24430d..36e4974215 100644
--- a/src/tools/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #ifndef _WIN32
-#include <stddef.h>
+#include <cstddef>
 #include <dirent.h>
 #endif
 
diff --git a/src/tools/vmap4_extractor/gameobject_extract.cpp b/src/tools/vmap4_extractor/gameobject_extract.cpp
index 338fa79f9d..0baed72c1e 100644
--- a/src/tools/vmap4_extractor/gameobject_extract.cpp
+++ b/src/tools/vmap4_extractor/gameobject_extract.cpp
@@ -10,7 +10,7 @@
 #include "vmapexport.h"
 
 #include <algorithm>
-#include <stdio.h>
+#include <cstdio>
 
 bool ExtractSingleModel(std::string& fname)
 {
diff --git a/src/tools/vmap4_extractor/loadlib/loadlib.h b/src/tools/vmap4_extractor/loadlib/loadlib.h
index 8825301388..961c2a7878 100644
--- a/src/tools/vmap4_extractor/loadlib/loadlib.h
+++ b/src/tools/vmap4_extractor/loadlib/loadlib.h
@@ -19,7 +19,7 @@ typedef unsigned __int32   uint32;
 typedef unsigned __int16   uint16;
 typedef unsigned __int8    uint8;
 #else
-#include <stdint.h>
+#include <cstdint>
 #ifndef uint64_t
 #ifdef __linux__
 #include <linux/types.h>
diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h
index 5950eb9a76..1c8562c8a8 100644
--- a/src/tools/vmap4_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap4_extractor/mpq_libmpq04.h
@@ -7,13 +7,13 @@
 #ifndef MPQ_H
 #define MPQ_H
 
-#include "loadlib/loadlib.h"
 #include "libmpq/mpq.h"
-#include <string.h>
-#include <ctype.h>
-#include <vector>
-#include <iostream>
+#include "loadlib/loadlib.h"
+#include <cctype>
+#include <cstring>
 #include <deque>
+#include <iostream>
+#include <vector>
 
 using namespace std;
 
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 74114eb5e8..750b5b7f92 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -5,11 +5,11 @@
  */
 
 #define _CRT_SECURE_NO_DEPRECATE
+#include <cerrno>
 #include <cstdio>
 #include <iostream>
-#include <vector>
 #include <list>
-#include <errno.h>
+#include <vector>
 
 #ifdef WIN32
 #include <Windows.h>
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 8be12adf39..da80082d7e 100644
--- a/src/tools/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
@@ -9,8 +9,8 @@
 
 #include "mpq_libmpq04.h"
 #include "wmo.h"
+#include <cstdlib>
 #include <string>
-#include "stdlib.h"
 
 class ADTFile;