8 files changed, 20 insertions, 21 deletions
diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp
index db48abbf6..27697ef1f 100644
--- a/src/common/console_listener.cpp
+++ b/src/common/console_listener.cpp
@@ -2,15 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <algorithm>  // min
-#include <string> // System: To be able to add strings with "+"
-#include <stdio.h>
-#include <math.h>
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+#include <string>
 #ifdef _WIN32
 #include <windows.h>
 #include <array>
 #else
-#include <stdarg.h>
+#include <cstdarg>
 #endif
 
 #include "common/common.h"
diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp
index 0a1c6a67a..66dae4935 100644
--- a/src/common/extended_trace.cpp
+++ b/src/common/extended_trace.cpp
@@ -13,9 +13,8 @@
 // --------------------------------------------------------------------------------------
 
 #if defined(WIN32)
-
+#include <cstdio>
 #include <windows.h>
-#include <stdio.h>
 #include "common/extended_trace.h"
 #include "common/string_util.h"
 using namespace std;
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 47ad964db..b6ff2e40b 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -16,11 +16,11 @@
 #include <io.h>
 #include <direct.h>        // getcwd
 #else
+#include <cerrno>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <errno.h>
-#include <stdlib.h>
 #endif
 
 #if defined(__APPLE__)
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index 71ef159c3..e1cd6e553 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -11,8 +11,8 @@
 #include <windows.h>
 #include <psapi.h>
 #else
-#include <errno.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
 #endif
 
 #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp
index c1386cdaa..3e02ec4d7 100644
--- a/src/common/msg_handler.cpp
+++ b/src/common/msg_handler.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdio.h> // System
+#include <cstdio>
 
 #include "common/common.h" // Local
 #include "common/string_util.h"
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index e5a9ba322..c1f22bda3 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <algorithm>
+#include <cstdlib>
+#include <cstdio>
 
 #include "common/common.h"
 #include "common/common_paths.h"
@@ -13,8 +13,8 @@
 #ifdef _WIN32
     #include <Windows.h>
 #else
+    #include <cerrno>
     #include <iconv.h>
-    #include <errno.h>
 #endif
 
 /// Make a string lowercase
diff --git a/src/common/thread.h b/src/common/thread.h
index ff2c1d8be..dbb9da53b 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -10,8 +10,8 @@
 
 // Don't include common.h here as it will break LogManager
 #include "common/common_types.h"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 // This may not be defined outside _WIN32
 #ifndef _WIN32
diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp
index fe5270183..c83824d35 100644
--- a/src/common/utf8.cpp
+++ b/src/common/utf8.cpp
@@ -18,10 +18,10 @@
 #undef max
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cstdarg>
 
 #include <algorithm>
 #include <string>