Common: Cleanup memory and misc includes.

src/common/common_funcs.h

@@ -5,8 +5,6 @@
 #pragma once
 
 #include "common_types.h"
-#include <cstdlib>
-
 
 #define b2(x)   (   (x) | (   (x) >> 1) )
 #define b4(x)   ( b2(x) | ( b2(x) >> 2) )
@@ -43,8 +41,6 @@
 
 #ifndef _MSC_VER
 
-#include <errno.h>
-
 #if defined(__x86_64__) || defined(_M_X64)
 #define Crash() __asm__ __volatile__("int $3")
 #elif defined(_M_ARM)

src/common/common_types.h

@@ -24,9 +24,7 @@
 
 #pragma once
 
-#include <cmath>
 #include <cstdint>
-#include <cstdlib>
 
 #ifdef _MSC_VER
 #ifndef __func__

src/common/logging/log.h

@@ -4,10 +4,6 @@
 
 #pragma once
 
-#include <cassert>
-#include <chrono>
-#include <string>
-
 #include "common/common_types.h"
 
 namespace Log {

src/common/memory_util.cpp

@@ -3,14 +3,17 @@
 // Refer to the license.txt file included.
 
 
-#include "common/common_funcs.h"
 #include "common/logging/log.h"
 #include "common/memory_util.h"
-#include "common/string_util.h"
 
 #ifdef _WIN32
     #include <windows.h>
     #include <psapi.h>
+    #include "common/common_funcs.h"
+    #include "common/string_util.h"
+#else
+    #include <cstdlib>
+    #include <sys/mman.h>
 #endif
 
 #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)

src/common/memory_util.h

@@ -4,9 +4,7 @@
 
 #pragma once
 
-#ifndef _WIN32
+#include <cstddef>
-#include <sys/mman.h>
-#endif
 #include <string>
 
 void* AllocateExecutableMemory(size_t size, bool low = true);

src/common/misc.cpp

@@ -2,12 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/common_funcs.h"
+#include <cstddef>
 
 #ifdef _WIN32
 #include <windows.h>
 #else
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 #endif
 
 // Neither Android nor OS X support TLS

src/common/swap.h

@@ -17,12 +17,16 @@
 
 #pragma once
 
-#if defined(__linux__)
+#if defined(_MSC_VER)
+    #include <cstdlib>
+#elif defined(__linux__)
     #include <byteswap.h>
 #elif defined(__FreeBSD__)
     #include <sys/endian.h>
 #endif
 
+#include "common/common_types.h"
+
 // GCC 4.6+
 #if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
 

src/core/file_sys/file_backend.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <cstddef>
+
 #include "common/common_types.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

src/core/memory.cpp

@@ -9,9 +9,6 @@
 #include "common/logging/log.h"
 #include "common/swap.h"
 
-#include "core/hle/config_mem.h"
-#include "core/hle/shared_page.h"
-#include "core/hw/hw.h"
 #include "core/mem_map.h"
 #include "core/memory.h"
 #include "core/memory_setup.h"

src/core/memory.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <cstddef>
+
 #include "common/common_types.h"
 
 namespace Memory {