Convert all includes to relative paths.

Source/Core/Core/ARDecrypt.cpp

@@ -6,14 +6,14 @@
 // GCNcrypt - Gamecube AR Crypto Program
 // Copyright (C) 2003-2004 Parasyte
 
-
-#include "ARDecrypt.h"
 #include <algorithm>
 
 #ifdef _WIN32
 #include <windows.h>
 #endif
 
+#include "Core/ARDecrypt.h"
+
 namespace ActionReplay
 {
 

Source/Core/Core/ARDecrypt.h

@@ -5,8 +5,9 @@
 #pragma once
 
 #include <vector>
-#include "Common.h"
-#include "ActionReplay.h"
+
+#include "Common/Common.h"
+#include "Core/ActionReplay.h"
 
 namespace ActionReplay
 {

Source/Core/Core/ActionReplay.cpp

@@ -22,14 +22,15 @@
 #include <string>
 #include <vector>
 
-#include "Common.h"
-#include "StringUtil.h"
-#include "HW/Memmap.h"
-#include "ActionReplay.h"
-#include "Core.h"
-#include "ARDecrypt.h"
-#include "LogManager.h"
-#include "ConfigManager.h"
+#include "Common/Common.h"
+#include "Common/LogManager.h"
+#include "Common/StringUtil.h"
+
+#include "Core/ActionReplay.h"
+#include "Core/ARDecrypt.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/Memmap.h"
 
 namespace ActionReplay
 {

Source/Core/Core/ActionReplay.h

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

Source/Core/Core/ArmMemTools.cpp

@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 
 #include <stdio.h>
@@ -25,12 +12,12 @@
 #include <execinfo.h>
 #endif
 
-#include "Common.h"
-#include "MemTools.h"
-#include "HW/Memmap.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitInterface.h"
-#include "PowerPC/JitCommon/JitBase.h"
+#include "Common/Common.h"
+#include "Core/MemTools.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
 
 namespace EMM
 {

Source/Core/Core/Boot/Boot.cpp

@@ -3,37 +3,35 @@
 // Refer to the license.txt file included.
 
 
-#include "Common.h" // Common
-#include "StringUtil.h"
-#include "FileUtil.h"
-#include "MathUtil.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
 
-#include "../HLE/HLE.h" // Core
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/PPCAnalyst.h"
-#include "../Core.h"
-#include "../HW/EXI_DeviceIPL.h"
-#include "../HW/Memmap.h"
-#include "../HW/ProcessorInterface.h"
-#include "../HW/DVDInterface.h"
-#include "../HW/VideoInterface.h"
-#include "../IPC_HLE/WII_IPC_HLE.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/PatchEngine.h"
+#include "Core/VolumeHandler.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/SignatureDB.h"
 
-#include "../Debugger/Debugger_SymbolMap.h" // Debugger
-
-#include "Boot_DOL.h"
-#include "Boot.h"
-#include "../Host.h"
-#include "../VolumeHandler.h"
-#include "../PatchEngine.h"
-#include "../PowerPC/SignatureDB.h"
-#include "../PowerPC/PPCSymbolDB.h"
-
-#include "../ConfigManager.h"
-#include "VolumeCreator.h" // DiscIO
-#include "NANDContentLoader.h"
-#include "Hash.h"
-#include "CommonPaths.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/NANDContentLoader.h"
 
 void CBoot::Load_FST(bool _bIsWii)
 {

Source/Core/Core/Boot/Boot.h

@@ -7,9 +7,9 @@
 #include <cstdlib>
 #include <string>
 
-#include "../CoreParameter.h"
+#include "Core/CoreParameter.h"
 
-#include "Volume.h"
+#include "DiscIO/Volume.h"
 using DiscIO::IVolume;
 
 typedef struct CountrySetting 

Source/Core/Core/Boot/Boot_BS2Emu.cpp

@@ -2,27 +2,26 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "NandPaths.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/NandPaths.h"
+#include "Common/SettingsHandler.h"
 
-#include "../PowerPC/PowerPC.h"
-#include "../Core.h"
-#include "../HW/EXI_DeviceIPL.h"
-#include "../HW/Memmap.h"
-#include "../HW/DVDInterface.h"
-#include "../HW/CPU.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/MemTools.h"
+#include "Core/PatchEngine.h"
+#include "Core/VolumeHandler.h"
+#include "Core/Boot/Boot.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/EXI_DeviceIPL.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/PowerPC/PowerPC.h"
 
-#include "../VolumeHandler.h"
-#include "../PatchEngine.h"
-#include "../MemTools.h"
-
-#include "../ConfigManager.h"
-#include "VolumeCreator.h"
-#include "Boot.h"
-#include "HLE/HLE.h"
-#include "SettingsHandler.h"
+#include "DiscIO/VolumeCreator.h"
 
 void CBoot::RunFunction(u32 _iAddr)
 {

Source/Core/Core/Boot/Boot_DOL.cpp

@@ -2,10 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Boot_DOL.h"
-#include "FileUtil.h"
-#include "../HW/Memmap.h"
-#include "CommonFuncs.h"
+#include "Common/CommonFuncs.h"
+#include "Common/FileUtil.h"
+
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HW/Memmap.h"
 
 CDolLoader::CDolLoader(u8* _pBuffer, u32 _Size)
 	: m_isWii(false)

Source/Core/Core/Boot/Boot_DOL.h

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

Source/Core/Core/Boot/Boot_ELF.cpp

@@ -2,12 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../PowerPC/PowerPC.h"
-#include "Boot.h"
-#include "../HLE/HLE.h"
-#include "Boot_ELF.h"
-#include "ElfReader.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_ELF.h"
+#include "Core/Boot/ElfReader.h"
+#include "Core/HLE/HLE.h"
+#include "Core/PowerPC/PowerPC.h"
 
 bool CBoot::IsElfWii(const char *filename)
 {

Source/Core/Core/Boot/Boot_WiiWAD.cpp

@@ -2,25 +2,26 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Boot.h"
-#include "../PowerPC/PowerPC.h"
-#include "../HLE/HLE.h"
-#include "../HW/Memmap.h"
-#include "../ConfigManager.h"
-#include "../PatchEngine.h"
-#include "../IPC_HLE/WII_IPC_HLE.h"
-#include "../IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
-
-#include "WiiWad.h"
-#include "NANDContentLoader.h"
-#include "FileUtil.h"
-#include "Boot_DOL.h"
-#include "Volume.h"
-#include "VolumeCreator.h"
-#include "CommonPaths.h"
-
 #include <memory>
 
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/PatchEngine.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "DiscIO/WiiWad.h"
+
 static u32 state_checksum(u32 *buf, int len)
 {
 	u32 checksum = 0;

Source/Core/Core/Boot/ElfReader.cpp

@@ -4,11 +4,12 @@
 
 #include <string>
 
-#include "Common.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-#include "../HW/Memmap.h"
-#include "../PowerPC/PPCSymbolDB.h"
-#include "ElfReader.h"
+#include "Common/Common.h"
+
+#include "Core/Boot/ElfReader.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
 
 void bswap(Elf32_Word &w) {w = Common::swap32(w);}
 void bswap(Elf32_Half &w) {w = Common::swap16(w);}

Source/Core/Core/Boot/ElfReader.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "ElfTypes.h"
+#include "Core/Boot/ElfTypes.h"
 
 enum KnownElfTypes
 {

Source/Core/Core/BootManager.cpp

@@ -23,22 +23,22 @@
 #include <string>
 #include <vector>
 
-#include "CommonTypes.h"
-#include "CommonPaths.h"
-#include "IniFile.h"
-#include "BootManager.h"
-#include "Volume.h"
-#include "VolumeCreator.h"
-#include "ConfigManager.h"
-#include "SysConf.h"
-#include "Core.h"
-#include "Host.h"
-#include "VideoBackendBase.h"
-#include "Movie.h"
-#include "NetPlayProto.h"
-#include "HW/WiimoteReal/WiimoteReal.h"
-#include "HW/SI.h"
-#include "HW/EXI.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
+#include "Common/CommonTypes.h"
+#include "Common/CommonPaths.h"
+#include "Common/IniFile.h"
+#include "Common/SysConf.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
+#include "VideoCommon/VideoBackendBase.h"
 
 namespace BootManager
 {

Source/Core/Core/ConfigManager.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "ConfigManager.h"
-#include "IniFile.h"
-#include "FileUtil.h"
-#include "NANDContentLoader.h"
-#include "HW/SI.h"
+#include "DiscIO/NANDContentLoader.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "Core/HW/SI.h"
 
 SConfig* SConfig::m_Instance;
 

Source/Core/Core/ConfigManager.h

@@ -7,10 +7,10 @@
 #include <string>
 #include <vector>
 
-#include "Boot/Boot.h"
-#include "HW/EXI_Device.h"
-#include "HW/SI_Device.h"
-#include "SysConf.h"
+#include "Common/SysConf.h"
+#include "Core/Boot/Boot.h"
+#include "Core/HW/EXI_Device.h"
+#include "Core/HW/SI_Device.h"
 
 // DSP Backend Types
 #define BACKEND_NULLSOUND   _trans("No audio output")

Source/Core/Core/Core.cpp

@@ -7,59 +7,57 @@
 #include "EmuWindow.h"
 #endif
 
-#include "Atomic.h"
-#include "Thread.h"
-#include "Timer.h"
-#include "Common.h"
-#include "CommonPaths.h"
-#include "StringUtil.h"
-#include "MathUtil.h"
-#include "MemoryUtil.h"
+#include "AudioCommon/AudioCommon.h"
 
-#include "Core.h"
-#include "CPUDetect.h"
-#include "CoreTiming.h"
-#include "Boot/Boot.h"
-#include "FifoPlayer/FifoPlayer.h"
+#include "DiscIO/FileMonitor.h"
 
-#include "HW/Memmap.h"
-#include "HW/ProcessorInterface.h"
-#include "HW/GPFifo.h"
-#include "HW/CPU.h"
-#include "HW/GCPad.h"
-#include "HW/Wiimote.h"
-#include "HW/HW.h"
-#include "HW/DSP.h"
-#include "HW/GPFifo.h"
-#include "HW/AudioInterface.h"
-#include "HW/VideoInterface.h"
-#include "HW/EXI.h"
-#include "HW/SystemTimers.h"
+#include "Common/Atomic.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/CPUDetect.h"
+#include "Common/LogManager.h"
+#include "Common/MathUtil.h"
+#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Common/Timer.h"
 
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/DSPEmulator.h"
+#include "Core/Host.h"
+#include "Core/MemTools.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/PatchEngine.h"
+#include "Core/State.h"
+#include "Core/VolumeHandler.h"
+#include "Core/Boot/Boot.h"
+#include "Core/FifoPlayer/FifoPlayer.h"
 
-#include "PowerPC/PowerPC.h"
+#include "Core/HW/AudioInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/HW.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/HW/VideoInterface.h"
+#include "Core/HW/Wiimote.h"
+
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+
+#include "Core/PowerPC/PowerPC.h"
 #ifdef USE_GDBSTUB
-#include "PowerPC/GDBStub.h"
+#include "Core/PowerPC/GDBStub.h"
 #endif
 
-#include "DSPEmulator.h"
-#include "ConfigManager.h"
-#include "VideoBackendBase.h"
-#include "AudioCommon.h"
-#include "OnScreenDisplay.h"
-
-#include "VolumeHandler.h"
-#include "FileMonitor.h"
-
-#include "MemTools.h"
-#include "Host.h"
-#include "LogManager.h"
-
-#include "State.h"
-#include "Movie.h"
-#include "NetPlayProto.h"
-#include "PatchEngine.h"
+#include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/VideoBackendBase.h"
 
 // TODO: ugly, remove
 bool g_aspect_wide;

Source/Core/Core/Core.h

@@ -14,8 +14,8 @@
 #include <vector>
 #include <string>
 
-#include "CommonTypes.h"
-#include "CoreParameter.h"
+#include "Common/CommonTypes.h"
+#include "Core/CoreParameter.h"
 
 namespace Core
 {

Source/Core/Core/CoreParameter.cpp

@@ -2,24 +2,24 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "CDUtils.h"
-#include "NANDContentLoader.h"
-
-#include "VolumeCreator.h" // DiscIO
-
-#include "Boot/Boot.h" // Core
-#include "Boot/Boot_DOL.h"
-#include "CoreParameter.h"
-#include "ConfigManager.h"
-#include "Core.h" // for bWii
-#include "FifoPlayer/FifoDataFile.h"
-
 #include <cinttypes>
 
+#include "Common/CDUtils.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+
+#include "DiscIO/NANDContentLoader.h"
+#include "DiscIO/VolumeCreator.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h" // for bWii
+#include "Core/CoreParameter.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+
 SCoreStartupParameter::SCoreStartupParameter()
 : hInstance(0),
   bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false),

Source/Core/Core/CoreParameter.h

@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include "IniFile.h"
 #include <string>
 
+#include "Common/IniFile.h"
+
 enum Hotkey
 {
 	HK_OPEN,

Source/Core/Core/CoreTiming.cpp

@@ -2,16 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <vector>
 #include <cinttypes>
+#include <vector>
 
-#include "Thread.h"
-#include "PowerPC/PowerPC.h"
-#include "CoreTiming.h"
-#include "Core.h"
-#include "StringUtil.h"
-#include "VideoBackendBase.h"
-#include "FifoQueue.h"
+#include "Common/FifoQueue.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/PowerPC/PowerPC.h"
+
+#include "VideoCommon/VideoBackendBase.h"
 
 #define MAX_SLICE_LENGTH 20000
 

Source/Core/Core/CoreTiming.h

@@ -17,11 +17,10 @@
 // inside callback:
 //   ScheduleEvent(periodInCycles - cyclesLate, callback, "whatever")
 
-#include "Common.h"
-
 #include <string>
 
-#include "ChunkFile.h"
+#include "Common/ChunkFile.h"
+#include "Common/Common.h"
 
 namespace CoreTiming
 {

Source/Core/Core/DSP/DSPAccelerator.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "MathUtil.h"
+#include "Common/Common.h"
+#include "Common/MathUtil.h"
 
-#include "DSPCore.h"
-#include "DSPHost.h"
-#include "DSPHWInterface.h"
-#include "DSPInterpreter.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
 
 // The hardware adpcm decoder :)
 static s16 ADPCM_Step(u32& _rSamplePos)

Source/Core/Core/DSP/DSPAnalyzer.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DSPAnalyzer.h"
-#include "DSPInterpreter.h"
-#include "DSPTables.h"
-#include "DSPMemoryMap.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPTables.h"
 
 namespace DSPAnalyzer {
 

Source/Core/Core/DSP/DSPAnalyzer.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DSPInterpreter.h"
+#include "Core/DSP/DSPInterpreter.h"
 
 // Basic code analysis.
 namespace DSPAnalyzer

Source/Core/Core/DSP/DSPBreakpoints.h

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

Source/Core/Core/DSP/DSPCodeUtil.cpp

@@ -5,13 +5,13 @@
 #include <iostream>
 #include <vector>
 
-#include "Common.h"
-#include "FileUtil.h"
-#include "StringUtil.h"
-#include "DSPCodeUtil.h"
-#include "assemble.h"
-#include "disassemble.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
 
+#include "Core/DSP/assemble.h"
+#include "Core/DSP/disassemble.h"
+#include "Core/DSP/DSPCodeUtil.h"
 
 bool Assemble(const char *text, std::vector<u16> &code, bool force)
 {

Source/Core/Core/DSP/DSPCodeUtil.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "Common.h"
+#include "Common/Common.h"
 
 bool Assemble(const char *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/DSPCommon.h

@@ -4,5 +4,6 @@
 
 #pragma once
 
-#include "CommonTypes.h"
+#include "Common/CommonTypes.h"
+
 typedef u16 UDSPInstruction;

Source/Core/Core/DSP/DSPCore.cpp

@@ -23,18 +23,18 @@
 
    ====================================================================*/
 
-#include "Common.h"
-#include "Hash.h"
-#include "Thread.h"
-#include "DSPCore.h"
-#include "DSPEmitter.h"
-#include "DSPHost.h"
-#include "DSPAnalyzer.h"
-#include "MemoryUtil.h"
-#include "FileUtil.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/MemoryUtil.h"
+#include "Common/Thread.h"
 
-#include "DSPHWInterface.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 SDSP g_dsp;
 DSPBreakpoints dsp_breakpoints;

Source/Core/Core/DSP/DSPCore.h

@@ -25,10 +25,10 @@
 
 #pragma once
 
-#include "Thread.h"
+#include "Common/Thread.h"
 
-#include "DSPBreakpoints.h"
-#include "DSPEmitter.h"
+#include "Core/DSP/DSPBreakpoints.h"
+#include "Core/DSP/DSPEmitter.h"
 
 #define DSP_IRAM_BYTE_SIZE  0x2000
 #define DSP_IRAM_SIZE       0x1000

Source/Core/Core/DSP/DSPEmitter.cpp

@@ -4,12 +4,12 @@
 
 #include <cstring>
 
-#include "DSPEmitter.h"
-#include "DSPMemoryMap.h"
-#include "DSPCore.h"
-#include "DSPHost.h"
-#include "DSPInterpreter.h"
-#include "DSPAnalyzer.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 #define MAX_BLOCK_SIZE 250
 #define DSP_IDLE_SKIP_CYCLES 0x1000

Source/Core/Core/DSP/DSPEmitter.h

@@ -6,14 +6,14 @@
 
 #include <list>
 
-#include "DSPCommon.h"
-#include "x64ABI.h"
-#include "x64Emitter.h"
-#include "Jit/DSPJitRegCache.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+
+#include "Core/DSP/DSPCommon.h"
+#include "Core/DSP/Jit/DSPJitRegCache.h"
 
 #define COMPILED_CODE_SIZE 2097152
-
-#define MAX_BLOCKS 0x10000
+#define MAX_BLOCKS         0x10000
 
 typedef u32 (*DSPCompiledCode)();
 typedef const u8 *Block;

Source/Core/Core/DSP/DSPHWInterface.cpp

@@ -23,18 +23,18 @@
 
    ====================================================================*/
 
-#include "Atomic.h"
-#include "Thread.h"
-#include "MemoryUtil.h"
+#include "Common/Atomic.h"
+#include "Common/CPUDetect.h"
+#include "Common/Thread.h"
+#include "Common/MemoryUtil.h"
 
-#include "DSPCore.h"
-#include "DSPHost.h"
-#include "DSPTables.h"
-#include "DSPAnalyzer.h"
-#include "DSPAccelerator.h"
-#include "DSPInterpreter.h"
-#include "DSPHWInterface.h"
-#include "CPUDetect.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPAccelerator.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHost.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPTables.h"
 
 #if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
 #include <tmmintrin.h>

Source/Core/Core/DSP/DSPHWInterface.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
 #define GDSP_MBOX_CPU   0
 #define GDSP_MBOX_DSP   1

Source/Core/Core/DSP/DSPIntCCUtil.cpp

@@ -7,9 +7,9 @@
 
 // HELPER FUNCTIONS
 
-#include "DSPIntCCUtil.h"
-#include "DSPCore.h"
-#include "DSPInterpreter.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntCCUtil.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPIntCCUtil.h

@@ -8,7 +8,7 @@
 
 // Anything to do with SR and conditions goes here.
 
-#include "Common.h"
+#include "Common/Common.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPIntExtOps.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DSPIntUtil.h"
-#include "DSPMemoryMap.h"
 #include "DSPIntExtOps.h"
+#include "Core/DSP/DSPIntUtil.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 //not needed for game ucodes (it slows down interpreter/dspjit32 + easier to compare int VS dspjit64 without it)
 //#define PRECISE_BACKLOG
@@ -34,7 +34,7 @@ namespace Ext
 
 inline bool IsSameMemArea(u16 a, u16 b)
 {
-//LM: tested on WII
+	//LM: tested on WII
 	if ((a>>10)==(b>>10))
 		return true;
 	else

Source/Core/Core/DSP/DSPIntExtOps.h

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

Source/Core/Core/DSP/DSPIntUtil.h

@@ -25,12 +25,12 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
-#include "DSPInterpreter.h"
-#include "DSPCore.h"
-#include "DSPMemoryMap.h"
-#include "DSPStacks.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPStacks.h"
 
 
 // ---------------------------------------------------------------------------------------

Source/Core/Core/DSP/DSPInterpreter.cpp

@@ -23,12 +23,12 @@
 
    ====================================================================*/
 
-#include "DSPTables.h"
-#include "DSPCore.h"
-#include "DSPAnalyzer.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPTables.h"
 
-#include "DSPHWInterface.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DSPInterpreter.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "DSPTables.h"
+#include "Core/DSP/DSPTables.h"
 
 #define DSP_REG_MASK    0x1f
 

Source/Core/Core/DSP/DSPMemoryMap.cpp

@@ -23,10 +23,10 @@
 
    ====================================================================*/
 
-#include "DSPInterpreter.h"
-#include "DSPMemoryMap.h"
-#include "DSPHWInterface.h"
-#include "DSPCore.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 u16 dsp_imem_read(u16 addr)
 {

Source/Core/Core/DSP/DSPMemoryMap.h

@@ -25,9 +25,10 @@
 
 #pragma once
 
-#include "Common.h"
-#include "DSPInterpreter.h"
-#include "DSPCore.h"
+#include "Common/Common.h"
+
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPInterpreter.h"
 
 u16  dsp_imem_read(u16 addr);
 void dsp_dmem_write(u16 addr, u16 val);

Source/Core/Core/DSP/DSPStacks.cpp

@@ -23,10 +23,10 @@
 
    ====================================================================*/
 
-#include "Common.h"
+#include "Common/Common.h"
 
-#include "DSPCore.h"
-#include "DSPStacks.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPStacks.h"
 
 // Stacks. The stacks are outside the DSP RAM, in dedicated hardware.
 

Source/Core/Core/DSP/DSPStacks.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.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,12 +4,12 @@
 
 // Additional copyrights go to Duddie (c) 2005 ([email protected])
 
-#include "Common.h"
-#include "DSPTables.h"
+#include "Common/Common.h"
 
-#include "DSPInterpreter.h"
-#include "DSPIntExtOps.h"
-#include "DSPEmitter.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntExtOps.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPTables.h"
 
 void nop(const UDSPInstruction opc)
 {

Source/Core/Core/DSP/DSPTables.h

@@ -6,9 +6,8 @@
 
 #pragma once
 
-//nclude "Common.h"
-#include "DSPEmitter.h"
-#include "DSPCommon.h"
+#include "Core/DSP/DSPCommon.h"
+#include "Core/DSP/DSPEmitter.h"
 
 // The non-ADDR ones that end with _D are the opposite one - if the bit specify
 // ACC0, then ACC_D will be ACC1.

Source/Core/Core/DSP/DspIntArithmetic.cpp

@@ -4,9 +4,9 @@
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "DSPInterpreter.h"
-#include "DSPIntCCUtil.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 // Arithmetic and accumulator control.
 

Source/Core/Core/DSP/DspIntBranch.cpp

@@ -4,13 +4,13 @@
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "DSPInterpreter.h"
-#include "DSPCore.h"
-#include "DSPMemoryMap.h"
-#include "DSPStacks.h"
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPStacks.h"
 
-#include "DSPIntCCUtil.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DspIntLoadStore.cpp

@@ -4,10 +4,10 @@
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "DSPInterpreter.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
-#include "DSPMemoryMap.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DspIntMisc.cpp

@@ -4,11 +4,10 @@
 //
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
+#include "Core/DSP/DSPCore.h"
+#include "Core/DSP/DSPInterpreter.h"
 
-#include "DSPInterpreter.h"
-
-#include "DSPCore.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/DspIntMultiplier.cpp

@@ -7,10 +7,10 @@
 
 // Multiplier and product register control
 
-#include "DSPInterpreter.h"
+#include "Core/DSP/DSPInterpreter.h"
 
-#include "DSPIntCCUtil.h"
-#include "DSPIntUtil.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 namespace DSPInterpreter {
 

Source/Core/Core/DSP/Jit/DSPJitArithmetic.cpp

@@ -4,10 +4,10 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "../DSPAnalyzer.h"
-#include "../DSPEmitter.h"
-#include "../DSPIntCCUtil.h"
-#include "../DSPIntUtil.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitBranch.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPAnalyzer.h"
-#include "../DSPEmitter.h"
-#include "../DSPMemoryMap.h"
-#include "../DSPStacks.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/DSPStacks.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitCCUtil.cpp

@@ -4,8 +4,8 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "../DSPEmitter.h"
-#include "../DSPIntUtil.h" // Helper functions
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntUtil.h" // Helper functions
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitExtOps.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPEmitter.h"
-#include "../DSPMemoryMap.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPMemoryMap.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitLoadStore.cpp

@@ -4,9 +4,9 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-#include "../DSPEmitter.h"
-#include "../DSPIntCCUtil.h"
-#include "../DSPIntUtil.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntCCUtil.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitMisc.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPEmitter.h"
-#include "../DSPIntUtil.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitMultiplier.cpp

@@ -7,9 +7,9 @@
 
 // Multiplier and product register control
 
-#include "../DSPAnalyzer.h"
-#include "../DSPEmitter.h"
-#include "../DSPIntUtil.h"
+#include "Core/DSP/DSPAnalyzer.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPIntUtil.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DSPJitRegCache.h"
-#include "../DSPEmitter.h"
-#include "../DSPMemoryMap.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/Jit/DSPJitRegCache.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/Jit/DSPJitRegCache.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "x64Emitter.h"
+#include "Common/x64Emitter.h"
 
 class DSPEmitter;
 

Source/Core/Core/DSP/Jit/DSPJitUtil.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DSPJitUtil.h"
-#include "../DSPEmitter.h"
-#include "../DSPHWInterface.h"
-#include "../DSPMemoryMap.h"
+#include "Core/DSP/DSPEmitter.h"
+#include "Core/DSP/DSPHWInterface.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/DSP/Jit/DSPJitUtil.h"
 
 using namespace Gen;
 

Source/Core/Core/DSP/LabelMap.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "LabelMap.h"
-#include "DSPTables.h"
+#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/LabelMap.h"
 
 LabelMap::LabelMap()
 {

Source/Core/Core/DSP/LabelMap.h

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

Source/Core/Core/DSP/assemble.cpp

@@ -39,17 +39,17 @@ Initial import
 
 #include <cstdio>
 #include <cstdlib>
-
-#include <map>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <map>
 
-#include "Common.h"
-#include "FileUtil.h"
-#include "DSPInterpreter.h"
-#include "DSPTables.h"
-#include "disassemble.h"
-#include "assemble.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+
+#include "Core/DSP/assemble.h"
+#include "Core/DSP/disassemble.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPTables.h"
 
 static const char *err_string[] =
 {

Source/Core/Core/DSP/assemble.h

@@ -27,10 +27,11 @@
 #include <string>
 #include <map>
 
-#include "Common.h"
-#include "disassemble.h"
-#include "DSPTables.h"
-#include "LabelMap.h"
+#include "Common/Common.h"
+
+#include "Core/DSP/disassemble.h"
+#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/LabelMap.h"
 
 enum err_t
 {

Source/Core/Core/DSP/disassemble.cpp

@@ -23,13 +23,14 @@
 
    ====================================================================*/
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
-#include "Common.h"
-#include "FileUtil.h"
-#include "disassemble.h"
-#include "DSPTables.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+
+#include "Core/DSP/disassemble.h"
+#include "Core/DSP/DSPTables.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4996)

Source/Core/Core/DSP/disassemble.h

@@ -27,9 +27,10 @@
 #include <map>
 #include <vector>
 
-#include "Common.h"
-#include "DSPTables.h"
-#include "LabelMap.h"
+#include "Common/Common.h"
+
+#include "Core/DSP/DSPTables.h"
+#include "Core/DSP/LabelMap.h"
 
 struct AssemblerSettings
 {

Source/Core/Core/DSPEmulator.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DSPEmulator.h"
+#include "Core/DSPEmulator.h"
 
-#include "HW/DSPLLE/DSPLLE.h"
-#include "HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPLLE/DSPLLE.h"
+#include "Core/HW/DSPHLE/DSPHLE.h"
 
 DSPEmulator *CreateDSPEmulator(bool HLE)
 {

Source/Core/Core/DSPEmulator.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "ChunkFile.h"
-#include "SoundStream.h"
+#include "AudioCommon/SoundStream.h"
+#include "Common/ChunkFile.h"
 
 class DSPEmulator
 {

Source/Core/Core/Debugger/Debugger_SymbolMap.cpp

@@ -2,14 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "StringUtil.h"
-#include "Debugger_SymbolMap.h"
-#include "../Core.h"
-#include "../HW/Memmap.h"
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/PPCAnalyst.h"
-#include "../PowerPC/PPCSymbolDB.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Core.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
 
 namespace Dolphin_Debugger
 {

Source/Core/Core/Debugger/Debugger_SymbolMap.h

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

Source/Core/Core/Debugger/Dump.cpp

@@ -2,11 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdio.h>
+#include <cstdio>
 
-#include "Common.h"
-#include "Dump.h"
-#include "FileUtil.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+
+#include "Core/Debugger/Dump.h"
 
 CDump::CDump(const char* _szFilename) :
 	m_pData(NULL)

Source/Core/Core/Debugger/Dump.h

@@ -8,7 +8,7 @@
 //
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
 class CDump
 {

Source/Core/Core/Debugger/PPCDebugInterface.cpp

@@ -2,18 +2,18 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Debugger_SymbolMap.h"
-#include "DebugInterface.h"
-#include "PPCDebugInterface.h"
 #include "PowerPCDisasm.h"
-#include "../Host.h"
-#include "../Core.h"
-#include "../HW/CPU.h"
-#include "../HW/DSP.h"
-#include "../HW/Memmap.h"
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/JitCommon/JitBase.h"
-#include "../PowerPC/PPCSymbolDB.h"
+
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
 
 void PPCDebugInterface::disasm(unsigned int address, char *dest, int max_size)
 {

Source/Core/Core/Debugger/PPCDebugInterface.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "DebugInterface.h"
+#include "Common/DebugInterface.h"
 
 //wrapper between disasm control and Dolphin debugger
 

Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp

@@ -2,14 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "FifoAnalyzer.h"
+#include "Core/Core.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
 
-#include "Core.h"
-
-#include "VertexLoader.h"
-#include "VertexLoader_Position.h"
-#include "VertexLoader_Normal.h"
-#include "VertexLoader_TextCoord.h"
+#include "VideoCommon/VertexLoader.h"
+#include "VideoCommon/VertexLoader_Position.h"
+#include "VideoCommon/VertexLoader_Normal.h"
+#include "VideoCommon/VertexLoader_TextCoord.h"
 
 namespace FifoAnalyzer
 {

Source/Core/Core/FifoPlayer/FifoAnalyzer.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
-#include "BPMemory.h"
-#include "CPMemory.h"
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/CPMemory.h"
 
 namespace FifoAnalyzer
 {

Source/Core/Core/FifoPlayer/FifoDataFile.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "FifoDataFile.h"
-#include "FifoFileStruct.h"
+#include "Common/FileUtil.h"
 
-#include "FileUtil.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoFileStruct.h"
 
 using namespace FifoFileStruct;
 using namespace std;

Source/Core/Core/FifoPlayer/FifoDataFile.h

@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include "Common.h"
 #include <vector>
 
+#include "Common/Common.h"
+
 namespace File
 {
 	class IOFile;

Source/Core/Core/FifoPlayer/FifoFileStruct.h

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

Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp

@@ -2,15 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "FifoAnalyzer.h"
-#include "FifoDataFile.h"
-#include "FifoPlaybackAnalyzer.h"
+#include "Common/Common.h"
 
-#include "Common.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
 
-#include "OpcodeDecoding.h"
-#include "TextureDecoder.h"
-#include "VertexLoader.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VertexLoader.h"
 
 using namespace std;
 using namespace FifoAnalyzer;

Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "FifoAnalyzer.h"
-#include "FifoDataFile.h"
-
 #include <string>
 #include <vector>
 
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+
 struct AnalyzedFrameInfo
 {
 	std::vector<u32> objectStarts;

Source/Core/Core/FifoPlayer/FifoPlayer.cpp

@@ -2,21 +2,20 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "FifoDataFile.h"
-#include "FifoPlayer.h"
+#include "Common/Common.h"
 
-#include "Common.h"
-#include "ConfigManager.h"
-#include "Core.h"
-#include "CoreTiming.h"
-#include "Host.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/Host.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoPlayer.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/PowerPC.h"
 
-#include "HW/GPFifo.h"
-#include "HW/Memmap.h"
-#include "HW/SystemTimers.h"
-#include "PowerPC/PowerPC.h"
-
-#include "BPMemory.h"
+#include "VideoCommon/BPMemory.h"
 
 FifoPlayer::~FifoPlayer()
 {

Source/Core/Core/FifoPlayer/FifoPlayer.h

@@ -4,10 +4,11 @@
 
 #pragma once
 
-#include "FifoPlaybackAnalyzer.h"
 #include <string>
 #include <vector>
 
+#include "Core/FifoPlayer/FifoPlaybackAnalyzer.h"
+
 class FifoDataFile;
 struct MemoryUpdate;
 struct AnalyzedFrameInfo;

Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp

@@ -2,15 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "FifoAnalyzer.h"
-#include "FifoRecordAnalyzer.h"
-#include "FifoRecorder.h"
+#include "Core/Core.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
+#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "Core/HW/Memmap.h"
 
-#include "Core.h"
-#include "HW/Memmap.h"
-
-#include "OpcodeDecoding.h"
-#include "TextureDecoder.h"
+#include "VideoCommon/OpcodeDecoding.h"
+#include "VideoCommon/TextureDecoder.h"
 
 using namespace FifoAnalyzer;
 

Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "FifoAnalyzer.h"
+#include "Common/Common.h"
 
-#include "Common.h"
+#include "Core/FifoPlayer/FifoAnalyzer.h"
 
-#include "BPMemory.h"
+#include "VideoCommon/BPMemory.h"
 
 class FifoRecordAnalyzer
 {

Source/Core/Core/FifoPlayer/FifoRecorder.cpp

@@ -2,11 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "ConfigManager.h"
-#include "Core.h"
-#include "FifoRecorder.h"
-#include "Thread.h"
-#include "HW/Memmap.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "Core/HW/Memmap.h"
 
 static FifoRecorder instance;
 static std::recursive_mutex sMutex;

Source/Core/Core/FifoPlayer/FifoRecorder.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "FifoDataFile.h"
-#include "FifoRecordAnalyzer.h"
+#include "Core/FifoPlayer/FifoDataFile.h"
+#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
 
 class FifoRecorder
 {

Source/Core/Core/GeckoCode.cpp

@@ -2,16 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "GeckoCode.h"
-
-#include "Thread.h"
-#include "HW/Memmap.h"
-#include "ConfigManager.h"
-#include "PowerPC/PowerPC.h"
-#include "CommonPaths.h"
-
 #include <vector>
 
+#include "Common/CommonPaths.h"
+#include "Common/Thread.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/GeckoCode.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+
 namespace Gecko
 {
 // return true if a code exists

Source/Core/Core/GeckoCode.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "Common.h"
-
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
+
+#include "Common/Common.h"
 
 namespace Gecko
 {

Source/Core/Core/GeckoCodeConfig.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "GeckoCodeConfig.h"
-
-#include "StringUtil.h"
-
-#include <vector>
-#include <string>
 #include <sstream>
+#include <string>
+#include <vector>
+
+#include "Common/StringUtil.h"
+
+#include "Core/GeckoCodeConfig.h"
 
 namespace Gecko
 {

Source/Core/Core/GeckoCodeConfig.h

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "GeckoCode.h"
+#include "Common/IniFile.h"
 
-#include "IniFile.h"
+#include "Core/GeckoCode.h"
 
 namespace Gecko
 {

Source/Core/Core/HLE/HLE.cpp

@@ -2,20 +2,19 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
+#include "Common/Common.h"
 
-#include "HLE.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/HLE_OS.h"
+#include "Core/HLE/HLE_Misc.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_es.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
 
-#include "../PowerPC/PowerPC.h"
-#include "../PowerPC/PPCSymbolDB.h"
-#include "../HW/Memmap.h"
-#include "../Debugger/Debugger_SymbolMap.h"
-
-#include "HLE_OS.h"
-#include "HLE_Misc.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_es.h"
-#include "ConfigManager.h"
-#include "Core.h"
 
 namespace HLE
 {

Source/Core/Core/HLE/HLE.h

@@ -5,7 +5,8 @@
 #pragma once
 
 #include <map>
-#include "CommonTypes.h"
+
+#include "Common/CommonTypes.h"
 
 namespace HLE
 {

Source/Core/Core/HLE/HLE_Misc.cpp

@@ -3,25 +3,28 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
-#include "Common.h"
-#include "HLE_OS.h"
 
-#include "../PowerPC/PowerPC.h"
-#include "../HW/Memmap.h"
-#include "../Host.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_DI.h"
-#include "ConfigManager.h"
-#include "VolumeCreator.h"
-#include "Filesystem.h"
-#include "../Boot/Boot_DOL.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "HLE.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/PPCCache.h"
-#include "PowerPC/SignatureDB.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "CommonPaths.h"
-#include "TextureCacheBase.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/Boot/Boot_DOL.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HLE/HLE_OS.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_DI.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCCache.h"
+#include "Core/PowerPC/SignatureDB.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/VolumeCreator.h"
+
+#include "VideoCommon/TextureCacheBase.h"
 
 namespace HLE_Misc
 {

Source/Core/Core/HLE/HLE_OS.cpp

@@ -2,14 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "StringUtil.h"
 #include <string>
 
-#include "Common.h"
-#include "HLE_OS.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
 
-#include "../PowerPC/PowerPC.h"
-#include "../HW/Memmap.h"
+#include "Core/HLE/HLE_OS.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
 
 namespace HLE_OS
 {

Source/Core/Core/HLE/HLE_OS.h

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