Merge pull request #2380 from lioncash/corehdr

Core: Remove some header inclusions in header files

Source/Core/Common/ENetUtil.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <enet/enet.h>
-#include "Common.h"
 
 namespace ENetUtil
 {

Source/Core/Core/ActionReplay.cpp

@@ -23,6 +23,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Common/IniFile.h"
 #include "Common/StringUtil.h"
 #include "Common/Logging/LogManager.h"
 

Source/Core/Core/ActionReplay.h

@@ -4,7 +4,11 @@
 
 #pragma once
 
-#include "Common/IniFile.h"
+#include <string>
+#include <vector>
+#include "Common/CommonTypes.h"
+
+class IniFile;
 
 namespace ActionReplay
 {

Source/Core/Core/Boot/Boot.cpp

@@ -12,6 +12,7 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+#include "Core/CoreParameter.h"
 #include "Core/Host.h"
 #include "Core/PatchEngine.h"
 #include "Core/Boot/Boot.h"

Source/Core/Core/Boot/Boot.h

@@ -7,10 +7,7 @@
 #include <cstdlib>
 #include <string>
 
-#include "Core/CoreParameter.h"
-
 #include "DiscIO/Volume.h"
-using DiscIO::IVolume;
 
 struct CountrySetting
 {
@@ -58,5 +55,5 @@ private:
 	static bool Load_BS2(const std::string& _rBootROMFilename);
 	static void Load_FST(bool _bIsWii);
 
-	static bool SetupWiiMemory(IVolume::ECountry country);
+	static bool SetupWiiMemory(DiscIO::IVolume::ECountry country);
 };

Source/Core/Core/Boot/Boot_BS2Emu.cpp

@@ -163,18 +163,18 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader)
 	return true;
 }
 
-bool CBoot::SetupWiiMemory(IVolume::ECountry country)
+bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country)
 {
 	static const CountrySetting SETTING_EUROPE = {"EUR", "PAL",  "EU", "LE"};
-	static const std::map<IVolume::ECountry, const CountrySetting> country_settings = {
-		{IVolume::COUNTRY_EUROPE, SETTING_EUROPE},
-		{IVolume::COUNTRY_USA,    {"USA", "NTSC", "US", "LU"}},
-		{IVolume::COUNTRY_JAPAN,  {"JPN", "NTSC", "JP", "LJ"}},
-		{IVolume::COUNTRY_KOREA,  {"KOR", "NTSC", "KR", "LKH"}},
+	static const std::map<DiscIO::IVolume::ECountry, const CountrySetting> country_settings = {
+		{DiscIO::IVolume::COUNTRY_EUROPE, SETTING_EUROPE},
+		{DiscIO::IVolume::COUNTRY_USA,    {"USA", "NTSC", "US", "LU"}},
+		{DiscIO::IVolume::COUNTRY_JAPAN,  {"JPN", "NTSC", "JP", "LJ"}},
+		{DiscIO::IVolume::COUNTRY_KOREA,  {"KOR", "NTSC", "KR", "LKH"}},
 		//TODO: Determine if Taiwan have their own specific settings.
 		//      Also determine if there are other specific settings
 		//      for other countries.
-		{IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}}
+		{DiscIO::IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}}
 	};
 	auto entryPos = country_settings.find(country);
 	const CountrySetting& country_setting =

Source/Core/Core/ConfigManager.h

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

Source/Core/Core/Core.cpp

@@ -23,6 +23,7 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+#include "Core/CoreParameter.h"
 #include "Core/CoreTiming.h"
 #include "Core/DSPEmulator.h"
 #include "Core/Host.h"
@@ -33,7 +34,6 @@
 #include "Core/State.h"
 #include "Core/Boot/Boot.h"
 #include "Core/FifoPlayer/FifoPlayer.h"
-
 #include "Core/HW/AudioInterface.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/DSP.h"
@@ -48,6 +48,7 @@
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h"
 #include "Core/IPC_HLE/WII_Socket.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/PowerPC.h"
@@ -57,7 +58,7 @@
 #endif
 
 #include "DiscIO/FileMonitor.h"
-
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/VideoBackendBase.h"
 

Source/Core/Core/Core.h

@@ -15,7 +15,6 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Core/CoreParameter.h"
 
 // TODO: ugly, remove
 extern bool g_aspect_wide;

Source/Core/Core/CoreParameter.cpp

@@ -373,17 +373,17 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri
 	}
 }
 
-IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const
+DiscIO::IVolume::ELanguage SCoreStartupParameter::GetCurrentLanguage(bool wii) const
 {
-	IVolume::ELanguage language;
+	DiscIO::IVolume::ELanguage language;
 	if (wii)
-		language = (IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
+		language = (DiscIO::IVolume::ELanguage)SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.LNG");
 	else
-		language = (IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1);
+		language = (DiscIO::IVolume::ELanguage)(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage + 1);
 
 	// Get rid of invalid values (probably doesn't matter, but might as well do it)
-	if (language > IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0)
-		language = IVolume::ELanguage::LANGUAGE_UNKNOWN;
+	if (language > DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN || language < 0)
+		language = DiscIO::IVolume::ELanguage::LANGUAGE_UNKNOWN;
 	return language;
 }
 

Source/Core/Core/DSP/DSPAnalyzer.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <array>
-#include "Core/DSP/DSPInterpreter.h"
+#include "Common/CommonTypes.h"
 
 // Basic code analysis.
 namespace DSPAnalyzer

Source/Core/Core/DSP/DSPBreakpoints.h

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

Source/Core/Core/DSP/DSPCore.cpp

@@ -34,6 +34,7 @@
 #include "Core/DSP/DSPEmitter.h"
 #include "Core/DSP/DSPHost.h"
 #include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntUtil.h"
 
 SDSP g_dsp;

Source/Core/Core/DSP/DSPCore.h

@@ -29,8 +29,6 @@
 #include <memory>
 #include <string>
 
-#include "Common/Thread.h"
-
 #include "Core/DSP/DSPBreakpoints.h"
 #include "Core/DSP/DSPCaptureLogger.h"
 #include "Core/DSP/DSPEmitter.h"

Source/Core/Core/DSP/DSPIntArithmetic.cpp

@@ -7,6 +7,8 @@
 #include "Core/DSP/DSPIntCCUtil.h"
 #include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
 
 // Arithmetic and accumulator control.
 

Source/Core/Core/DSP/DSPIntExtOps.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/DSPCommon.h"
 
 // Extended opcode support.
 // Many opcode have the lower 0xFF (some only 0x7f) free - there, an opcode extension

Source/Core/Core/DSP/DSPIntMisc.cpp

@@ -6,8 +6,9 @@
 
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPInterpreter.h"
-
 #include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPIntMultiplier.cpp

@@ -10,6 +10,7 @@
 #include "Core/DSP/DSPIntCCUtil.h"
 #include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPTables.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPIntUtil.h

@@ -28,8 +28,6 @@
 #include "Common/CommonTypes.h"
 
 #include "Core/DSP/DSPCore.h"
-#include "Core/DSP/DSPInterpreter.h"
-#include "Core/DSP/DSPMemoryMap.h"
 #include "Core/DSP/DSPStacks.h"
 
 

Source/Core/Core/DSP/DSPInterpreter.cpp

@@ -26,7 +26,9 @@
 #include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
 #include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
 #include "Core/DSP/DSPTables.h"
 
 namespace DSPInterpreter {