Merge pull request #1027 from rohit-n/change-include

Include CommonTypes.h instead of Common.h.

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

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

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;

Source/Core/AudioCommon/OpenSLESStream.cpp

@@ -9,7 +9,7 @@
 #include <SLES/OpenSLES_Android.h>
 
 #include "AudioCommon/OpenSLESStream.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 // engine interfaces
 static SLObjectItf engineObject;

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

Source/Core/AudioCommon/PulseAudioStream.h

@@ -11,7 +11,7 @@
 #include <atomic>
 
 #include "AudioCommon/SoundStream.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Thread.h"
 
 class PulseAudio final : public SoundStream

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
 {

Source/Core/AudioCommon/WaveFile.cpp

@@ -5,7 +5,7 @@
 #include <string>
 
 #include "AudioCommon/WaveFile.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/ConfigManager.h"
 
 enum {BUF_SIZE = 32*1024};

Source/Core/AudioCommon/WaveFile.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <string>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 class WaveFileWriter : NonCopyable

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"

Source/Core/Common/ArmCPUDetect.cpp

@@ -6,7 +6,7 @@
 #include <sstream>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/StringUtil.h"
 

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 <signal.h>

Source/Core/Common/BreakPoints.cpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 #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"

Source/Core/Common/CDUtils.cpp

@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "Common/CDUtils.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
 #ifdef _WIN32

Source/Core/Common/ChunkFile.h

@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/Flag.h"
 

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
 {

Source/Core/Common/Crypto/bn.cpp

@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <string.h>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Crypto/bn.h"
 
 static void bn_zero(u8 *d, u32 n)

Source/Core/Common/Crypto/ec.cpp

@@ -11,7 +11,7 @@
 #include <ctime>
 #include <string.h>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Crypto/bn.h"
 #include "Common/Crypto/ec.h"
 

Source/Core/Common/FileUtil.cpp

@@ -12,8 +12,8 @@
 #include <vector>
 #include <sys/stat.h>
 
-#include "Common/Common.h"
 #include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 #ifdef _WIN32

Source/Core/Common/Hash.h

@@ -6,7 +6,7 @@
 
 #include <cstddef>
 
-#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

Source/Core/Common/LinearDiskCache.h

@@ -8,7 +8,7 @@
 #include <fstream>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 // On disk format:

Source/Core/Common/MathUtil.h

@@ -7,7 +7,7 @@
 #include <cstdlib>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace MathUtil
 {

Source/Core/Common/MemArena.cpp

@@ -7,7 +7,7 @@
 #include <set>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/MemArena.h"
 #include "Common/StringUtil.h"
 

Source/Core/Common/MemArena.h

@@ -10,7 +10,7 @@
 #include <windows.h>
 #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

Source/Core/Common/MemoryUtil.cpp

@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/MemoryUtil.h"
 
 #ifdef _WIN32

Source/Core/Common/MsgHandler.cpp

@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <string>
 
-#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);

Source/Core/Common/NandPaths.cpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <utility>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"

Source/Core/Common/SDCardUtil.cpp

@@ -35,7 +35,7 @@
 #include <ctime>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/SDCardUtil.h"
 

Source/Core/Common/StringUtil.cpp

@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
 #include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
 #ifdef _WIN32

Source/Core/Common/SymbolDB.cpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <utility>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/SymbolDB.h"
 
 void SymbolDB::List()

Source/Core/Common/SymbolDB.h

@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 struct SCall
 {

Source/Core/Common/SysConf.cpp

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/SysConf.h"
 

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__

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 "

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"
 

Source/Core/Common/x64CPUDetect.cpp

@@ -5,7 +5,7 @@
 #include <cstring>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 
 #ifdef _WIN32

Source/Core/Common/x64Emitter.cpp

@@ -4,7 +4,7 @@
 
 #include <cinttypes>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/x64Emitter.h"
 #include "Common/Logging/Log.h"

Source/Core/Common/x64Emitter.h

@@ -11,7 +11,7 @@
 #include <functional>
 
 #include "Common/CodeBlock.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace Gen
 {

Source/Core/Common/x64FPURoundMode.cpp

@@ -4,7 +4,7 @@
 
 #include <cfenv>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/FPURoundMode.h"
 

Source/Core/Core/ARDecrypt.h

@@ -6,7 +6,7 @@
 
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/ActionReplay.h"
 
 namespace ActionReplay

Source/Core/Core/ActionReplay.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 #include "Common/Logging/LogManager.h"
 

Source/Core/Core/ArmMemTools.cpp

@@ -12,7 +12,7 @@
 #include <sys/ucontext.h>   // 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"

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"

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"

Source/Core/Core/Boot/ElfReader.cpp

@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/CommonTypes.h"
 
 #include "Core/Boot/ElfReader.h"

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"

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"

Source/Core/Core/CoreParameter.cpp

@@ -5,8 +5,8 @@
 #include <cinttypes>
 
 #include "Common/CDUtils.h"
-#include "Common/Common.h"
 #include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/CoreTiming.h

@@ -18,7 +18,7 @@
 //   ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
 
 #include <string>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 class PointerWrap;
 

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"

Source/Core/Core/DSP/DSPAssembler.cpp

@@ -44,7 +44,7 @@ Initial import
 #include <map>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 #include "Core/DSP/DSPAssembler.h"

Source/Core/Core/DSP/DSPAssembler.h

@@ -27,7 +27,7 @@
 #include <map>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 #include "Core/DSP/DSPDisassembler.h"
 #include "Core/DSP/DSPTables.h"

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.

Source/Core/Core/DSP/DSPCodeUtil.cpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/DSP/DSPCodeUtil.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 bool Assemble(const std::string& text, std::vector<u16> &code, bool force = false);
 bool Disassemble(const std::vector<u16> &code, bool line_numbers, std::string &text);

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"

Source/Core/Core/DSP/DSPDisassembler.cpp

@@ -28,7 +28,7 @@
 #include <fstream>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/DSP/DSPDisassembler.h

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 #include "Core/DSP/DSPTables.h"
 #include "Core/DSP/LabelMap.h"

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

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
 {

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"

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"

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"

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);

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"

Source/Core/Core/DSP/LabelMap.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 enum LabelType
 {

Source/Core/Core/Debugger/Debugger_SymbolMap.cpp

@@ -5,7 +5,7 @@
 #include <functional>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
 #include "Core/Core.h"

Source/Core/Core/Debugger/Debugger_SymbolMap.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace Dolphin_Debugger
 {

Source/Core/Core/Debugger/Dump.cpp

@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 #include "Core/Debugger/Dump.h"

Source/Core/Core/Debugger/Dump.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <string>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 class CDump
 {

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"

Source/Core/Core/FifoPlayer/FifoDataFile.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace File
 {

Source/Core/Core/FifoPlayer/FifoFileStruct.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace FifoFileStruct
 {

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"

Source/Core/Core/FifoPlayer/FifoPlayer.cpp

@@ -4,7 +4,7 @@
 
 #include <algorithm>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"

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"
 

Source/Core/Core/GeckoCode.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace Gecko
 {

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"

Source/Core/Core/HLE/HLE_Misc.cpp

@@ -4,8 +4,8 @@
 
 #include <cmath>
 
-#include "Common/Common.h"
 #include "Common/CommonPaths.h"
+#include "Common/CommonTypes.h"
 
 #include "Core/ConfigManager.h"
 #include "Core/Host.h"

Source/Core/Core/HLE/HLE_OS.cpp

@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
 #include "Core/HLE/HLE_OS.h"

Source/Core/Core/HLE/HLE_OS.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace HLE_OS
 {

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"

Source/Core/Core/HW/CPU.cpp

@@ -5,7 +5,7 @@
 #include <mutex>
 
 #include "AudioCommon/AudioCommon.h"
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Core/Core.h"
 #include "Core/DSPEmulator.h"

Source/Core/Core/HW/CPU.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 namespace Common {
 	class Event;

Source/Core/Core/HW/DSP.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 class PointerWrap;
 class DSPEmulator;

Source/Core/Core/HW/DSPHLE/MailHandler.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <queue>
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 
 class PointerWrap;
 

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

@@ -14,7 +14,7 @@
 
 #include <functional>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/Memmap.h"

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"

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":

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"
 

Source/Core/Core/HW/DSPLLE/DSPDebugInterface.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/DebugInterface.h"
 
 class DSPDebugInterface final : public DebugInterface

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"

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"

Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp

@@ -4,7 +4,7 @@
 
 #include <cinttypes>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 
 #include "Core/DSP/DSPCore.h"

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.
 

Source/Core/Core/HW/DSPLLE/DSPLLETools.cpp

@@ -10,7 +10,7 @@
 #include <cstdlib>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/HW/DSPLLE/DSPSymbols.cpp

@@ -7,7 +7,7 @@
 #include <map>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
 

Source/Core/Core/HW/DSPLLE/DSPSymbols.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/SymbolDB.h"
 
 namespace DSPSymbols

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"

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"