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:

Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h

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

Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 #if 0
 struct SAttrib
 {

Source/Core/Core/IPC_HLE/hci.h

@@ -2388,6 +2388,7 @@ struct btreq {
 //////////////////////////////////////////////////////////////////////////
 // Dolphin-custom structs (to kill)
 //////////////////////////////////////////////////////////////////////////
+#include "Common/CommonTypes.h"
 struct SCommandMessage
 {
 	u16 Opcode;

Source/Core/Core/PowerPC/Jit64/JitRegCache.h

@@ -8,6 +8,7 @@
 #include <cinttypes>
 
 #include "Common/x64Emitter.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 
 enum FlushMode
 {

Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h

@@ -37,6 +37,10 @@
 		#error No context definition for OS
 	#endif
 #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
+	// for modules:
+	#define _XOPEN_SOURCE
+	#include <ucontext.h>
+
 	#include <mach/mach.h>
 	#include <mach/message.h>
 	#if _M_X86_64

Source/Core/Core/PowerPC/JitCommon/TrampolineCache.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <unordered_map>
+
 #include "Common/CommonTypes.h"
 #include "Common/x64Analyzer.h"
 #include "Common/x64Emitter.h"

Source/Core/Core/PowerPC/Profiler.h

@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 #ifdef _WIN32
 
 #define PROFILER_QUERY_PERFORMANCE_COUNTER(pt) \

Source/Core/Core/State.h

@@ -10,6 +10,8 @@
 #include <string>
 #include <vector>
 
+#include "Common/CommonTypes.h"
+
 namespace State
 {
 

Source/Core/Core/ec_wii.h

@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 
 void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig);
 void get_ap_sig_and_cert(u8 *sig_out, u8 *ap_cert_out, u64 title_id, u8 *data, u32 data_size, const u8 *NG_priv, u32 NG_id);

Source/Core/DolphinWX/ISOFile.h

@@ -7,11 +7,12 @@
 #include <string>
 #include <vector>
 
-#include "Common/CommonTypes.h"
+#include "Common/Common.h"
 #include "DiscIO/Volume.h"
 
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/image.h>
+#include <wx/bitmap.h>
 #endif
 
 class PointerWrap;

Source/Core/DolphinWX/LogConfigWindow.cpp

@@ -305,3 +305,4 @@ void LogConfigWindow::OnLogCheck(wxCommandEvent& event)
 	int i = event.GetInt();
 	ToggleLog(i, m_checks->IsChecked(i));
 }
+

Source/Core/InputCommon/ControllerInterface/ForceFeedback/OSX/DirectInputAdapter.h

@@ -12,10 +12,13 @@
 
 #pragma once
 
+#include <atomic>
+
 typedef LONG* LPLONG; // Missing type for ForceFeedback.h
 #include <CoreFoundation/CoreFoundation.h>
 #include <ForceFeedback/ForceFeedback.h>
 #include "DirectInputConstants.h" // Not stricty necessary
+#include "Common/CommonTypes.h" // for LONG
 
 namespace ciface
 {

Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h

@@ -4,6 +4,8 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 #include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h"

Source/Core/VideoBackends/OGL/PerfQuery.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <array>
+
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/PerfQueryBase.h"
 
 namespace OGL

Source/Core/VideoBackends/OGL/PostProcessing.h

@@ -8,6 +8,7 @@
 #include <unordered_map>
 
 #include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/ProgramShaderCache.h"
 
 #include "VideoCommon/PostProcessing.h"
 #include "VideoCommon/VideoCommon.h"

Source/Core/VideoBackends/OGL/RasterFont.h

@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 namespace OGL
 {
 

Source/Core/VideoBackends/OGL/VertexManager.h

@@ -4,7 +4,9 @@
 
 #pragma once
 
+#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/CPMemory.h"
+#include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 namespace OGL

Source/Core/VideoBackends/Software/DebugUtil.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/Common.h"
+
 namespace DebugUtil
 {
 	void Init();

Source/Core/VideoBackends/Software/SWVertexLoader.cpp

@@ -6,6 +6,7 @@
 #include "Common/CommonTypes.h"
 
 #include "VideoBackends/Software/CPMemLoader.h"
+#include "VideoBackends/Software/NativeVertexFormat.h"
 #include "VideoBackends/Software/SetupUnit.h"
 #include "VideoBackends/Software/SWStatistics.h"
 #include "VideoBackends/Software/SWVertexLoader.h"

Source/Core/VideoBackends/Software/TextureSampler.cpp

@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "Common/CommonFuncs.h"
+#include "Common/Common.h"
 #include "Core/HW/Memmap.h"
 #include "VideoBackends/Software/BPMemLoader.h"
 #include "VideoBackends/Software/TextureSampler.h"

Source/Core/VideoCommon/ConstantManager.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 // all constant buffer attributes must be 16 bytes aligned, so this are the only allowed components:
 typedef float float4[4];
 typedef u32 uint4[4];

Source/Core/VideoCommon/DataReader.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Common/Common.h"
 #include "VideoCommon/VertexManagerBase.h"
 
 extern u8* g_video_buffer_read_ptr;

Source/Core/VideoCommon/NativeVertexFormat.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <functional> // for hash
+
+#include "Common/Common.h"
 #include "Common/Hash.h"
 
 // m_components

Source/Core/VideoCommon/OnScreenDisplay.h

@@ -7,6 +7,8 @@
 #include <functional>
 #include <string>
 
+#include "Common/CommonTypes.h"
+
 namespace OSD
 {
 // On-screen message display

Source/Core/VideoCommon/OpcodeDecoding.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+
 #define GX_NOP                      0x00
 
 #define GX_LOAD_BP_REG              0x61

Source/Core/VideoCommon/TextureDecoder.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Common/Common.h"
 #include "Common/Hash.h"
 
 enum

Source/Core/VideoCommon/VertexLoader_Color.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "VideoCommon/NativeVertexFormat.h"
+
 void LOADERDECL Color_ReadDirect_24b_888();
 void LOADERDECL Color_ReadDirect_32b_888x();
 void LOADERDECL Color_ReadDirect_16b_565();

Source/Core/VideoCommon/VertexLoader_Normal.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
+#include "VideoCommon/NativeVertexFormat.h"
 
 class VertexLoader_Normal
 {

Source/Core/VideoCommon/VertexLoader_Position.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "VideoCommon/NativeVertexFormat.h"
+
 class VertexLoader_Position {
 public:
 

Source/Core/VideoCommon/VertexManagerBase.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 
 class NativeVertexFormat;