Merge pull request #1347 from comex/header-hygiene

Add missing includes where headers depend on other headers having been included first.

Source/Core/Common/Version.cpp

@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "scmrev.h"
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 #ifdef _DEBUG
 	#define BUILD_TYPE_STR "Debug "

Source/Core/Core/DSP/DSPAccelerator.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 u16 dsp_read_accelerator();
 
 u16 dsp_read_aram_d3();

Source/Core/Core/DSP/DSPBreakpoints.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 // super fast breakpoints for a limited range.
 // To be used interchangeably with the BreakPoints class.

Source/Core/Core/DSP/DSPHost.h

@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <string>
+
+#include "Common/CommonTypes.h"
+
 // The user of the DSPCore library must supply a few functions so that the
 // emulation core can access the environment it runs in. If the emulation
 // core isn't used, for example in an asm/disasm tool, then most of these

Source/Core/Core/HW/DSPHLE/UCodes/AXStructs.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 struct PBMixer
 {
 	u16 left;

Source/Core/Core/HW/DSPLLE/DSPLLETools.h

@@ -4,5 +4,7 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc);
 bool DumpCWCode(u32 _Address, u32 _Length);

Source/Core/Core/HW/EXI_DeviceAD16.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/EXI_Device.h"
+
 class CEXIAD16 : public IEXIDevice
 {
 public:

Source/Core/Core/HW/EXI_DeviceAMBaseboard.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/EXI_Device.h"
+
 class CEXIAMBaseboard : public IEXIDevice
 {
 public:

Source/Core/Core/HW/EXI_DeviceEthernet.h

@@ -9,6 +9,7 @@
 #endif
 
 #include "Common/Thread.h"
+#include "Core/HW/EXI_Device.h"
 
 // Network Control Register A
 enum NCRA

Source/Core/Core/HW/EXI_DeviceGecko.h

@@ -11,6 +11,8 @@
 
 #include "Common/Thread.h"
 
+#include "Core/HW/EXI_Device.h"
+
 class GeckoSockServer
 	: public sf::SocketTCP
 {

Source/Core/Core/HW/EXI_DeviceMemoryCard.h

@@ -4,6 +4,7 @@
 
 #pragma once
 #include "Common/StdMakeUnique.h"
+#include "Core/HW/EXI_Device.h"
 
 class MemoryCardBase;
 class CEXIMemoryCard : public IEXIDevice

Source/Core/Core/HW/EXI_DeviceMic.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/EXI_Device.h"
+
 #if HAVE_PORTAUDIO
 
 #include <mutex>

Source/Core/Core/HW/GCMemcardDirectory.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "Core/HW/GCMemcard.h"
+#include "DiscIO/Volume.h"
 
 // Uncomment this to write the system data of the memorycard from directory to disc
 //#define _WRITE_MC_HEADER 1

Source/Core/Core/HW/MMIOHandlers.h

@@ -7,7 +7,7 @@
 #include <functional>
 #include <memory>
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.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/Memmap.h

@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 
 // Enable memory checks in the Debug/DebugFast builds, but NOT in release

Source/Core/Core/HW/SI_DeviceAMBaseboard.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/SI_Device.h"
+
 // triforce (GC-AM) baseboard
 class CSIDevice_AMBaseboard : public ISIDevice
 {

Source/Core/Core/HW/SI_DeviceGBA.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/HW/SI_Device.h"
+
 #include "SFML/Network.hpp"
 
 // GameBoy Advance "Link Cable"

Source/Core/Core/HW/WiimoteEmu/Encryption.h

@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 // The key structure to use with WiimoteGenerateKey()
 struct wiimote_key
 {

Source/Core/Core/IPC_HLE/WII_IPC_HLE.h

@@ -4,6 +4,10 @@
 
 #pragma once
 
+#include <string>
+
+#include "Common/CommonTypes.h"
+
 class IWII_IPC_HLE_Device;
 class PointerWrap;
 

Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Core/IPC_HLE/WII_IPC_HLE_Device.h"
+
 class CWII_IPC_HLE_Device_usb_kbd : public IWII_IPC_HLE_Device
 {
 public: