Core: Remove some header inclusions in header files

Replaces them with forward declarations of used types, or removes them entirely if they aren't used at all. This also replaces certain Common headers with less inclusive ones (in terms of definitions they pull in).

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device.h

@@ -6,10 +6,10 @@
 
 #include <queue>
 #include <string>
+#include <vector>
 
 #include "Common/ChunkFile.h"
 #include "Common/StringUtil.h"
-
 #include "Core/HW/Memmap.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp

@@ -5,15 +5,14 @@
 #include <cinttypes>
 #include <memory>
 
+#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/LogManager.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
 #include "Core/HW/DVDInterface.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SystemTimers.h"
-
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
 

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.h

@@ -5,9 +5,11 @@
 #pragma once
 
 #include <deque>
-#include "Core/HW/DVDInterface.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
+class PointerWrap;
+namespace DVDInterface { enum DIInterruptType : int; }
+
 class CWII_IPC_HLE_Device_di : public IWII_IPC_HLE_Device
 {
 public:

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h

@@ -4,9 +4,12 @@
 
 #pragma once
 
-#include "Common/FileUtil.h"
+#include <string>
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
+class PointerWrap;
+namespace File { class IOFile; }
+
 std::string HLE_IPC_BuildFilename(std::string _pFilename);
 void HLE_IPC_CreateVirtualFATFilesystem();
 

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.cpp

@@ -36,15 +36,14 @@
 // need to include this before polarssl/aes.h,
 // otherwise we may not get __STDC_FORMAT_MACROS
 #include <cinttypes>
-
 #include <polarssl/aes.h>
 
+#include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
 #include "Common/StdMakeUnique.h"
 #include "Common/StringUtil.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/ec_wii.h"
 #include "Core/Movie.h"
@@ -52,7 +51,9 @@
 #include "Core/HW/DVDInterface.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "DiscIO/NANDContentLoader.h"
 
 #ifdef _WIN32
 #include <Windows.h>

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_es.h

@@ -6,9 +6,17 @@
 
 #include <map>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "DiscIO/NANDContentLoader.h"
+
+class PointerWrap;
+namespace DiscIO
+{
+	class INANDContentLoader;
+	struct SNANDContent;
+}
 
 class CWII_IPC_HLE_Device_es : public IWII_IPC_HLE_Device
 {

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.h

@@ -6,6 +6,8 @@
 
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
+class PointerWrap;
+
 struct NANDStat
 {
 	u32 BlockSize;

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.cpp

@@ -2,9 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <errno.h>
+#include <cerrno>
 #include <libusb.h>
 
+#include "Common/Thread.h"
 #include "Core/Core.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/HW/WII_IPC.h"

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_hid.h

@@ -5,8 +5,10 @@
 #pragma once
 
 #include <list>
+#include <map>
+#include <mutex>
+#include <thread>
 
-#include "Common/Thread.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net_ssl.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <string>
 #include <polarssl/ctr_drbg.h>
 #include <polarssl/entropy.h>
 #include <polarssl/net.h>

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp

@@ -2,7 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
 #include "Common/SDCardUtil.h"
 
 #include "Core/ConfigManager.h"

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.h

@@ -6,8 +6,12 @@
 
 #pragma once
 
+#include <string>
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
+class PointerWrap;
+namespace File { class IOFile; }
+
 class CWII_IPC_HLE_Device_sdio_slot0 : public IWII_IPC_HLE_Device
 {
 public:

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_stm.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <string>
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
 enum

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp

@@ -13,7 +13,7 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
-
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
 
 
 void CWII_IPC_HLE_Device_usb_oh1_57e_305::EnqueueReply(u32 CommandAddress)

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <algorithm>
+#include <deque>
 #include <queue>
 #include <vector>
 
@@ -12,7 +13,8 @@
 #include "Core/IPC_HLE/hci.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
-#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
+
+class CWII_IPC_HLE_WiiMote;
 
 struct SQueuedEvent
 {

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <queue>
+#include <string>
+
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
 
 class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device

Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h

@@ -7,7 +7,8 @@
 #include <map>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
 #include "Core/IPC_HLE/hci.h"
 
 class CWII_IPC_HLE_Device_usb_oh1_57e_305;

Source/Core/Core/IPC_HLE/WII_Socket.cpp

@@ -4,6 +4,7 @@
 
 #include <algorithm>
 
+#include "Common/FileUtil.h"
 #include "Core/Core.h"
 #include "Core/IPC_HLE/WII_IPC_HLE.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device.h"

Source/Core/Core/IPC_HLE/WII_Socket.h

@@ -47,7 +47,6 @@ typedef struct pollfd pollfd_t;
 #include <string>
 #include <unordered_map>
 
-#include "Common/FileUtil.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"