diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index de6877c278..5f76c60de7 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "AudioCommon/AlsaSoundStream.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #define FRAME_COUNT_MIN 256 diff --git a/Source/Core/AudioCommon/AlsaSoundStream.h b/Source/Core/AudioCommon/AlsaSoundStream.h index b2a3fc4927..65173351f8 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.h +++ b/Source/Core/AudioCommon/AlsaSoundStream.h @@ -9,7 +9,7 @@ #endif #include "AudioCommon/SoundStream.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" class AlsaSound final : public SoundStream diff --git a/Source/Core/AudioCommon/AudioCommon.h b/Source/Core/AudioCommon/AudioCommon.h index 95fd3f7d8c..7766bbb35d 100644 --- a/Source/Core/AudioCommon/AudioCommon.h +++ b/Source/Core/AudioCommon/AudioCommon.h @@ -5,7 +5,7 @@ #pragma once #include "AudioCommon/SoundStream.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" class CMixer; diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp index 996b7ae21a..afbaa00cdd 100644 --- a/Source/Core/AudioCommon/OpenSLESStream.cpp +++ b/Source/Core/AudioCommon/OpenSLESStream.cpp @@ -9,7 +9,7 @@ #include #include "AudioCommon/OpenSLESStream.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" // engine interfaces static SLObjectItf engineObject; diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp index 22559feb41..8d56e8a377 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/PulseAudioStream.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "AudioCommon/PulseAudioStream.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" namespace diff --git a/Source/Core/AudioCommon/PulseAudioStream.h b/Source/Core/AudioCommon/PulseAudioStream.h index eeeeebe836..e84bed6462 100644 --- a/Source/Core/AudioCommon/PulseAudioStream.h +++ b/Source/Core/AudioCommon/PulseAudioStream.h @@ -11,7 +11,7 @@ #include #include "AudioCommon/SoundStream.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" class PulseAudio final : public SoundStream diff --git a/Source/Core/AudioCommon/SoundStream.h b/Source/Core/AudioCommon/SoundStream.h index 7d663a6fd8..e977180280 100644 --- a/Source/Core/AudioCommon/SoundStream.h +++ b/Source/Core/AudioCommon/SoundStream.h @@ -6,7 +6,7 @@ #include "AudioCommon/Mixer.h" #include "AudioCommon/WaveFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" class SoundStream { diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp index a9f1e2ca08..efbc512276 100644 --- a/Source/Core/AudioCommon/WaveFile.cpp +++ b/Source/Core/AudioCommon/WaveFile.cpp @@ -5,7 +5,7 @@ #include #include "AudioCommon/WaveFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" enum {BUF_SIZE = 32*1024}; diff --git a/Source/Core/AudioCommon/WaveFile.h b/Source/Core/AudioCommon/WaveFile.h index 1136e1394a..e70475902e 100644 --- a/Source/Core/AudioCommon/WaveFile.h +++ b/Source/Core/AudioCommon/WaveFile.h @@ -15,7 +15,7 @@ #pragma once #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" class WaveFileWriter : NonCopyable diff --git a/Source/Core/AudioCommon/aldlist.cpp b/Source/Core/AudioCommon/aldlist.cpp index 0b75f8f5cd..559d3b9164 100644 --- a/Source/Core/AudioCommon/aldlist.cpp +++ b/Source/Core/AudioCommon/aldlist.cpp @@ -23,7 +23,7 @@ */ #include "AudioCommon/aldlist.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #ifdef _WIN32 #include "../../../Externals/OpenAL/include/al.h" #include "../../../Externals/OpenAL/include/alc.h" diff --git a/Source/Core/Common/ArmCPUDetect.cpp b/Source/Core/Common/ArmCPUDetect.cpp index ed15f4b19d..8e324af868 100644 --- a/Source/Core/Common/ArmCPUDetect.cpp +++ b/Source/Core/Common/ArmCPUDetect.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/ArmEmitter.h b/Source/Core/Common/ArmEmitter.h index fbc0f80d67..ed0376e9c8 100644 --- a/Source/Core/Common/ArmEmitter.h +++ b/Source/Core/Common/ArmEmitter.h @@ -10,7 +10,7 @@ #include "Common/ArmCommon.h" #include "Common/CodeBlock.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #if defined(__SYMBIAN32__) || defined(PANDORA) #include diff --git a/Source/Core/Common/BreakPoints.cpp b/Source/Core/Common/BreakPoints.cpp index 02924d639a..d23e1fa0e2 100644 --- a/Source/Core/Common/BreakPoints.cpp +++ b/Source/Core/Common/BreakPoints.cpp @@ -7,7 +7,7 @@ #include #include "Common/BreakPoints.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/DebugInterface.h" #include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/JitCommon/JitCache.h" diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp index e0ccd20dab..45f2011149 100644 --- a/Source/Core/Common/CDUtils.cpp +++ b/Source/Core/Common/CDUtils.cpp @@ -6,7 +6,7 @@ #include #include "Common/CDUtils.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #ifdef _WIN32 diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index 74c8661199..1d71c44d0f 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -23,7 +23,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Flag.h" diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index 990d8e075c..f3cf24aa4b 100644 --- a/Source/Core/Common/ColorUtil.cpp +++ b/Source/Core/Common/ColorUtil.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ColorUtil.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace ColorUtil { diff --git a/Source/Core/Common/Crypto/bn.cpp b/Source/Core/Common/Crypto/bn.cpp index 425a9aa795..9311051a17 100644 --- a/Source/Core/Common/Crypto/bn.cpp +++ b/Source/Core/Common/Crypto/bn.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Crypto/bn.h" static void bn_zero(u8 *d, u32 n) diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp index b75411b0d6..09f116586f 100644 --- a/Source/Core/Common/Crypto/ec.cpp +++ b/Source/Core/Common/Crypto/ec.cpp @@ -11,7 +11,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Crypto/bn.h" #include "Common/Crypto/ec.h" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index bac3814185..1cce81ed81 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -12,8 +12,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #ifdef _WIN32 diff --git a/Source/Core/Common/Hash.h b/Source/Core/Common/Hash.h index 868ccad194..bcaa687e8c 100644 --- a/Source/Core/Common/Hash.h +++ b/Source/Core/Common/Hash.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0. u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index 418d125bc7..b3b0b4d85e 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -8,7 +8,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" // On disk format: diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h index 143398d6f7..5af6ce40f9 100644 --- a/Source/Core/Common/MathUtil.h +++ b/Source/Core/Common/MathUtil.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace MathUtil { diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 8e91359661..5ab87f6a0c 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MemArena.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h index a2efafad6e..ccfc962f22 100644 --- a/Source/Core/Common/MemArena.h +++ b/Source/Core/Common/MemArena.h @@ -10,7 +10,7 @@ #include #endif -#include "Common/Common.h" +#include "Common/CommonTypes.h" // This class lets you create a block of anonymous RAM, and then arbitrarily map views into it. // Multiple views can mirror the same section of the block, which makes it very convenient for emulating diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index 7d5eaa0b28..f7e1d7d902 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" #ifdef _WIN32 diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp index dff2f5ad0f..6af1b7e7a7 100644 --- a/Source/Core/Common/MsgHandler.cpp +++ b/Source/Core/Common/MsgHandler.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" bool DefaultMsgHandler(const char* caption, const char* text, bool yes_no, int Style); diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 703cd4e952..0a394cb113 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp index 7b793500d9..1290a63c56 100644 --- a/Source/Core/Common/SDCardUtil.cpp +++ b/Source/Core/Common/SDCardUtil.cpp @@ -35,7 +35,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/SDCardUtil.h" diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 91d451a03f..d1af64f30e 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -14,8 +14,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #ifdef _WIN32 diff --git a/Source/Core/Common/SymbolDB.cpp b/Source/Core/Common/SymbolDB.cpp index 59b015a166..08fdbdc857 100644 --- a/Source/Core/Common/SymbolDB.cpp +++ b/Source/Core/Common/SymbolDB.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/SymbolDB.h" void SymbolDB::List() diff --git a/Source/Core/Common/SymbolDB.h b/Source/Core/Common/SymbolDB.h index 35edd1e021..ed0b0a767f 100644 --- a/Source/Core/Common/SymbolDB.h +++ b/Source/Core/Common/SymbolDB.h @@ -12,7 +12,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" struct SCall { diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp index 46ced20fc3..111a8846ca 100644 --- a/Source/Core/Common/SysConf.cpp +++ b/Source/Core/Common/SysConf.cpp @@ -8,7 +8,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/SysConf.h" diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp index 39649d67c1..9e27387c9a 100644 --- a/Source/Core/Common/Thread.cpp +++ b/Source/Core/Common/Thread.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #ifdef __APPLE__ diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index e8ee180a4e..6deb0a2441 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "scmrev.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #ifdef _DEBUG #define BUILD_TYPE_STR "Debug " diff --git a/Source/Core/Common/x64ABI.cpp b/Source/Core/Common/x64ABI.cpp index d489301c4b..9e13f7bc90 100644 --- a/Source/Core/Common/x64ABI.cpp +++ b/Source/Core/Common/x64ABI.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/x64ABI.h" #include "Common/x64Emitter.h" diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index 592857a165..8c3738034a 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #ifdef _WIN32 diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index b654a04b47..9d9b2551c1 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/x64Emitter.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index f229c1a1c3..28244bbccc 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -11,7 +11,7 @@ #include #include "Common/CodeBlock.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace Gen { diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp index f6a8ba2575..90143d7e13 100644 --- a/Source/Core/Common/x64FPURoundMode.cpp +++ b/Source/Core/Common/x64FPURoundMode.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/FPURoundMode.h" diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h index 7c2e89844b..dcc7df41d9 100644 --- a/Source/Core/Core/ARDecrypt.h +++ b/Source/Core/Core/ARDecrypt.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ActionReplay.h" namespace ActionReplay diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp index 400f510a46..98e7da31fd 100644 --- a/Source/Core/Core/ActionReplay.cpp +++ b/Source/Core/Core/ActionReplay.cpp @@ -22,7 +22,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/Logging/LogManager.h" diff --git a/Source/Core/Core/ArmMemTools.cpp b/Source/Core/Core/ArmMemTools.cpp index f26b84c1d9..ff7d77e4f4 100644 --- a/Source/Core/Core/ArmMemTools.cpp +++ b/Source/Core/Core/ArmMemTools.cpp @@ -12,7 +12,7 @@ #include // Look in here for the context definition. #endif -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/MemTools.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/JitInterface.h" diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp index d6cf708af3..26814c233f 100644 --- a/Source/Core/Core/Boot/Boot.cpp +++ b/Source/Core/Core/Boot/Boot.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/MathUtil.h" diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index 6d0761f4b4..5bf9c4fbba 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Common/SettingsHandler.h" diff --git a/Source/Core/Core/Boot/ElfReader.cpp b/Source/Core/Core/Boot/ElfReader.cpp index cdb278364b..eba28e8014 100644 --- a/Source/Core/Core/Boot/ElfReader.cpp +++ b/Source/Core/Core/Boot/ElfReader.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CommonTypes.h" #include "Core/Boot/ElfReader.h" diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 1b2975bd42..132eaf8886 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 60ad312982..7e23619654 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -11,8 +11,8 @@ #include "AudioCommon/AudioCommon.h" #include "Common/Atomic.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/MathUtil.h" #include "Common/MemoryUtil.h" diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 2379c05e34..4469c3de57 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -5,8 +5,8 @@ #include #include "Common/CDUtils.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/CoreTiming.h b/Source/Core/Core/CoreTiming.h index 7eb3784ae1..a87d645802 100644 --- a/Source/Core/Core/CoreTiming.h +++ b/Source/Core/Core/CoreTiming.h @@ -18,7 +18,7 @@ // ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever") #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" class PointerWrap; diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp index 0a0e59d7a3..5e9f1ca52b 100644 --- a/Source/Core/Core/DSP/DSPAccelerator.cpp +++ b/Source/Core/Core/DSP/DSPAccelerator.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/DSP/DSPAccelerator.h" diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp index 3ee4961fe7..fb614af399 100644 --- a/Source/Core/Core/DSP/DSPAssembler.cpp +++ b/Source/Core/Core/DSP/DSPAssembler.cpp @@ -44,7 +44,7 @@ Initial import #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Core/DSP/DSPAssembler.h" diff --git a/Source/Core/Core/DSP/DSPAssembler.h b/Source/Core/Core/DSP/DSPAssembler.h index 751509271d..bf49e1669e 100644 --- a/Source/Core/Core/DSP/DSPAssembler.h +++ b/Source/Core/Core/DSP/DSPAssembler.h @@ -27,7 +27,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPDisassembler.h" #include "Core/DSP/DSPTables.h" diff --git a/Source/Core/Core/DSP/DSPBreakpoints.h b/Source/Core/Core/DSP/DSPBreakpoints.h index 6f07679a5a..79d0f66ca1 100644 --- a/Source/Core/Core/DSP/DSPBreakpoints.h +++ b/Source/Core/Core/DSP/DSPBreakpoints.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" // super fast breakpoints for a limited range. // To be used interchangeably with the BreakPoints class. diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index b3b830259b..29bcf3b5b5 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/DSP/DSPCodeUtil.h b/Source/Core/Core/DSP/DSPCodeUtil.h index 5813b011e5..ba707240d4 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.h +++ b/Source/Core/Core/DSP/DSPCodeUtil.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" bool Assemble(const std::string& text, std::vector &code, bool force = false); bool Disassemble(const std::vector &code, bool line_numbers, std::string &text); diff --git a/Source/Core/Core/DSP/DSPCore.cpp b/Source/Core/Core/DSP/DSPCore.cpp index e6dbb97719..b002b3d3c9 100644 --- a/Source/Core/Core/DSP/DSPCore.cpp +++ b/Source/Core/Core/DSP/DSPCore.cpp @@ -23,7 +23,7 @@ ====================================================================*/ -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/FileUtil.h" #include "Common/Hash.h" diff --git a/Source/Core/Core/DSP/DSPDisassembler.cpp b/Source/Core/Core/DSP/DSPDisassembler.cpp index 7243cfddb6..53ac81aa9a 100644 --- a/Source/Core/Core/DSP/DSPDisassembler.cpp +++ b/Source/Core/Core/DSP/DSPDisassembler.cpp @@ -28,7 +28,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/DSP/DSPDisassembler.h b/Source/Core/Core/DSP/DSPDisassembler.h index 3bc0c3094c..5875c67e53 100644 --- a/Source/Core/Core/DSP/DSPDisassembler.h +++ b/Source/Core/Core/DSP/DSPDisassembler.h @@ -28,7 +28,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPTables.h" #include "Core/DSP/LabelMap.h" diff --git a/Source/Core/Core/DSP/DSPHWInterface.h b/Source/Core/Core/DSP/DSPHWInterface.h index 331762ee2b..a87f569d07 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.h +++ b/Source/Core/Core/DSP/DSPHWInterface.h @@ -25,7 +25,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #define GDSP_MBOX_CPU 0 #define GDSP_MBOX_DSP 1 diff --git a/Source/Core/Core/DSP/DSPIntCCUtil.h b/Source/Core/Core/DSP/DSPIntCCUtil.h index 7981b91098..f15513ab0a 100644 --- a/Source/Core/Core/DSP/DSPIntCCUtil.h +++ b/Source/Core/Core/DSP/DSPIntCCUtil.h @@ -8,7 +8,7 @@ // Anything to do with SR and conditions goes here. -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace DSPInterpreter { diff --git a/Source/Core/Core/DSP/DSPIntUtil.h b/Source/Core/Core/DSP/DSPIntUtil.h index 19ab6f7ad9..09c475afbc 100644 --- a/Source/Core/Core/DSP/DSPIntUtil.h +++ b/Source/Core/Core/DSP/DSPIntUtil.h @@ -25,7 +25,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPInterpreter.h" diff --git a/Source/Core/Core/DSP/DSPMemoryMap.h b/Source/Core/Core/DSP/DSPMemoryMap.h index f37f29981d..9069603fac 100644 --- a/Source/Core/Core/DSP/DSPMemoryMap.h +++ b/Source/Core/Core/DSP/DSPMemoryMap.h @@ -25,7 +25,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPInterpreter.h" diff --git a/Source/Core/Core/DSP/DSPStacks.cpp b/Source/Core/Core/DSP/DSPStacks.cpp index 40b50f860c..309ff7807f 100644 --- a/Source/Core/Core/DSP/DSPStacks.cpp +++ b/Source/Core/Core/DSP/DSPStacks.cpp @@ -23,7 +23,7 @@ ====================================================================*/ -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPStacks.h" diff --git a/Source/Core/Core/DSP/DSPStacks.h b/Source/Core/Core/DSP/DSPStacks.h index db228e5f67..9f20fa0be8 100644 --- a/Source/Core/Core/DSP/DSPStacks.h +++ b/Source/Core/Core/DSP/DSPStacks.h @@ -25,7 +25,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" void dsp_reg_store_stack(int stack_reg, u16 val); u16 dsp_reg_load_stack(int stack_reg); diff --git a/Source/Core/Core/DSP/DSPTables.cpp b/Source/Core/Core/DSP/DSPTables.cpp index 74cd0228ae..947f3d49f4 100644 --- a/Source/Core/Core/DSP/DSPTables.cpp +++ b/Source/Core/Core/DSP/DSPTables.cpp @@ -4,7 +4,7 @@ // Additional copyrights go to Duddie (c) 2005 (duddie@walla.com) -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/DSP/DSPEmitter.h" #include "Core/DSP/DSPInterpreter.h" diff --git a/Source/Core/Core/DSP/LabelMap.h b/Source/Core/Core/DSP/LabelMap.h index 6875b556cd..65e272d43d 100644 --- a/Source/Core/Core/DSP/LabelMap.h +++ b/Source/Core/Core/DSP/LabelMap.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" enum LabelType { diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp index b21ed5e1cc..29255a307a 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/Core.h" diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.h b/Source/Core/Core/Debugger/Debugger_SymbolMap.h index e2fc5fbeb2..ebfafd6f5a 100644 --- a/Source/Core/Core/Debugger/Debugger_SymbolMap.h +++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace Dolphin_Debugger { diff --git a/Source/Core/Core/Debugger/Dump.cpp b/Source/Core/Core/Debugger/Dump.cpp index eca1fc3ee2..33f64478dc 100644 --- a/Source/Core/Core/Debugger/Dump.cpp +++ b/Source/Core/Core/Debugger/Dump.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Core/Debugger/Dump.h" diff --git a/Source/Core/Core/Debugger/Dump.h b/Source/Core/Core/Debugger/Dump.h index 051241c180..8e23d241fc 100644 --- a/Source/Core/Core/Debugger/Dump.h +++ b/Source/Core/Core/Debugger/Dump.h @@ -9,7 +9,7 @@ #pragma once #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" class CDump { diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h index 7953cf61f5..e1461e6c33 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h index a5e8027c73..65dffc637a 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace File { diff --git a/Source/Core/Core/FifoPlayer/FifoFileStruct.h b/Source/Core/Core/FifoPlayer/FifoFileStruct.h index 928a2d5bfc..f0a615c558 100644 --- a/Source/Core/Core/FifoPlayer/FifoFileStruct.h +++ b/Source/Core/Core/FifoPlayer/FifoFileStruct.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace FifoFileStruct { diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp index cc006a295b..ded2809a4e 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/FifoPlayer/FifoAnalyzer.h" #include "Core/FifoPlayer/FifoDataFile.h" diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 25c20b0374..b06df099a4 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h index bc9a27b870..8f9797e86a 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/FifoPlayer/FifoAnalyzer.h" diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index d91e3212d2..dc1947ac66 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -8,7 +8,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace Gecko { diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp index 18aa31bdf8..1bedecea64 100644 --- a/Source/Core/Core/HLE/HLE.cpp +++ b/Source/Core/Core/HLE/HLE.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp index 633c4fc1b9..b3b18fb437 100644 --- a/Source/Core/Core/HLE/HLE_Misc.cpp +++ b/Source/Core/Core/HLE/HLE_Misc.cpp @@ -4,8 +4,8 @@ #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Host.h" diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp index d1399571a8..74743b5a57 100644 --- a/Source/Core/Core/HLE/HLE_OS.cpp +++ b/Source/Core/Core/HLE/HLE_OS.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/HLE/HLE_OS.h" diff --git a/Source/Core/Core/HLE/HLE_OS.h b/Source/Core/Core/HLE/HLE_OS.h index f0d0af2815..a62eadd234 100644 --- a/Source/Core/Core/HLE/HLE_OS.h +++ b/Source/Core/Core/HLE/HLE_OS.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace HLE_OS { diff --git a/Source/Core/Core/HW/AudioInterface.cpp b/Source/Core/Core/HW/AudioInterface.cpp index 731e9a4d96..b6b997464f 100644 --- a/Source/Core/Core/HW/AudioInterface.cpp +++ b/Source/Core/Core/HW/AudioInterface.cpp @@ -53,7 +53,7 @@ This file mainly deals with the [Drive I/F], however [AIDFR] controls #include "AudioCommon/AudioCommon.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp index 02fac646c4..12787dbde1 100644 --- a/Source/Core/Core/HW/CPU.cpp +++ b/Source/Core/Core/HW/CPU.cpp @@ -5,7 +5,7 @@ #include #include "AudioCommon/AudioCommon.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Event.h" #include "Core/Core.h" #include "Core/DSPEmulator.h" diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h index 0925363d76..f9b7e922fc 100644 --- a/Source/Core/Core/HW/CPU.h +++ b/Source/Core/Core/HW/CPU.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace Common { class Event; diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h index 5266c7f535..ecbd04c8ea 100644 --- a/Source/Core/Core/HW/DSP.h +++ b/Source/Core/Core/HW/DSP.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" class PointerWrap; class DSPEmulator; diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.h b/Source/Core/Core/HW/DSPHLE/MailHandler.h index 9c523ebe60..b125acdf1b 100644 --- a/Source/Core/Core/HW/DSPHLE/MailHandler.h +++ b/Source/Core/Core/HW/DSPHLE/MailHandler.h @@ -5,7 +5,7 @@ #pragma once #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" class PointerWrap; diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h index 89731ecba6..070c82170a 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXVoice.h @@ -14,7 +14,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h index 9e46bc659b..4c3b5bfd86 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h @@ -5,7 +5,7 @@ #pragma once #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h index 97bbe9f930..c6b68ed499 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h +++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/DSPHLE/UCodes/UCodes.h" // Obviously missing things that must be in here, somewhere among the "unknown": diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp index c9bba00911..4f8f8ed6c1 100644 --- a/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp +++ b/Source/Core/Core/HW/DSPHLE/UCodes/ZeldaADPCM.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/HW/DSPHLE/UCodes/Zelda.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h index 2342b940f0..ab643eb3df 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/DebugInterface.h" class DSPDebugInterface final : public DebugInterface diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp index fee21808d3..1fe7ab62cb 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Hash.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index 30cccb2042..d9484b85c4 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -7,8 +7,8 @@ #include "Common/Atomic.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/Event.h" #include "Common/IniFile.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp index d41db0a0ba..86fa831726 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Core/DSP/DSPCore.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h index 8112834d71..654b7018e2 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" // TODO: Get rid of this file. diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp index 4c0aad73d6..942b251e02 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp index 78b6b34879..ac8f4094a2 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h index e48927da7d..1f86a6a36c 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPSymbols.h +++ b/Source/Core/Core/HW/DSPLLE/DSPSymbols.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/SymbolDB.h" namespace DSPSymbols diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp index 8c01ba64df..cd5c4ebe80 100644 --- a/Source/Core/Core/HW/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVDInterface.cpp @@ -7,7 +7,7 @@ #include "AudioCommon/AudioCommon.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/EXI.cpp b/Source/Core/Core/HW/EXI.cpp index a6bdcc392d..bf07b3c6a1 100644 --- a/Source/Core/Core/HW/EXI.cpp +++ b/Source/Core/Core/HW/EXI.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp index 111925a640..018b087dc2 100644 --- a/Source/Core/Core/HW/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI_DeviceIPL.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MemoryUtil.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp index 354d32f0a9..fb6c7ef832 100644 --- a/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMemoryCard.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI_DeviceMic.cpp index 4d4268fd98..a14e7f4d16 100644 --- a/Source/Core/Core/HW/EXI_DeviceMic.cpp +++ b/Source/Core/Core/HW/EXI_DeviceMic.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #if HAVE_PORTAUDIO diff --git a/Source/Core/Core/HW/GCMemcard.h b/Source/Core/Core/HW/GCMemcard.h index 6bbdd1235d..459efd937b 100644 --- a/Source/Core/Core/HW/GCMemcard.h +++ b/Source/Core/Core/HW/GCMemcard.h @@ -7,8 +7,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp index f56fca56d6..6f27e7f73e 100644 --- a/Source/Core/Core/HW/GCPad.cpp +++ b/Source/Core/Core/HW/GCPad.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/HW/GCPad.h" diff --git a/Source/Core/Core/HW/GPFifo.cpp b/Source/Core/Core/HW/GPFifo.cpp index 0b59007243..3643f88fca 100644 --- a/Source/Core/Core/HW/GPFifo.cpp +++ b/Source/Core/Core/HW/GPFifo.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/GPFifo.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/HW/GPFifo.h b/Source/Core/Core/HW/GPFifo.h index 6871d95186..466fd18e88 100644 --- a/Source/Core/Core/HW/GPFifo.h +++ b/Source/Core/Core/HW/GPFifo.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" class PointerWrap; namespace GPFifo diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index 6da1b86238..1706967a5e 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/HW/MMIOHandlers.h b/Source/Core/Core/HW/MMIOHandlers.h index 4e9a2f4242..3a9e53e98c 100644 --- a/Source/Core/Core/HW/MMIOHandlers.h +++ b/Source/Core/Core/HW/MMIOHandlers.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.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 diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp index f6a4dbe2c2..e1b1548c40 100644 --- a/Source/Core/Core/HW/Memmap.cpp +++ b/Source/Core/Core/HW/Memmap.cpp @@ -9,7 +9,7 @@ // may be redirected here (for example to Read_U32()). #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MemArena.h" #include "Common/MemoryUtil.h" diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h index f130cf643f..f8fb9eb606 100644 --- a/Source/Core/Core/HW/Memmap.h +++ b/Source/Core/Core/HW/Memmap.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" // Enable memory checks in the Debug/DebugFast builds, but NOT in release #if defined(_DEBUG) || defined(DEBUGFAST) diff --git a/Source/Core/Core/HW/MemmapFunctions.cpp b/Source/Core/Core/HW/MemmapFunctions.cpp index f081920ed7..c19f227f32 100644 --- a/Source/Core/Core/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/HW/MemmapFunctions.cpp @@ -16,7 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include "Common/Atomic.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp index 14ad7cfb78..564d3fa15d 100644 --- a/Source/Core/Core/HW/MemoryInterface.cpp +++ b/Source/Core/Core/HW/MemoryInterface.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/MemoryInterface.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/HW/MemoryInterface.h b/Source/Core/Core/HW/MemoryInterface.h index 3d4891f972..4427ed643c 100644 --- a/Source/Core/Core/HW/MemoryInterface.h +++ b/Source/Core/Core/HW/MemoryInterface.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace MMIO { class Mapping; } class PointerWrap; diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp index 46aac4e007..18cb3d2b25 100644 --- a/Source/Core/Core/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/HW/ProcessorInterface.cpp @@ -6,7 +6,7 @@ #include "Common/Atomic.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/CoreTiming.h" #include "Core/HW/CPU.h" diff --git a/Source/Core/Core/HW/SI.cpp b/Source/Core/Core/HW/SI.cpp index e1512ed3cd..b18a6bf201 100644 --- a/Source/Core/Core/HW/SI.cpp +++ b/Source/Core/Core/HW/SI.cpp @@ -5,7 +5,7 @@ #include #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" diff --git a/Source/Core/Core/HW/SI.h b/Source/Core/Core/HW/SI.h index 4d14f7603c..4379f767ac 100644 --- a/Source/Core/Core/HW/SI.h +++ b/Source/Core/Core/HW/SI.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/SI_Device.h" class PointerWrap; diff --git a/Source/Core/Core/HW/SI_Device.h b/Source/Core/Core/HW/SI_Device.h index 66f85fb53c..1280a6bd29 100644 --- a/Source/Core/Core/HW/SI_Device.h +++ b/Source/Core/Core/HW/SI_Device.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" class PointerWrap; diff --git a/Source/Core/Core/HW/StreamADPCM.h b/Source/Core/Core/HW/StreamADPCM.h index 14384b073e..a854ab5f1f 100644 --- a/Source/Core/Core/HW/StreamADPCM.h +++ b/Source/Core/Core/HW/StreamADPCM.h @@ -6,7 +6,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" class NGCADPCM { diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index 53452a8d65..186cd25772 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -43,7 +43,7 @@ IPC_HLE_PERIOD: For the Wiimote this is the call schedule: */ #include "Common/Atomic.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index 67ca885a8c..d559bf7c02 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/WII_IPC.cpp b/Source/Core/Core/HW/WII_IPC.cpp index eec741dada..a423d7a870 100644 --- a/Source/Core/Core/HW/WII_IPC.cpp +++ b/Source/Core/Core/HW/WII_IPC.cpp @@ -7,7 +7,7 @@ #include #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/CoreTiming.h" #include "Core/HW/CPU.h" diff --git a/Source/Core/Core/HW/WII_IPC.h b/Source/Core/Core/HW/WII_IPC.h index 7cb578b31b..19aec34bfd 100644 --- a/Source/Core/Core/HW/WII_IPC.h +++ b/Source/Core/Core/HW/WII_IPC.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" class PointerWrap; namespace MMIO { class Mapping; } diff --git a/Source/Core/Core/HW/WiiSaveCrypted.cpp b/Source/Core/Core/HW/WiiSaveCrypted.cpp index e45beb6825..d1f4d69a72 100644 --- a/Source/Core/Core/HW/WiiSaveCrypted.cpp +++ b/Source/Core/Core/HW/WiiSaveCrypted.cpp @@ -17,7 +17,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" #include "Common/NandPaths.h" diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index 433422a467..9b3bf898c8 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/Movie.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp index f63aae63f5..cd74da649f 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Attachment/Attachment.h" namespace WiimoteEmu diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp index 46d24715c4..42072179d1 100644 --- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp @@ -20,7 +20,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp index 4d142f89ae..d1b3fe8a85 100644 --- a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp @@ -5,7 +5,7 @@ // Copyright (C) Hector Martin "marcan" (hector@marcansoft.com) -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteEmu/Encryption.h" diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index c0bd342e8e..cc3e5cdcf0 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Timer.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/HW/WiimoteReal/IODummy.cpp index 43da262083..1c778e6d2c 100644 --- a/Source/Core/Core/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IODummy.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" namespace WiimoteReal diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index c7ddd5cec4..bcd4501f7b 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/IPC_HLE/ICMP.h b/Source/Core/Core/IPC_HLE/ICMP.h index 3c136dccaa..ea5d8f19a7 100644 --- a/Source/Core/Core/IPC_HLE/ICMP.h +++ b/Source/Core/Core/IPC_HLE/ICMP.h @@ -6,7 +6,7 @@ #include #endif -#include "Common/Common.h" +#include "Common/CommonTypes.h" int icmp_echo_req(const u32 s, const sockaddr_in *addr, const u8 *data, const u32 data_length); int icmp_echo_rep(const u32 s, sockaddr_in *addr, const u32 timeout, const u32 data_length); diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp index 56fc877e29..69c5022ef9 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp @@ -25,8 +25,8 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC #include #include "Common/ChunkFile.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Thread.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index fc1f753f70..3154c0e3b2 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Logging/LogManager.h" #include "Core/Core.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp index fc1e97bb40..52c7b84eca 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp @@ -5,7 +5,7 @@ #include #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp index 60132f994b..21502a4383 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp index 809960a821..c9433f15c6 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/SDCardUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp index c1e95c6a6a..66a5f042d3 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp index 4cd5f33cd9..ae59cf669e 100644 --- a/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp +++ b/Source/Core/Core/IPC_HLE/WiiMote_HID_Attr.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/IPC_HLE/WiiMote_HID_Attr.h" #if 0 diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 40bf54224d..61d1d04073 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" struct GCPadStatus; class PointerWrap; diff --git a/Source/Core/Core/NetPlayClient.h b/Source/Core/Core/NetPlayClient.h index cdcb6bb06e..006c9df375 100644 --- a/Source/Core/Core/NetPlayClient.h +++ b/Source/Core/Core/NetPlayClient.h @@ -10,7 +10,6 @@ #include -#include "Common/Common.h" #include "Common/CommonTypes.h" #include "Common/FifoQueue.h" #include "Common/Thread.h" diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 14eb998f68..5913b7a48d 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CommonTypes.h" #include "Core/HW/EXI_Device.h" diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h index d465e47452..09c9e33f6b 100644 --- a/Source/Core/Core/NetPlayServer.h +++ b/Source/Core/Core/NetPlayServer.h @@ -10,7 +10,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CommonTypes.h" #include "Common/Thread.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/PowerPC/GDBStub.h b/Source/Core/Core/PowerPC/GDBStub.h index b7d9636659..cf3f642e24 100644 --- a/Source/Core/Core/PowerPC/GDBStub.h +++ b/Source/Core/Core/PowerPC/GDBStub.h @@ -8,7 +8,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #include "Core/HW/CPU.h" diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h index 3a97d96472..ba81004e1a 100644 --- a/Source/Core/Core/PowerPC/Gekko.h +++ b/Source/Core/Core/PowerPC/Gekko.h @@ -7,7 +7,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" // --- Gekko Instruction --- diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 65a4c9fbfd..332e5e5632 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/PowerPC/JitInterface.h" diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp index 7a9a9d05e7..2803af0b0c 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index cc6ff762d0..7412489948 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -10,7 +10,7 @@ #include #endif -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/PatchEngine.h" #include "Core/HLE/HLE.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp index fbe969370b..3770a5a2e6 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitAsm.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp index 79a8f16705..68d5472ff8 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Core/PowerPC/Jit64/Jit.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp index 7117d98942..a31da48fa9 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp @@ -5,7 +5,7 @@ // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. // Should give a very noticable speed boost to paired single heavy code. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitAsm.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp index 4e6ea7ad09..687327bb37 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Core/PowerPC/Jit64/Jit.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp index dd751c27bf..e4c8c6afd8 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp @@ -5,7 +5,7 @@ // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only. // Should give a very noticeable speed boost to paired single heavy code. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Core/PowerPC/Jit64/Jit.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp index 88b65fbd72..ff0786cca0 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/Jit64/Jit.h" #include "Core/PowerPC/Jit64/JitRegCache.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp index d1b0f72c92..560004816e 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/ProcessorInterface.h" #include "Core/HW/SystemTimers.h" diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp index 26b8b50d60..7b2d248036 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp @@ -7,7 +7,7 @@ #include "disasm.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/PowerPC/JitCommon/JitBackpatch.h" #include "Core/PowerPC/JitCommon/JitBase.h" diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h index 6136f1b1e2..3ca7656b21 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/x64Analyzer.h" #include "Common/x64Emitter.h" diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index 46c4be1715..bf1ce35596 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -11,7 +11,7 @@ #include "disasm.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" #include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/JitCommon/JitBase.h" diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index c56d8296db..c12b9fedcf 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp index 81158bab25..743e5d1afd 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Branch.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp index d35eb08b01..8dcac02849 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_FloatingPoint.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::fp_arith_s(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp index f7b6b55112..0147fa61e3 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStore.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::lhax(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp index fbe4e1d4e1..3a2f45d5e8 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStoreFloating.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" // TODO: Add peephole optimizations for multiple consecutive lfd/lfs/stfd/stfs since they are so common, diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp index 1ef9ea86c6..7e881139dc 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_LoadStorePaired.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::psq_st(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp index b26d729909..7b2c1ba8b1 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_Paired.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" void JitILBase::ps_arith(UGeckoInstruction inst) diff --git a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp index e1ad7ee1c7..8e8a8b6dfe 100644 --- a/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp +++ b/Source/Core/Core/PowerPC/JitILCommon/JitILBase_SystemRegisters.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/SystemTimers.h" #include "Core/PowerPC/JitILCommon/JitILBase.h" diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.h b/Source/Core/Core/PowerPC/PPCAnalyst.h index 64d24fdcca..4a9058112a 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.h +++ b/Source/Core/Core/PowerPC/PPCAnalyst.h @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PowerPC/PPCTables.h" class PPCSymbolDB; diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp index eed6723986..b88d7f1362 100644 --- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp +++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index e82754ee19..ab413a5343 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index ada76040f2..4aedff8e65 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -4,7 +4,7 @@ #include "Common/Atomic.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FPURoundMode.h" #include "Common/MathUtil.h" diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h index 26e4aa75c4..a43c667f8c 100644 --- a/Source/Core/Core/PowerPC/PowerPC.h +++ b/Source/Core/Core/PowerPC/PowerPC.h @@ -7,7 +7,7 @@ #include #include "Common/BreakPoints.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/Debugger/PPCDebugInterface.h" #include "Core/PowerPC/CPUCoreBase.h" diff --git a/Source/Core/Core/PowerPC/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB.cpp index 5eb7e409da..7496361681 100644 --- a/Source/Core/Core/PowerPC/SignatureDB.cpp +++ b/Source/Core/Core/PowerPC/SignatureDB.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index e2b6991f7f..09db1697c3 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/StringUtil.h" #include "Common/Timer.h" diff --git a/Source/Core/Core/ec_wii.h b/Source/Core/Core/ec_wii.h index 2b2936dd8e..c51c1b32af 100644 --- a/Source/Core/Core/ec_wii.h +++ b/Source/Core/Core/ec_wii.h @@ -24,7 +24,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.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); diff --git a/Source/Core/Core/x64MemTools.cpp b/Source/Core/Core/x64MemTools.cpp index 108b6ae6a2..de298363df 100644 --- a/Source/Core/Core/x64MemTools.cpp +++ b/Source/Core/Core/x64MemTools.cpp @@ -9,7 +9,7 @@ #include "Common/Thread.h" #endif -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/x64Analyzer.h" #include "Core/MemTools.h" diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp index 09c675cb11..43cd7c6e24 100644 --- a/Source/Core/DiscIO/BannerLoaderGC.cpp +++ b/Source/Core/DiscIO/BannerLoaderGC.cpp @@ -7,7 +7,7 @@ #include #include "Common/ColorUtil.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "DiscIO/BannerLoaderGC.h" #include "DiscIO/Filesystem.h" diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 8634b38da4..be5647ef11 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -14,7 +14,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 8fb33ddfe7..8cdc314ea4 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/DiscScrubber.h" #include "DiscIO/Filesystem.h" diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index 6e1ac6a5c9..320584b1d1 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/Blob.h" #include "DiscIO/DriveBlob.h" diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index 723a02eb2c..770716d2ca 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -9,7 +9,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/Logging/LogManager.h" diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index afc9b12201..727440500e 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -9,7 +9,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp index ac5da99f2c..be37fed1f4 100644 --- a/Source/Core/DiscIO/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/NANDContentLoader.cpp @@ -12,7 +12,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" #include "Common/NandPaths.h" diff --git a/Source/Core/DiscIO/NANDContentLoader.h b/Source/Core/DiscIO/NANDContentLoader.h index d7f12cf5d3..6f67de9ec6 100644 --- a/Source/Core/DiscIO/NANDContentLoader.h +++ b/Source/Core/DiscIO/NANDContentLoader.h @@ -9,7 +9,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" namespace DiscIO diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 648ffeac70..e9cc4eb692 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace DiscIO { diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index f124a656b9..6db8bf21f2 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" namespace DiscIO diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp index 5ae7ca8ce6..c3f5abeb3d 100644 --- a/Source/Core/DiscIO/VolumeCreator.cpp +++ b/Source/Core/DiscIO/VolumeCreator.cpp @@ -9,7 +9,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index 546401f31f..38cc8ab1ad 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -11,8 +11,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" #include "DiscIO/FileBlob.h" diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 77d50da2ed..05ccd4264c 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "DiscIO/Blob.h" #include "DiscIO/FileMonitor.h" diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index bce82e894a..fd189c39c1 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Common/StringUtil.h" #include "DiscIO/Blob.h" diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 2d9262fb82..dd4c2ea6cd 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -9,7 +9,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "DiscIO/Blob.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeGC.h" diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index 4c670968af..77a5864490 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -8,7 +8,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "DiscIO/WbfsBlob.h" diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index a45a3dd968..47e072c8fb 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" #include "Common/Logging/Log.h" diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index 9920dea29e..b0b188b934 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -21,7 +21,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/ActionReplay.h" #include "Core/ARDecrypt.h" diff --git a/Source/Core/DolphinWX/CheatsWindow.cpp b/Source/Core/DolphinWX/CheatsWindow.cpp index ccef4fa593..e392fa50b1 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -31,7 +31,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" #include "Core/ActionReplay.h" diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 485525c93c..7184e73414 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -25,8 +25,8 @@ #include "AudioCommon/AudioCommon.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileSearch.h" #include "Common/SysConf.h" diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp index 4c943f46bd..91da5e92b2 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp @@ -14,7 +14,7 @@ #include #include "Common/BreakPoints.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/Debugger/CodeView.cpp b/Source/Core/DolphinWX/Debugger/CodeView.cpp index 81a085e674..cf7dec412c 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeView.cpp @@ -29,7 +29,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/DebugInterface.h" #include "Common/StringUtil.h" #include "Common/SymbolDB.h" diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h index 82b4925527..018d664122 100644 --- a/Source/Core/DolphinWX/Debugger/CodeView.h +++ b/Source/Core/DolphinWX/Debugger/CodeView.h @@ -16,7 +16,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" wxDECLARE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent); diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index ee86c0b61e..4d3f0ee044 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -27,7 +27,7 @@ #include #include "Common/BreakPoints.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/SymbolDB.h" #include "Core/Core.h" diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index a83413587d..fbf5820c0a 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -23,8 +23,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/SymbolDB.h" diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index b2a9ac7ea2..917945522e 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -20,7 +20,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Common/SymbolDB.h" #include "Core/Host.h" diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 8aa983d830..e9cd5cd409 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -20,7 +20,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/GekkoDisassembler.h" #include "Common/StringUtil.h" #include "Core/PowerPC/Gekko.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp index d5923ab7c3..f79009685e 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp @@ -16,7 +16,7 @@ #include #include "Common/BreakPoints.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 069cf32013..32a1c58f30 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -21,7 +21,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/DebugInterface.h" #include "Common/StringUtil.h" #include "DolphinWX/Globals.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index fd3b036a94..10ff30f1c8 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -24,7 +24,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h index 7e2d1c40cf..46d150b41b 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.h +++ b/Source/Core/DolphinWX/Debugger/RegisterView.h @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" class wxWindow; diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp index 0a5d30c132..e2f454e91d 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -33,7 +33,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoPlaybackAnalyzer.h" #include "Core/FifoPlayer/FifoPlayer.h" diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 5213497e2c..97711b9664 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -36,7 +36,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Thread.h" #include "Common/Logging/ConsoleListener.h" diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index db715139be..34d52068c1 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -30,7 +30,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/MathUtil.h" diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 0bd54e3d2e..4045879e31 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -36,7 +36,7 @@ #endif #include "Common/CDUtils.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 98bc658a12..622a2c305f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -40,7 +40,7 @@ #include #include "Common/CDUtils.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/MathUtil.h" diff --git a/Source/Core/DolphinWX/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/GeckoCodeDiag.cpp index 05726e3592..20a9cf69cb 100644 --- a/Source/Core/DolphinWX/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/GeckoCodeDiag.cpp @@ -22,7 +22,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/Core.h" #include "Core/GeckoCode.h" diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 81cf223284..f26414179c 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -14,8 +14,8 @@ #include #include "Common/ChunkFile.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Hash.h" #include "Common/IniFile.h" diff --git a/Source/Core/DolphinWX/ISOFile.h b/Source/Core/DolphinWX/ISOFile.h index 889bfee874..163f73569e 100644 --- a/Source/Core/DolphinWX/ISOFile.h +++ b/Source/Core/DolphinWX/ISOFile.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "DiscIO/Volume.h" #if defined(HAVE_WX) && HAVE_WX diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 27aa03fedc..6d6d590915 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -53,8 +53,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index 893fc421dc..57a31ecb26 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -28,7 +28,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/Logging/ConsoleListener.h" diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index 7a447709d5..ca603a4e4e 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -17,7 +17,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Logging/LogManager.h" class CFrame; diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 31855d7d0d..082a7544c4 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -28,8 +28,8 @@ #include #include -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 67cf2619ab..0f2c5eddce 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -24,8 +24,8 @@ #include #include "Android/ButtonManager.h" -#include "Common/Common.h" #include "Common/CommonPaths.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/Event.h" #include "Common/FileUtil.h" diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 42f5586170..e000a5a9de 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -9,7 +9,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Event.h" #include "Common/Logging/LogManager.h" diff --git a/Source/Core/DolphinWX/MemcardManager.cpp b/Source/Core/DolphinWX/MemcardManager.cpp index 57f90dde67..1d222cd9dd 100644 --- a/Source/Core/DolphinWX/MemcardManager.cpp +++ b/Source/Core/DolphinWX/MemcardManager.cpp @@ -27,7 +27,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 4005953149..cf998a2358 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -16,7 +16,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/IniFile.h" class GCMemcard; diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp index 892a03d51e..5c5f986fab 100644 --- a/Source/Core/DolphinWX/NetWindow.cpp +++ b/Source/Core/DolphinWX/NetWindow.cpp @@ -28,7 +28,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FifoQueue.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" diff --git a/Source/Core/DolphinWX/PatchAddEdit.cpp b/Source/Core/DolphinWX/PatchAddEdit.cpp index f35c16d71d..3672d1cc04 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.cpp +++ b/Source/Core/DolphinWX/PatchAddEdit.cpp @@ -23,7 +23,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/PatchEngine.h" #include "DolphinWX/PatchAddEdit.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h index f6e10a4e14..c56b9a97ba 100644 --- a/Source/Core/DolphinWX/TASInputDlg.h +++ b/Source/Core/DolphinWX/TASInputDlg.h @@ -14,7 +14,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "InputCommon/GCPadStatus.h" class wxCheckBox; diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp index 984f8cf0f2..2631136104 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp @@ -16,7 +16,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/SysConf.h" diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index af4fc35cc5..24bb493520 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Thread.h" #include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/ExpressionParser.h" diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index fa4f351cb5..c23c0d29bf 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -7,7 +7,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" // idk in case I wanted to change it to double or something, idk what's best typedef double ControlState; diff --git a/Source/Core/VideoBackends/OGL/GLInterfaceBase.h b/Source/Core/VideoBackends/OGL/GLInterfaceBase.h index b274182042..6f705bbf4f 100644 --- a/Source/Core/VideoBackends/OGL/GLInterfaceBase.h +++ b/Source/Core/VideoBackends/OGL/GLInterfaceBase.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" enum GLInterfaceMode { MODE_DETECT = 0, diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.h b/Source/Core/VideoBackends/Software/BPMemLoader.h index 5046e3daed..5451d7a061 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.h +++ b/Source/Core/VideoBackends/Software/BPMemLoader.h @@ -5,7 +5,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" void InitBPMemory(); diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.h b/Source/Core/VideoBackends/Software/CPMemLoader.h index 4606a9bb59..ac1707931e 100644 --- a/Source/Core/VideoBackends/Software/CPMemLoader.h +++ b/Source/Core/VideoBackends/Software/CPMemLoader.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/CPMemory.h" void SWLoadCPReg(u32 sub_cmd, u32 value); diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 1d1dfe0c1a..f5740d5883 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/VideoBackends/Software/EfbCopy.h b/Source/Core/VideoBackends/Software/EfbCopy.h index 9c7786202e..c48f898e47 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.h +++ b/Source/Core/VideoBackends/Software/EfbCopy.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace EfbCopy { diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index cd10922981..3a5a48e160 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.cpp b/Source/Core/VideoBackends/Software/HwRasterizer.cpp index 05460da312..6847372691 100644 --- a/Source/Core/VideoBackends/Software/HwRasterizer.cpp +++ b/Source/Core/VideoBackends/Software/HwRasterizer.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" #include "VideoBackends/OGL/GLInterfaceBase.h" diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index f06b31b595..77deeed01f 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/CPMemLoader.h" diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 3d002da810..4220bbb005 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/HwRasterizer.h" diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index b205c112ea..5f227d4b5c 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -4,7 +4,7 @@ #include "Common/Atomic.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FPURoundMode.h" #include "Common/MathUtil.h" #include "Common/Thread.h" diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h index 6102921039..0c4345107c 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/CommandProcessor.h" diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index e8d2477f4c..3289736214 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/StringUtil.h" #include "Core/Core.h" #include "VideoBackends/OGL/GLInterfaceBase.h" diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index cb4024171b..dcd71d35a4 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoBackends/Software/CPMemLoader.h" #include "VideoBackends/Software/SetupUnit.h" diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h index 8a29c93300..c860f66fdc 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.h +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoBackends/Software/CPMemLoader.h" #include "VideoBackends/Software/NativeVertexFormat.h" diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h index 758f9bb722..812b9c2018 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.h +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #define STATISTICS 1 diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 1cb76857bb..a6b9f509c9 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -5,7 +5,7 @@ #include #include "Common/Atomic.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" #include "Common/Logging/LogManager.h" diff --git a/Source/Core/VideoBackends/Software/SetupUnit.h b/Source/Core/VideoBackends/Software/SetupUnit.h index 053513f5f9..0f9d5faea3 100644 --- a/Source/Core/VideoBackends/Software/SetupUnit.h +++ b/Source/Core/VideoBackends/Software/SetupUnit.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoBackends/Software/NativeVertexFormat.h" class PointerWrap; diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 35e6c302fe..7d13fd7bb2 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -5,7 +5,7 @@ #include #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/SWStatistics.h" diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.h b/Source/Core/VideoBackends/Software/TextureEncoder.h index 84e8004a2e..eafd0a188d 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.h +++ b/Source/Core/VideoBackends/Software/TextureEncoder.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace TextureEncoder { diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h index 97a916c8c0..66dbd5d0bb 100644 --- a/Source/Core/VideoBackends/Software/TextureSampler.h +++ b/Source/Core/VideoBackends/Software/TextureSampler.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" namespace TextureSampler { diff --git a/Source/Core/VideoBackends/Software/TransformUnit.cpp b/Source/Core/VideoBackends/Software/TransformUnit.cpp index 0c667313bc..b5409c7a9b 100644 --- a/Source/Core/VideoBackends/Software/TransformUnit.cpp +++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "VideoBackends/Software/BPMemLoader.h" diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.h b/Source/Core/VideoBackends/Software/XFMemLoader.h index bc639f6c76..b67ff5abbe 100644 --- a/Source/Core/VideoBackends/Software/XFMemLoader.h +++ b/Source/Core/VideoBackends/Software/XFMemLoader.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp index d2771a7b65..29a6d5b643 100644 --- a/Source/Core/VideoCommon/BPFunctions.cpp +++ b/Source/Core/VideoCommon/BPFunctions.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/VideoCommon/BPMemory.cpp b/Source/Core/VideoCommon/BPMemory.cpp index d26d4bb4c4..8785810d13 100644 --- a/Source/Core/VideoCommon/BPMemory.cpp +++ b/Source/Core/VideoCommon/BPMemory.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/BPMemory.h" // BP state diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h index 092d41e783..1c46453bfe 100644 --- a/Source/Core/VideoCommon/BPMemory.h +++ b/Source/Core/VideoCommon/BPMemory.h @@ -7,7 +7,7 @@ #include #include "Common/BitField.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #pragma pack(4) diff --git a/Source/Core/VideoCommon/CPMemory.cpp b/Source/Core/VideoCommon/CPMemory.cpp index f86e206f6f..752063065b 100644 --- a/Source/Core/VideoCommon/CPMemory.cpp +++ b/Source/Core/VideoCommon/CPMemory.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/CPMemory.h" // CP state diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h index 754e305a86..cac82e0be0 100644 --- a/Source/Core/VideoCommon/CPMemory.h +++ b/Source/Core/VideoCommon/CPMemory.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" // Vertex array numbers enum diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index b54e503240..aa9f8c4f28 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/CommandProcessor.cpp @@ -4,7 +4,7 @@ #include "Common/Atomic.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "Common/Thread.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h index 5ad8e19562..b29816e8fe 100644 --- a/Source/Core/VideoCommon/CommandProcessor.h +++ b/Source/Core/VideoCommon/CommandProcessor.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/VideoBackendBase.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h index f6da09e377..389336be0a 100644 --- a/Source/Core/VideoCommon/Fifo.h +++ b/Source/Core/VideoCommon/Fifo.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/VideoBackendBase.h" class PointerWrap; diff --git a/Source/Core/VideoCommon/ImageWrite.h b/Source/Core/VideoCommon/ImageWrite.h index ad847634b6..55d240ca45 100644 --- a/Source/Core/VideoCommon/ImageWrite.h +++ b/Source/Core/VideoCommon/ImageWrite.h @@ -5,7 +5,7 @@ #pragma once #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" bool SaveData(const std::string& filename, const char* pdata); bool TextureToPng(u8* data, int row_stride, const std::string& filename, int width, int height, bool saveAlpha = true); diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp index 1e713185a5..c4440f6b1e 100644 --- a/Source/Core/VideoCommon/IndexGenerator.cpp +++ b/Source/Core/VideoCommon/IndexGenerator.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/OpcodeDecoding.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoCommon/LookUpTables.h b/Source/Core/VideoCommon/LookUpTables.h index eb38557eb3..bf752cf0ed 100644 --- a/Source/Core/VideoCommon/LookUpTables.h +++ b/Source/Core/VideoCommon/LookUpTables.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" inline u8 Convert3To8(u8 v) { diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h index d1912e1cbf..ebc95cdc45 100644 --- a/Source/Core/VideoCommon/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/NativeVertexFormat.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" // m_components enum diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 30f6725ed6..0b553c12d2 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -6,7 +6,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/Timer.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 2b9e314ec0..e9a20a526a 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -12,7 +12,7 @@ // while interpreting them, and hope that the vertex format doesn't change, though, if you do it right // when they are called. The reason is that the vertex format affects the sizes of the vertices. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Core/Core.h" #include "Core/Host.h" diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index 5e049e3b18..da36e2d019 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -8,7 +8,7 @@ #include "Common/Atomic.h" #include "Common/ChunkFile.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/ConfigManager.h" #include "Core/CoreTiming.h" #include "Core/State.h" diff --git a/Source/Core/VideoCommon/PixelShaderManager.cpp b/Source/Core/VideoCommon/PixelShaderManager.cpp index b20b9815a4..d9c601e42c 100644 --- a/Source/Core/VideoCommon/PixelShaderManager.cpp +++ b/Source/Core/VideoCommon/PixelShaderManager.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/RenderBase.h" diff --git a/Source/Core/VideoCommon/TextureConversionShader.h b/Source/Core/VideoCommon/TextureConversionShader.h index 6832cc0614..0ef4693b9f 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.h +++ b/Source/Core/VideoCommon/TextureConversionShader.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index 663e73f756..7ccc88d1e3 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/TextureDecoder.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 1800c8bb04..7446ae6c46 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" //#include "VideoCommon.h" // to get debug logs #include "Common/CPUDetect.h" diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 3f509e8d32..7f7dbc9030 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" #include "Common/StringUtil.h" #include "Common/x64ABI.h" diff --git a/Source/Core/VideoCommon/VertexLoader.h b/Source/Core/VideoCommon/VertexLoader.h index 158dac59f2..7be8385879 100644 --- a/Source/Core/VideoCommon/VertexLoader.h +++ b/Source/Core/VideoCommon/VertexLoader.h @@ -10,7 +10,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/x64Emitter.h" #include "VideoCommon/CPMemory.h" diff --git a/Source/Core/VideoCommon/VertexLoaderManager.h b/Source/Core/VideoCommon/VertexLoaderManager.h index 97ae58b704..4177140da8 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.h +++ b/Source/Core/VideoCommon/VertexLoaderManager.h @@ -6,7 +6,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/NativeVertexFormat.h" namespace VertexLoaderManager diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp index 8ffed47bac..13b01f0bdb 100644 --- a/Source/Core/VideoCommon/VertexLoader_Color.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp index 60140e534f..0fb24d9264 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h index 2440b6424f..778915db9f 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.h +++ b/Source/Core/VideoCommon/VertexLoader_Normal.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" class VertexLoader_Normal { diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp index 2d40a26558..0c27b2b6fb 100644 --- a/Source/Core/VideoCommon/VertexLoader_Position.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp index 4724181a0b..14b7efb451 100644 --- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp +++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "VideoCommon/VertexLoader.h" diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 84db7cffe8..919cb0b17e 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -1,4 +1,4 @@ -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/BPStructs.h" #include "VideoCommon/Debugger.h" @@ -144,7 +144,8 @@ u32 VertexManager::GetRemainingIndices(int primitive) void VertexManager::Flush() { - if (IsFlushed) return; + if (IsFlushed) + return; // loading a state will invalidate BP, so check for it g_video_backend->CheckInvalidState(); diff --git a/Source/Core/VideoCommon/VertexManagerBase.h b/Source/Core/VideoCommon/VertexManagerBase.h index e98db7b3ee..c9ee61b777 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.h +++ b/Source/Core/VideoCommon/VertexManagerBase.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" class NativeVertexFormat; class PointerWrap; diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 112c2498c9..70e203d99e 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -5,7 +5,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h index 082a489d69..e4ba92adda 100644 --- a/Source/Core/VideoCommon/VideoCommon.h +++ b/Source/Core/VideoCommon/VideoCommon.h @@ -8,7 +8,7 @@ #include #endif -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/MathUtil.h" #include "VideoCommon/VideoBackendBase.h" diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 8fd7a9efbb..ec7b0f9862 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -4,7 +4,7 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 4d7f87f0ed..ed37a84995 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -14,7 +14,7 @@ #include #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/VideoCommon.h" // Log in two categories, and save three other options in the same byte diff --git a/Source/Core/VideoCommon/XFMemory.h b/Source/Core/VideoCommon/XFMemory.h index 3646a70264..c9d4d35216 100644 --- a/Source/Core/VideoCommon/XFMemory.h +++ b/Source/Core/VideoCommon/XFMemory.h @@ -4,7 +4,7 @@ #pragma once -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "VideoCommon/CPMemory.h" diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp index 650a4a913b..0d2ae6e19c 100644 --- a/Source/Core/VideoCommon/XFStructs.cpp +++ b/Source/Core/VideoCommon/XFStructs.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" #include "VideoCommon/CPMemory.h" #include "VideoCommon/DataReader.h"