Merge pull request #3093 from lioncash/header_shuffle

Common: Trim Common.h

Source/Core/Core/ConfigManager.h

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "Common/IniFile.h"
+#include "Common/NonCopyable.h"
 #include "Common/SysConf.h"
 #include "Core/HW/EXI_Device.h"
 #include "Core/HW/SI_Device.h"

Source/Core/Core/DSP/DSPCaptureLogger.h

@@ -7,7 +7,8 @@
 #include <memory>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Common/NonCopyable.h"
 
 class PCAP;
 

Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/FifoPlayer/FifoAnalyzer.h"
-
 #include "VideoCommon/VertexLoader.h"
 #include "VideoCommon/VertexLoader_Normal.h"
 #include "VideoCommon/VertexLoader_Position.h"

Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp

@@ -2,12 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-
 #include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoDataFile.h"
 #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
-
 #include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/VertexLoader.h"

Source/Core/Core/FifoPlayer/FifoPlayer.cpp

@@ -5,6 +5,7 @@
 #include <algorithm>
 #include <mutex>
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"

Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp

@@ -4,12 +4,12 @@
 
 #include <algorithm>
 
+#include "Common/Assert.h"
 #include "Core/Core.h"
 #include "Core/FifoPlayer/FifoAnalyzer.h"
 #include "Core/FifoPlayer/FifoRecordAnalyzer.h"
 #include "Core/FifoPlayer/FifoRecorder.h"
 #include "Core/HW/Memmap.h"
-
 #include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/TextureDecoder.h"
 

Source/Core/Core/HLE/HLE_OS.cpp

@@ -5,8 +5,9 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
-
+#include "Common/Logging/Log.h"
 #include "Core/HLE/HLE_OS.h"
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"

Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp

@@ -5,6 +5,7 @@
 #include <fcntl.h>
 
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 #include "Core/HW/EXI_Device.h"
 #include "Core/HW/EXI_DeviceEthernet.h"
 

Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp

@@ -7,6 +7,7 @@
 #endif
 
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 #include "Core/HW/EXI_Device.h"
 #include "Core/HW/EXI_DeviceEthernet.h"
 

Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp

@@ -2,8 +2,9 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
-
+#include "Common/Logging/Log.h"
 #include "Core/HW/EXI_Device.h"
 #include "Core/HW/EXI_DeviceEthernet.h"
 #include "Core/HW/BBA-TAP/TAP_Win32.h"

Source/Core/Core/HW/EXI_DeviceMic.cpp

@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
 
 #if HAVE_PORTAUDIO
 

Source/Core/Core/HW/GCMemcard.cpp

@@ -8,6 +8,8 @@
 
 #include "Common/ColorUtil.h"
 #include "Common/FileUtil.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
 #include "Core/HW/GCMemcard.h"
 
 static void ByteSwap(u8 *valueA, u8 *valueB)

Source/Core/Core/HW/GCMemcard.h

@@ -7,9 +7,11 @@
 #include <algorithm>
 #include <string>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/NandPaths.h"
+#include "Common/NonCopyable.h"
 #include "Common/StringUtil.h"
 
 #include "Core/HW/EXI_DeviceIPL.h"

Source/Core/Core/HW/GCMemcardDirectory.h

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "Common/Event.h"
+#include "Common/NonCopyable.h"
 #include "Core/HW/GCMemcard.h"
 #include "DiscIO/Volume.h"
 

Source/Core/Core/HW/MMIO.h

@@ -8,6 +8,7 @@
 #include <string>
 #include <type_traits>
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/MMIOHandlers.h"

Source/Core/Core/HW/MMIOHandlers.h

@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
+#include "Common/NonCopyable.h"
 
 // All the templated and very repetitive MMIO-related code is isolated in this
 // file for easier reading. It mostly contains code related to handling methods

Source/Core/Core/HW/SI_Device.cpp

@@ -5,6 +5,7 @@
 #include <string>
 
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
 #include "Core/HW/SI_Device.h"
 #include "Core/HW/SI_DeviceAMBaseboard.h"
 #include "Core/HW/SI_DeviceDanceMat.h"

Source/Core/Core/HW/WiiSaveCrypted.cpp

@@ -18,12 +18,15 @@
 #include <polarssl/md5.h>
 #include <polarssl/sha1.h>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/MathUtil.h"
+#include "Common/MsgHandler.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
 #include "Common/Crypto/ec.h"
+#include "Common/Logging/Log.h"
 
 #include "Core/HW/WiiSaveCrypted.h"
 

Source/Core/Core/HW/WiimoteReal/WiimoteReal.h

@@ -11,7 +11,9 @@
 #include <thread>
 #include <vector>
 
+#include "Common/Common.h"
 #include "Common/FifoQueue.h"
+#include "Common/NonCopyable.h"
 #include "Common/Timer.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"

Source/Core/Core/IPC_HLE/WII_Socket.h

@@ -47,6 +47,8 @@ typedef struct pollfd pollfd_t;
 #include <string>
 #include <unordered_map>
 
+#include "Common/CommonTypes.h"
+#include "Common/NonCopyable.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_net.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h"

Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp

@@ -4,7 +4,8 @@
 
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "Common/Logging/Log.h"
 #include "Core/IPC_HLE/WiiMote_HID_Attr.h"

Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp

@@ -6,6 +6,8 @@
 #include <cinttypes>
 #include <string>
 
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/StringUtil.h"
 #include "Core/Host.h"

Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"

Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/FPURoundMode.h"
 #include "Core/HW/GPFifo.h"

Source/Core/Core/ec_wii.cpp

@@ -14,7 +14,7 @@
 
 #include "Common/FileUtil.h"
 #include "Common/Crypto/ec.h"
-
+#include "Common/Logging/Log.h"
 #include "Core/ec_wii.h"
 
 static u32 default_NG_id = 0x0403AC68;