Common: Move remaining C header includes over to their C++ equivalent

src/common/console_listener.cpp

@@ -2,15 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <algorithm>  // min
+#include <algorithm>
-#include <string> // System: To be able to add strings with "+"
+#include <cmath>
-#include <stdio.h>
+#include <cstdio>
-#include <math.h>
+#include <string>
 #ifdef _WIN32
 #include <windows.h>
 #include <array>
 #else
-#include <stdarg.h>
+#include <cstdarg>
 #endif
 
 #include "common/common.h"

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;

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__)

src/common/memory_util.cpp

@@ -11,8 +11,8 @@
 #include <windows.h>
 #include <psapi.h>
 #else
-#include <errno.h>
+#include <cerrno>
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)

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"

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

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 <cstdio>
-#include <string.h>
+#include <cstring>
 
 // This may not be defined outside _WIN32
 #ifndef _WIN32

src/common/utf8.cpp

@@ -18,10 +18,10 @@
 #undef max
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
-#include <stdio.h>
+#include <cstdio>
-#include <string.h>
+#include <cstring>
-#include <stdarg.h>
+#include <cstdarg>
 
 #include <algorithm>
 #include <string>