Convert all includes to relative paths.

Source/Core/DolphinWX/ARCodeAddEdit.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "ARCodeAddEdit.h"
-#include "ARDecrypt.h"
-#include "WxUtils.h"
+#include "Core/ARDecrypt.h"
+#include "DolphinWX/ARCodeAddEdit.h"
+#include "DolphinWX/WxUtils.h"
 
 extern std::vector<ActionReplay::ARCode> arCodes;
 

Source/Core/DolphinWX/ARCodeAddEdit.h

@@ -6,7 +6,7 @@
 
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
-#include "ISOProperties.h"
+#include "DolphinWX/ISOProperties.h"
 
 class CARCodeAddEdit : public wxDialog
 {

Source/Core/DolphinWX/AboutDolphin.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "AboutDolphin.h"
-#include "WxUtils.h"
-#include "resources/dolphin_logo.cpp"
+#include "Common/Common.h"
+#include "DolphinWX/AboutDolphin.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/resources/dolphin_logo.cpp"
 
 AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
 		const wxString &title, const wxPoint &position,

Source/Core/DolphinWX/Android/ButtonManager.cpp

@@ -1,23 +1,11 @@
-// 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 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <unordered_map>
-#include "GLInterface/GLInterface.h"
-#include "Android/ButtonManager.h"
+
+#include "DolphinWX/Android/ButtonManager.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
 
 namespace ButtonManager
 {

Source/Core/DolphinWX/Android/ButtonManager.h

@@ -1,26 +1,13 @@
-// 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 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #pragma once
 
-#include <string>
 #include <map>
-#include "CommonPaths.h"
-#include "VideoBackendBase.h"
+#include <string>
+#include "Common/CommonPaths.h"
+#include "VideoCommon/VideoBackendBase.h"
 
 namespace ButtonManager
 {

Source/Core/DolphinWX/CheatsWindow.cpp

@@ -2,17 +2,20 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Globals.h"
-#include "CheatsWindow.h"
-#include "ActionReplay.h"
-#include "CommonPaths.h"
-#include "Core.h"
-#include "ConfigManager.h"
-#include "VolumeHandler.h"
-#include "ISOProperties.h"
-#include "HW/Memmap.h"
-#include "Frame.h"
-#include "WxUtils.h"
+#include "Common/CommonPaths.h"
+
+#include "Core/ActionReplay.h"
+#include "Core/Core.h"
+#include "Core/ConfigManager.h"
+#include "Core/VolumeHandler.h"
+#include "Core/HW/Memmap.h"
+
+#include "DolphinWX/CheatsWindow.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/ISOProperties.h"
+#include "DolphinWX/WxUtils.h"
+
 
 #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY  256
 extern std::vector<ActionReplay::ARCode> arCodes;

Source/Core/DolphinWX/CheatsWindow.h

@@ -20,12 +20,10 @@
 #include <string>
 #include <vector>
 
-#include "ActionReplay.h"
-
-#include "GeckoCodeDiag.h"
-
-#include "Filesystem.h"
-#include "IniFile.h"
+#include "Core/ActionReplay.h"
+#include "Common/IniFile.h"
+#include "DiscIO/Filesystem.h"
+#include "DolphinWX/GeckoCodeDiag.h"
 
 class CreateCodeDialog : public wxDialog
 {

Source/Core/DolphinWX/ConfigMain.cpp

@@ -2,35 +2,37 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <string> // System
-#include <vector>
 #include <algorithm>
 #include <functional>
+#include <string>
+#include <vector>
 #include <wx/spinbutt.h>
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "FileSearch.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/SysConf.h"
 
-#include "Core.h" // Core
-#include "HW/EXI.h"
-#include "HW/SI.h"
-#include "HW/DSPHLE/DSPHLE.h"
-#include "HW/DSPLLE/DSPLLE.h"
-#include "HW/GCMemcard.h"
-#include "IPC_HLE/WII_IPC_HLE.h"
-#include "NANDContentLoader.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/EXI.h"
+#include "Core/HW/GCMemcard.h"
+#include "Core/HW/SI.h"
+#include "Core/HW/DSPHLE/DSPHLE.h"
+#include "Core/HW/DSPLLE/DSPLLE.h"
+#include "Core/IPC_HLE/WII_IPC_HLE.h"
 
-#include "WxUtils.h"
-#include "Globals.h" // Local
-#include "ConfigMain.h"
-#include "ConfigManager.h"
-#include "SysConf.h"
-#include "Frame.h"
-#include "HotkeyDlg.h"
-#include "Main.h"
-#include "VideoBackendBase.h"
-#include "NetPlayProto.h"
+#include "DiscIO/NANDContentLoader.h"
+
+#include "DolphinWX/ConfigMain.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/HotkeyDlg.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+
+#include "VideoCommon/VideoBackendBase.h"
 
 #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)
 

Source/Core/DolphinWX/ConfigMain.h

@@ -9,9 +9,9 @@
 #include <wx/spinbutt.h>
 #include <wx/notebook.h>
 #include <wx/filepicker.h>
-#include "ConfigManager.h"
+#include "Core/ConfigManager.h"
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
-#include "X11Utils.h"
+#include "DolphinWX/X11Utils.h"
 #endif
 
 class CConfigMain : public wxDialog

Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "BreakpointDlg.h"
-#include "StringUtil.h"
-#include "PowerPC/PowerPC.h"
-#include "BreakpointWindow.h"
-#include "../WxUtils.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Debugger/BreakpointDlg.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/WxUtils.h"
 
 BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog)
 	EVT_BUTTON(wxID_OK, BreakPointDlg::OnOK)

Source/Core/DolphinWX/Debugger/BreakpointView.cpp

@@ -4,13 +4,13 @@
 
 #include <wx/wx.h>
 
-#include "BreakpointView.h"
-#include "DebuggerUIUtil.h"
-#include "Debugger/Debugger_SymbolMap.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Memmap.h"
-#include "../WxUtils.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Debugger/BreakpointView.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/WxUtils.h"
 
 CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id)
 	: wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize,

Source/Core/DolphinWX/Debugger/BreakpointView.h

@@ -5,7 +5,8 @@
 #pragma once
 
 #include <wx/listctrl.h>
-#include "Common.h"
+
+#include "Common/Common.h"
 
 class CBreakPointView : public wxListCtrl
 {

Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp

@@ -2,19 +2,19 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "BreakpointWindow.h"
-#include "BreakpointView.h"
-#include "CodeWindow.h"
-#include "HW/Memmap.h"
-#include "BreakpointDlg.h"
-#include "MemoryCheckDlg.h"
-#include "PowerPC/PowerPC.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Debugger/BreakpointDlg.h"
+#include "DolphinWX/Debugger/BreakpointView.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/MemoryCheckDlg.h"
 
 extern "C" {
-#include "../resources/toolbar_add_breakpoint.c"
-#include "../resources/toolbar_add_memorycheck.c"
-#include "../resources/toolbar_debugger_delete.c"
+#include "DolphinWX/resources/toolbar_add_breakpoint.c"
+#include "DolphinWX/resources/toolbar_add_memorycheck.c"
+#include "DolphinWX/resources/toolbar_debugger_delete.c"
 }
 
 class CBreakPointBar : public wxAuiToolBar

Source/Core/DolphinWX/Debugger/CodeView.cpp

@@ -2,20 +2,19 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "StringUtil.h"
-#include "DebuggerUIUtil.h"
-#include "DebugInterface.h"
-
-#include "Host.h"
-#include "CodeView.h"
-#include "SymbolDB.h"
-#include "../WxUtils.h"
-
-#include <wx/event.h>
 #include <wx/clipbrd.h>
+#include <wx/event.h>
 #include <wx/textdlg.h>
 
+#include "Common/Common.h"
+#include "Common/DebugInterface.h"
+#include "Common/StringUtil.h"
+#include "Common/SymbolDB.h"
+#include "Core/Host.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+
 DEFINE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE);
 
 enum

Source/Core/DolphinWX/Debugger/CodeView.h

@@ -7,11 +7,11 @@
 #define wxUSE_XPM_IN_MSW 1
 #define USE_XPM_BITMAPS 1
 
+#include <vector>
+
 #include <wx/wx.h>
 
-#include "Common.h"
-
-#include <vector>
+#include "Common/Common.h"
 
 DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1);
 

Source/Core/DolphinWX/Debugger/CodeWindow.cpp

@@ -2,44 +2,39 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-// Include
-#include "Common.h"
-
 #include <wx/wx.h>
 
-#include "Host.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Boot/Boot.h"
+#include "Core/ConfigManager.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/SignatureDB.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/JitWindow.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
+#include "DolphinWX/Debugger/RegisterWindow.h"
+#include "DolphinWX/WxUtils.h"
 
-#include "RegisterWindow.h"
-#include "BreakpointWindow.h"
-#include "MemoryWindow.h"
-#include "JitWindow.h"
-
-#include "CodeWindow.h"
-#include "CodeView.h"
-
-#include "../WxUtils.h"
-#include "FileUtil.h"
-#include "Core.h"
-#include "HW/Memmap.h"
-#include "HLE/HLE.h"
-#include "Boot/Boot.h"
-#include "LogManager.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitInterface.h"
-#include "Debugger/PPCDebugInterface.h"
-#include "Debugger/Debugger_SymbolMap.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPC/SignatureDB.h"
-#include "PowerPC/PPCTables.h"
-
-#include "ConfigManager.h"
 
 extern "C"  // Bitmaps
 {
-	#include "../resources/toolbar_add_memorycheck.c"
-	#include "../resources/toolbar_add_breakpoint.c"
+	#include "DolphinWX/resources/toolbar_add_memorycheck.c"
+	#include "DolphinWX/resources/toolbar_add_breakpoint.c"
 }
 
 // -------

Source/Core/DolphinWX/Debugger/CodeWindow.h

@@ -4,17 +4,15 @@
 
 #pragma once
 
-#include <wx/dialog.h>
-#include <wx/textctrl.h>
-#include <wx/listbox.h>
 #include <wx/artprov.h>
+#include <wx/dialog.h>
+#include <wx/listbox.h>
+#include <wx/textctrl.h>
 
-#include "Thread.h"
-#include "CoreParameter.h"
-
-// GUI global
-#include "../Globals.h"
-#include "../Frame.h"
+#include "Common/Thread.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
 
 class CFrame;
 class CRegisterWindow;

Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp

@@ -2,45 +2,42 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "CommonPaths.h"
-
 #include <wx/fontdlg.h>
 #include <wx/mimetype.h>
 
-#include "Host.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"
 
-#include "DebuggerUIUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/HLE/HLE.h"
+#include "Core/Boot/Boot.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/CPU.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
+#include "Core/PowerPC/PPCTables.h"
+#include "Core/PowerPC/Profiler.h"
+#include "Core/PowerPC/SignatureDB.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h" // for ClearCache()
 
-#include "../WxUtils.h"
-#include "RegisterWindow.h"
-#include "BreakpointWindow.h"
-#include "MemoryWindow.h"
-#include "JitWindow.h"
-#include "DebuggerPanel.h"
-#include "DSPDebugWindow.h"
-#include "FileUtil.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/DebuggerPanel.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/DSPDebugWindow.h"
+#include "DolphinWX/Debugger/JitWindow.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
+#include "DolphinWX/Debugger/RegisterWindow.h"
 
-#include "CodeWindow.h"
-#include "CodeView.h"
-
-#include "Core.h"
-#include "HLE/HLE.h"
-#include "Boot/Boot.h"
-#include "LogManager.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "Debugger/PPCDebugInterface.h"
-#include "Debugger/Debugger_SymbolMap.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPC/Profiler.h"
-#include "PowerPC/PPCSymbolDB.h"
-#include "PowerPC/SignatureDB.h"
-#include "PowerPC/PPCTables.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "PowerPC/JitCommon/JitCache.h" // for ClearCache()
-
-#include "ConfigManager.h"
 
 // Save and load settings
 // -----------------------------

Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp

@@ -2,20 +2,20 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>
 
 #include <wx/artprov.h>
 
-#include "../WxUtils.h"
-#include "StringUtil.h"
-#include "DSPDebugWindow.h"
-#include "DSPRegisterView.h"
-#include "CodeView.h"
-#include "MemoryView.h"
-#include "HW/DSPLLE/DSPSymbols.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+#include "Core/HW/DSPLLE/DSPSymbols.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeView.h"
+#include "DolphinWX/Debugger/DSPDebugWindow.h"
+#include "DolphinWX/Debugger/DSPRegisterView.h"
+#include "DolphinWX/Debugger/MemoryView.h"
 
 DSPDebuggerLLE* m_DebuggerFrame = NULL;
 

Source/Core/DolphinWX/Debugger/DSPDebugWindow.h

@@ -5,26 +5,26 @@
 #pragma once
 
 // general things
+#include <algorithm>
 #include <iostream>
-#include <vector>
 #include <list>
 #include <map>
-#include <algorithm>
+#include <vector>
 
 #include <wx/wx.h>
-#include <wx/frame.h>
 #include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/statbox.h>
-#include <wx/sizer.h>
+#include <wx/frame.h>
 #include <wx/listctrl.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/sizer.h>
 #include <wx/statline.h>
 #include <wx/aui/aui.h>
 
-#include "DSP/disassemble.h"
-#include "DSP/DSPInterpreter.h"
-#include "DSP/DSPMemoryMap.h"
-#include "HW/DSPLLE/DSPDebugInterface.h"
+#include "Core/DSP/disassemble.h"
+#include "Core/DSP/DSPInterpreter.h"
+#include "Core/DSP/DSPMemoryMap.h"
+#include "Core/HW/DSPLLE/DSPDebugInterface.h"
 
 class DSPRegisterView;
 class CCodeView;

Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DSPDebugWindow.h"
-#include "DSPRegisterView.h"
-#include "../WxUtils.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DSPDebugWindow.h"
+#include "DolphinWX/Debugger/DSPRegisterView.h"
 
 wxString CDSPRegTable::GetValue(int row, int col)
 {

Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp

@@ -2,16 +2,15 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "IniFile.h"
-#include "DebuggerPanel.h"
-#include "FileUtil.h"
-#include "../../Core/ConfigManager.h"
-
-#include "VideoConfig.h"
-#include "TextureCacheBase.h"
-#include "PixelShaderGen.h"
-#include "VertexShaderGen.h"
-#include "NativeVertexFormat.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "Core/ConfigManager.h"
+#include "DolphinWX/Debugger/DebuggerPanel.h"
+#include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
 
 BEGIN_EVENT_TABLE(GFXDebuggerPanel, wxPanel)
 	EVT_CLOSE(GFXDebuggerPanel::OnClose)

Source/Core/DolphinWX/Debugger/DebuggerPanel.h

@@ -6,7 +6,8 @@
 
 #include <wx/wx.h>
 #include <wx/notebook.h>
-#include "Debugger.h"
+
+#include "VideoCommon/Debugger.h"
 
 class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase
 {

Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp

@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 
-#include "DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
 
 // The default font
 wxFont DebuggerFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, wxT("monospace"));

Source/Core/DolphinWX/Debugger/JitWindow.cpp

@@ -3,29 +3,28 @@
 // Refer to the license.txt file included.
 
 #include <wx/button.h>
+#include <wx/listctrl.h>
 #include <wx/textctrl.h>
-#include <wx/listctrl.h>
 #include <wx/thread.h>
-#include <wx/listctrl.h>
 
-#include "JitWindow.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "PowerPC/JitCommon/JitBase.h"
-#include "PowerPC/JitCommon/JitCache.h"
-#include "PowerPC/PPCAnalyst.h"
-#include "PowerPCDisasm.h"
-#include "disasm.h"
+#include "PowerPCDisasm.h" // Bochs
+#include "disasm.h"        // Bochs
 
-#include "Debugger/PPCDebugInterface.h"
-#include "Debugger/Debugger_SymbolMap.h"
+#include "Common/LogManager.h"
+#include "Common/StringUtil.h"
 
-#include "Core.h"
-#include "StringUtil.h"
-#include "LogManager.h"
-#include "../WxUtils.h"
+#include "Core/Core.h"
+#include "Core/Debugger/PPCDebugInterface.h"
+#include "Core/Debugger/Debugger_SymbolMap.h"
+#include "Core/HW/CPU.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
 
-#include "../Globals.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/JitWindow.h"
 
 enum
 {

Source/Core/DolphinWX/Debugger/JitWindow.h

@@ -7,13 +7,13 @@
 #include <vector>
 
 #include <wx/dialog.h>
-#include <wx/textctrl.h>
-#include <wx/listctrl.h>
 #include <wx/listbox.h>
+#include <wx/listctrl.h>
+#include <wx/textctrl.h>
 
-#include "MemoryView.h"
-#include "Thread.h"
-#include "CoreParameter.h"
+#include "Common/Thread.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/Debugger/MemoryView.h"
 
 class JitBlockList : public wxListCtrl
 {

Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../WxUtils.h"
-#include "MemoryCheckDlg.h"
-#include "Common.h"
-#include "StringUtil.h"
-#include "PowerPC/PowerPC.h"
-#include "BreakpointWindow.h"
+#include "Common/Common.h"
+#include "Common/StringUtil.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/BreakpointWindow.h"
+#include "DolphinWX/Debugger/MemoryCheckDlg.h"
 
 #define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, wxT(text), wxDefaultPosition, wxDefaultSize)
 

Source/Core/DolphinWX/Debugger/MemoryView.cpp

@@ -2,18 +2,17 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DebuggerUIUtil.h"
-#include "Common.h"
-#include "Host.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Memmap.h"
-
-#include "MemoryView.h"
-#include "../WxUtils.h"
-
 #include <wx/event.h>
 #include <wx/clipbrd.h>
 
+#include "Common/Common.h"
+#include "Core/Host.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/MemoryView.h"
+
 enum
 {
 	IDM_GOTOINMEMVIEW = 12000,

Source/Core/DolphinWX/Debugger/MemoryView.h

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "DebuggerUIUtil.h"
-#include "Common.h"
-#include "DebugInterface.h"
+#include "Common/Common.h"
+#include "Common/DebugInterface.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
 
 class CMemoryView : public wxControl
 {

Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

@@ -8,23 +8,20 @@
 #include <wx/thread.h>
 #include <wx/listctrl.h>
 
-#include "../WxUtils.h"
-#include "MemoryWindow.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"
+#include "Core/Core.h"
+#include "Core/ConfigManager.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/PPCSymbolDB.h"
 
-#include "Debugger/PPCDebugInterface.h"
-#include "PowerPC/PPCSymbolDB.h"
-
-#include "Core.h"
-#include "ConfigManager.h"
-#include "LogManager.h"
-
-#include "HW/Memmap.h"
-#include "HW/DSP.h"
-
-#include "../../DolphinWX/Globals.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/MemoryWindow.h"
 
 enum
 {

Source/Core/DolphinWX/Debugger/MemoryWindow.h

@@ -7,11 +7,11 @@
 #include <wx/dialog.h>
 #include <wx/textctrl.h>
 #include <wx/listbox.h>
-#include "MemoryView.h"
-#include "Thread.h"
-#include "StringUtil.h"
 
-#include "CoreParameter.h"
+#include "Common/StringUtil.h"
+#include "Common/Thread.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/Debugger/MemoryView.h"
 
 class CRegisterWindow;
 class CBreakPointWindow;

Source/Core/DolphinWX/Debugger/RegisterView.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "DebuggerUIUtil.h"
-#include "RegisterView.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/ProcessorInterface.h"
-#include "IniFile.h"
-#include "../WxUtils.h"
+#include "Common/IniFile.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+#include "DolphinWX/Debugger/RegisterView.h"
 
 // F-zero 80005e60 wtf??
 

Source/Core/DolphinWX/Debugger/RegisterView.h

@@ -6,7 +6,7 @@
 
 #include <wx/grid.h>
 
-#include "Common.h"
+#include "Common/Common.h"
 
 // New register view:
 // R0  0x8000000    F0   0.0000       F0_PS1 0.0000

Source/Core/DolphinWX/Debugger/RegisterWindow.cpp

@@ -4,9 +4,9 @@
 
 #include <wx/wx.h>
 
-#include "RegisterWindow.h"
-#include "PowerPC/PowerPC.h"
-#include "RegisterView.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/Debugger/RegisterView.h"
+#include "DolphinWX/Debugger/RegisterWindow.h"
 
 extern const char* GetGRPName(unsigned int index);
 

Source/Core/DolphinWX/FifoPlayerDlg.cpp

@@ -2,21 +2,21 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-#include "FifoPlayerDlg.h"
-#include "FileUtil.h"
-#include "Thread.h"
-#include "FifoPlayer/FifoPlayer.h"
-#include "FifoPlayer/FifoRecorder.h"
-#include "OpcodeDecoding.h"
-#include "WxUtils.h"
+#include <algorithm>
+#include <vector>
+
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/Thread.h"
+#include "Core/FifoPlayer/FifoPlayer.h"
+#include "Core/FifoPlayer/FifoRecorder.h"
+#include "DolphinWX/FifoPlayerDlg.h"
+#include "DolphinWX/WxUtils.h"
+#include "VideoCommon/OpcodeDecoding.h"
 
 #include <wx/spinctrl.h>
 #include <wx/clipbrd.h>
 
-#include <algorithm>
-#include <vector>
-
 DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1)
 DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT)
 

Source/Core/DolphinWX/Frame.cpp

@@ -10,37 +10,37 @@
 // m_Panel. The new child window handle that is returned by CreateWindow() can
 // be accessed from Core::GetWindowHandle().
 
-#include "Common.h" // Common
-#include "FileUtil.h"
-#include "Timer.h"
+#include <wx/datetime.h>
 
-#include "Globals.h" // Local
-#include "Frame.h"
-#include "ConfigMain.h"
-#include "CheatsWindow.h"
-#include "GameListCtrl.h"
-#include "BootManager.h"
+#include "Common/Common.h"
+#include "Common/FileUtil.h"
+#include "Common/Timer.h"
 
-#include "ConfigManager.h" // Core
-#include "Core.h"
-#include "HW/DVDInterface.h"
-#include "HW/GCPad.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
-#include "State.h"
-#include "VolumeHandler.h"
-#include "Movie.h"
-#include "RenderBase.h"
-#include "VideoConfig.h"
-#include "VertexShaderManager.h"
+#include "DolphinWX/CheatsWindow.h"
+#include "DolphinWX/ConfigMain.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/Globals.h"
 
-#include "VideoBackendBase.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Movie.h"
+#include "Core/State.h"
+#include "Core/VolumeHandler.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/GCPad.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
 
-#include <wx/datetime.h> // wxWidgets
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoBackendBase.h"
+#include "VideoCommon/VideoConfig.h"
 
 // Resources
 
 extern "C" {
-#include "resources/Dolphin.c" // Dolphin icon
+#include "DolphinWX/resources/Dolphin.c" // Dolphin icon
 };
 
 

Source/Core/DolphinWX/Frame.h

@@ -4,28 +4,31 @@
 
 #pragma once
 
-#include <wx/wx.h> // wxWidgets
+#include <string>
+#include <vector>
+
+#include <wx/wx.h>
 #include <wx/busyinfo.h>
 #include <wx/mstream.h>
 #include <wx/listctrl.h>
 #include <wx/artprov.h>
 #include <wx/aui/aui.h>
 #include <wx/tooltip.h>
-#include <string>
-#include <vector>
 
 #ifdef __APPLE__
 #include <Cocoa/Cocoa.h>
 #endif
 
-#include "CDUtils.h"
-#include "Debugger/CodeWindow.h"
-#include "LogWindow.h"
-#include "LogConfigWindow.h"
-#include "TASInputDlg.h"
-#include "Movie.h"
+#include "Common/CDUtils.h"
+#include "Core/Movie.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/LogConfigWindow.h"
+#include "DolphinWX/TASInputDlg.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+
 #if defined(HAVE_X11) && HAVE_X11
-#include "X11Utils.h"
+#include "DolphinWX/X11Utils.h"
 #endif
 
 // A shortcut to access the bitmaps

Source/Core/DolphinWX/FrameAui.cpp

@@ -2,14 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h" // Common
-
-#include "Globals.h" // Local
-#include "Frame.h"
-#include "LogWindow.h"
-#include "WxUtils.h"
-
-#include "ConfigManager.h" // Core
+#include "Common/Common.h"
+#include "Core/ConfigManager.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/WxUtils.h"
 
 // ------------
 // Aui events

Source/Core/DolphinWX/FrameTools.cpp

@@ -14,52 +14,52 @@ window handle that is returned by CreateWindow() can be accessed from
 Core::GetWindowHandle().
 */
 
-#include "NetWindow.h"
-#include "Common.h" // Common
-#include "FileUtil.h"
-#include "FileSearch.h"
-#include "Timer.h"
-#include "VideoBackendBase.h"
+#include <wx/datetime.h>
+
+#include "Common/Common.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/Timer.h"
+#include "VideoCommon/VideoBackendBase.h"
 
 #ifdef __APPLE__
 #include <AppKit/AppKit.h>
 #endif
 
-#include "Globals.h" // Local
-#include "Frame.h"
-#include "ConfigMain.h"
-#include "MemcardManager.h"
-#include "CheatsWindow.h"
-#include "AboutDolphin.h"
-#include "GameListCtrl.h"
-#include "BootManager.h"
-#include "LogWindow.h"
-#include "LogConfigWindow.h"
-#include "FifoPlayerDlg.h"
-#include "WxUtils.h"
-#include "Host.h"
+#include "DolphinWX/AboutDolphin.h"
+#include "DolphinWX/CheatsWindow.h"
+#include "DolphinWX/ConfigMain.h"
+#include "DolphinWX/FifoPlayerDlg.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/HotkeyDlg.h"
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/LogConfigWindow.h"
+#include "DolphinWX/MemcardManager.h"
+#include "DolphinWX/NetWindow.h"
+#include "DolphinWX/TASInputDlg.h"
+#include "DolphinWX/WiimoteConfigDiag.h"
+#include "DolphinWX/WXInputBase.h"
+#include "DolphinWX/WxUtils.h"
 
-#include "ConfigManager.h" // Core
-#include "Core.h"
-#include "Movie.h"
-#include "HW/CPU.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/DVDInterface.h"
-#include "HW/ProcessorInterface.h"
-#include "HW/GCPad.h"
-#include "HW/Wiimote.h"
-#include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/Movie.h"
+#include "Core/State.h"
+#include "Core/HW/CPU.h"
+#include "Core/HW/DVDInterface.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/Wiimote.h"
 //#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h"
-#include "State.h"
-#include "VolumeHandler.h"
-#include "NANDContentLoader.h"
-#include "WXInputBase.h"
-#include "WiimoteConfigDiag.h"
-#include "InputConfigDiag.h"
-#include "HotkeyDlg.h"
-#include "TASInputDlg.h"
-
-#include <wx/datetime.h> // wxWidgets
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/VolumeHandler.h"
+#include "DiscIO/NANDContentLoader.h"
 
 #ifdef _WIN32
 #ifndef SM_XVIRTUALSCREEN
@@ -78,7 +78,7 @@ Core::GetWindowHandle().
 
 // Resources
 extern "C" {
-#include "resources/Dolphin.c" // Dolphin icon
+#include "DolphinWX/resources/Dolphin.c" // Dolphin icon
 };
 
 bool confirmStop = false;

Source/Core/DolphinWX/GLInterface/AGL.cpp

@@ -2,16 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "VideoConfig.h"
-#include "Host.h"
-#include "RenderBase.h"
-#include "ConfigManager.h"
-
 #include <wx/panel.h>
 
-#include "VertexShaderManager.h"
-#include "GLInterface.h"
-#include "AGL.h"
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/AGL.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
 
 void cInterfaceAGL::Swap()
 {

Source/Core/DolphinWX/GLInterface/AGL.h

@@ -8,7 +8,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-#include "InterfaceBase.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"
 
 class cInterfaceAGL : public cInterfaceBase
 {

Source/Core/DolphinWX/GLInterface/EGL.cpp

@@ -1,25 +1,11 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
-
-#include "Host.h"
-#include "RenderBase.h"
-
-#include "GLInterface.h"
-#include "EGL.h"
+#include "Core/Host.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/EGL.h"
+#include "VideoCommon/RenderBase.h"
 
 // Show the current FPS
 void cInterfaceEGL::UpdateFPSDisplay(const char *text)

Source/Core/DolphinWX/GLInterface/EGL.h

@@ -5,8 +5,9 @@
 #pragma once
 
 #include <EGL/egl.h>
-#include "InterfaceBase.h"
-#include "ConfigManager.h"
+
+#include "Core/ConfigManager.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"
 
 
 class cPlatform

Source/Core/DolphinWX/GLInterface/GLInterface.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Thread.h"
+#include "Common/Thread.h"
 
 #if USE_EGL
 // Currently Wayland/EGL and X11/EGL platforms are supported.
@@ -19,19 +19,19 @@ enum egl_platform {
 };
 
 #if HAVE_X11
-#include "GLInterface/X11_Util.h"
+#include "DolphinWX/GLInterface/X11_Util.h"
 #endif
 #if HAVE_WAYLAND
-#include "GLInterface/Wayland_Util.h"
+#include "DolphinWX/GLInterface/Wayland_Util.h"
 #endif
 
-#include "GLInterface/EGL.h"
+#include "DolphinWX/GLInterface/EGL.h"
 #elif defined(__APPLE__)
-#include "GLInterface/AGL.h"
+#include "DolphinWX/GLInterface/AGL.h"
 #elif defined(_WIN32)
-#include "GLInterface/WGL.h"
+#include "DolphinWX/GLInterface/WGL.h"
 #elif HAVE_X11
-#include "GLInterface/GLX.h"
+#include "DolphinWX/GLInterface/GLX.h"
 #include <GL/glx.h>
 #else
 #error Platform doesnt have a GLInterface

Source/Core/DolphinWX/GLInterface/GLX.cpp

@@ -2,12 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Host.h"
-#include "RenderBase.h"
-#include "VideoConfig.h"
+#include "Core/Host.h"
 
-#include "GLInterface.h"
-#include "GLX.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/GLX.h"
+
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VideoConfig.h"
 
 typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
 PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = NULL;

Source/Core/DolphinWX/GLInterface/GLX.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "X11_Util.h"
-#include "InterfaceBase.h"
+#include "DolphinWX/GLInterface/X11_Util.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"
 
 class cInterfaceGLX : public cInterfaceBase
 {

Source/Core/DolphinWX/GLInterface/InterfaceBase.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include "Common/Common.h"
+
 enum GLInterfaceMode {
 	MODE_DETECT = 0,
 	MODE_OPENGL,

Source/Core/DolphinWX/GLInterface/Platform.cpp

@@ -1,22 +1,9 @@
-// Copyright (C) 2013 Scott Moreau <[email protected]>
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
-
-#include "Host.h"
-#include "GLInterface/GLInterface.h"
+#include "Core/Host.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
 
 bool cPlatform::SelectDisplay(void)
 {

Source/Core/DolphinWX/GLInterface/WGL.cpp

@@ -2,15 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "VideoConfig.h"
-#include "Host.h"
-#include "RenderBase.h"
+#include "Core/Host.h"
 
-#include "VertexShaderManager.h"
-#include "GLInterface.h"
-#include "WGL.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/WGL.h"
+
+#include "VideoCommon/EmuWindow.h"
+#include "VideoCommon/RenderBase.h"
+#include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoConfig.h"
 
-#include "EmuWindow.h"
 static HDC hDC = NULL;       // Private GDI Device Context
 static HGLRC hRC = NULL;     // Permanent Rendering Context
 static HINSTANCE dllHandle = NULL; // Handle to OpenGL32.dll 

Source/Core/DolphinWX/GLInterface/WGL.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "InterfaceBase.h"
+#include "DolphinWX/GLInterface/InterfaceBase.h"
 
 class cInterfaceWGL : public cInterfaceBase
 {

Source/Core/DolphinWX/GLInterface/Wayland_Util.cpp

@@ -2,12 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Core.h"
-#include "State.h"
-#include "GLInterface.h"
 #include <linux/input.h>
 #include <sys/mman.h>
 
+#include "Core/Core.h"
+#include "Core/State.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+
 static void
 hide_cursor(void)
 {

Source/Core/DolphinWX/GLInterface/X11_Util.cpp

@@ -1,23 +1,10 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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/
-
-#include "Host.h"
-#include "VideoConfig.h"
-#include "GLInterface.h"
+#include "Core/Host.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
+#include "VideoCommon/VideoConfig.h"
 
 #if USE_EGL
 bool cXInterface::ServerConnect(void)

Source/Core/DolphinWX/GameListCtrl.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Globals.h"
-
 #include <wx/imaglist.h>
 #include <wx/fontmap.h>
 #include <wx/filename.h>
@@ -12,35 +10,36 @@
 #include <cinttypes>
 #include <memory>
 
-#include "FileSearch.h"
-#include "StringUtil.h"
-#include "ConfigManager.h"
-#include "GameListCtrl.h"
-#include "Blob.h"
-#include "Core.h"
-#include "ISOProperties.h"
-#include "FileUtil.h"
-#include "CDUtils.h"
-#include "WxUtils.h"
-#include "Main.h"
-#include "MathUtil.h"
-#include "HW/DVDInterface.h"
+#include "Common/CDUtils.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/DVDInterface.h"
+#include "DiscIO/Blob.h"
 
-#include "resources/Flag_Europe.xpm"
-#include "resources/Flag_Germany.xpm"
-#include "resources/Flag_France.xpm"
-#include "resources/Flag_Italy.xpm"
-#include "resources/Flag_Japan.xpm"
-#include "resources/Flag_USA.xpm"
-#include "resources/Flag_Taiwan.xpm"
-#include "resources/Flag_Korea.xpm"
-#include "resources/Flag_Unknown.xpm"
-#include "resources/Flag_SDK.xpm"
+#include "DolphinWX/GameListCtrl.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/ISOProperties.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWx/resources/Flag_Europe.xpm"
+#include "DolphinWX/resources/Flag_Germany.xpm"
+#include "DolphinWX/resources/Flag_France.xpm"
+#include "DolphinWX/resources/Flag_Italy.xpm"
+#include "DolphinWX/resources/Flag_Japan.xpm"
+#include "DolphinWX/resources/Flag_USA.xpm"
+#include "DolphinWX/resources/Flag_Taiwan.xpm"
+#include "DolphinWX/resources/Flag_Korea.xpm"
+#include "DolphinWX/resources/Flag_Unknown.xpm"
+#include "DolphinWX/resources/Flag_SDK.xpm"
 
-#include "resources/Platform_Wad.xpm"
-#include "resources/Platform_Wii.xpm"
-#include "resources/Platform_Gamecube.xpm"
-#include "resources/rating_gamelist.h"
+#include "DolphinWX/resources/Platform_Wad.xpm"
+#include "DolphinWX/resources/Platform_Wii.xpm"
+#include "DolphinWX/resources/Platform_Gamecube.xpm"
+#include "DolphinWX/resources/rating_gamelist.h"
 
 size_t CGameListCtrl::m_currentItem = 0;
 size_t CGameListCtrl::m_numberItem = 0;

Source/Core/DolphinWX/GameListCtrl.h

@@ -10,8 +10,8 @@
 #include <wx/listctrl.h>
 #include <wx/tipwin.h>
 
-#include "ISOFile.h"
-#include "MemoryCards/WiiSaveCrypted.h"
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/MemoryCards/WiiSaveCrypted.h"
 
 class wxEmuStateTip : public wxTipWindow
 {

Source/Core/DolphinWX/GeckoCodeDiag.cpp

@@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "GeckoCodeDiag.h"
-#include "Core.h"
-#include "WxUtils.h"
+#include <sstream>
 
 #include <SFML/Network/Http.hpp>
 
-#include <sstream>
+#include "Core/Core.h"
+#include "DolphinWX/GeckoCodeDiag.h"
+#include "DolphinWX/WxUtils.h"
 
 namespace Gecko
 {

Source/Core/DolphinWX/GeckoCodeDiag.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "GeckoCode.h"
-#include "GeckoCodeConfig.h"
+#include <wx/wx.h>
 
-#include "wx/wx.h"
+#include "Core/GeckoCode.h"
+#include "Core/GeckoCodeConfig.h"
 
 namespace Gecko
 {

Source/Core/DolphinWX/Globals.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 
 enum
 {

Source/Core/DolphinWX/HotkeyDlg.cpp

@@ -4,8 +4,8 @@
 
 #include <wx/notebook.h>
 
-#include "HotkeyDlg.h"
-#include "ConfigManager.h"
+#include "Core/ConfigManager.h"
+#include "DolphinWX/HotkeyDlg.h"
 
 BEGIN_EVENT_TABLE(HotkeyConfigDialog,wxDialog)
 	EVT_COMMAND_RANGE(0, NUM_HOTKEYS - 1,

Source/Core/DolphinWX/HotkeyDlg.h

@@ -12,12 +12,12 @@
 #include <wx/checkbox.h>
 #include <wx/gbsizer.h>
 
-#include "Common.h"
-#include "CoreParameter.h"
-#include "WXInputBase.h"
+#include "Common/Common.h"
+#include "Core/CoreParameter.h"
+#include "DolphinWX/WXInputBase.h"
 
 #if defined(HAVE_X11) && HAVE_X11
-#include "X11InputBase.h"
+#include "DolphinWX/X11InputBase.h"
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #endif

Source/Core/DolphinWX/ISOFile.cpp

@@ -2,28 +2,29 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cinttypes>
 #include <string>
 #include <vector>
 #include <wx/mstream.h>
-#include <cinttypes>
 
-#include "Common.h"
-#include "CommonPaths.h"
+#include "Common/ChunkFile.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/Hash.h"
+#include "Common/IniFile.h"
+#include "Common/StringUtil.h"
 
-#include "Globals.h"
-#include "FileUtil.h"
-#include "ISOFile.h"
-#include "StringUtil.h"
-#include "Hash.h"
-#include "IniFile.h"
-#include "WxUtils.h"
+#include "Core/ConfigManager.h"
 
-#include "Filesystem.h"
-#include "BannerLoader.h"
-#include "FileSearch.h"
-#include "CompressedBlob.h"
-#include "ChunkFile.h"
-#include "ConfigManager.h"
+#include "DiscIO/BannerLoader.h"
+#include "DiscIO/CompressedBlob.h"
+#include "DiscIO/Filesystem.h"
+
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/ISOFile.h"
+#include "DolphinWX/WxUtils.h"
 
 static const u32 CACHE_REVISION = 0x115;
 

Source/Core/DolphinWX/ISOFile.h

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "Volume.h"
-#include "VolumeCreator.h"
+#include "DiscIO/Volume.h"
+#include "DiscIO/VolumeCreator.h"
 
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/image.h>

Source/Core/DolphinWX/ISOProperties.cpp

@@ -6,27 +6,28 @@
 #import <Cocoa/Cocoa.h>
 #endif
 
-#include <type_traits>
 #include <cinttypes>
+#include <type_traits>
 
-#include "Common.h"
-#include "CommonPaths.h"
-#include "Globals.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/StringUtil.h"
 
-#include "WxUtils.h"
-#include "VolumeCreator.h"
-#include "Filesystem.h"
-#include "ISOProperties.h"
-#include "PHackSettings.h"
-#include "PatchAddEdit.h"
-#include "ARCodeAddEdit.h"
-#include "GeckoCodeDiag.h"
-#include "ConfigManager.h"
-#include "StringUtil.h"
+#include "Core/ConfigManager.h"
 
-#include "resources/isoprop_file.xpm"
-#include "resources/isoprop_folder.xpm"
-#include "resources/isoprop_disc.xpm"
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/VolumeCreator.h"
+
+#include "DolphinWX/ARCodeAddEdit.h"
+#include "DolphinWX/GeckoCodeDiag.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/ISOProperties.h"
+#include "DolphinWX/PatchAddEdit.h"
+#include "DolphinWX/PHackSettings.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/resources/isoprop_file.xpm"
+#include "DolphinWX/resources/isoprop_folder.xpm"
+#include "DolphinWX/resources/isoprop_disc.xpm"
 
 struct WiiPartition
 {

Source/Core/DolphinWX/ISOProperties.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <string>
+
 #include <wx/wx.h>
 #include <wx/sizer.h>
 #include <wx/filepicker.h>
@@ -14,14 +16,13 @@
 #include <wx/gbsizer.h>
 #include <wx/notebook.h>
 #include <wx/mimetype.h>
-#include <string>
 
-#include "ISOFile.h"
-#include "Filesystem.h"
-#include "IniFile.h"
-#include "PatchEngine.h"
-#include "ActionReplay.h"
-#include "GeckoCodeDiag.h"
+#include "Common/IniFile.h"
+#include "Core/ActionReplay.h"
+#include "Core/PatchEngine.h"
+#include "DiscIO/Filesystem.h"
+#include "DolphinWX/GeckoCodeDiag.h"
+#include "DolphinWX/ISOFile.h"
 
 struct PHackData
 {

Source/Core/DolphinWX/InputConfigDiag.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "InputConfigDiag.h"
-#include "UDPConfigDiag.h"
-#include "WxUtils.h"
-#include "HW/Wiimote.h"
-#include "ControllerInterface/ExpressionParser.h"
+#include "Core/HW/Wiimote.h"
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/UDPConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+#include "InputCommon/ControllerInterface/ExpressionParser.h"
 
 using namespace ciface::ExpressionParser;
 

Source/Core/DolphinWX/InputConfigDiag.h

@@ -11,6 +11,9 @@
 // might have to change this setup for wiimote
 #define PROFILES_PATH       "Profiles/"
 
+#include <sstream>
+#include <vector>
+
 #include <wx/wx.h>
 #include <wx/listbox.h>
 #include <wx/textctrl.h>
@@ -22,14 +25,11 @@
 #include <wx/panel.h>
 #include <wx/spinctrl.h>
 
-#include <sstream>
-#include <vector>
-
-#include "ControllerInterface/ControllerInterface.h"
-#include "ControllerEmu.h"
-#include "InputConfig.h"
-#include "FileSearch.h"
-#include "UDPWrapper.h"
+#include "Common/FileSearch.h"
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/InputConfig.h"
+#include "InputCommon/UDPWrapper.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 class PadSetting
 {

Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "InputConfigDiag.h"
-#include "WxUtils.h"
+#include "DolphinWX/InputConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
 
 void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
 {

Source/Core/DolphinWX/LogConfigWindow.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "LogConfigWindow.h"
-#include "LogManager.h"
-#include "LogWindow.h"
-#include "FileUtil.h"
-#include "WxUtils.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"
+#include "DolphinWX/LogConfigWindow.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/WxUtils.h"
 
 LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id)
 	: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration"))

Source/Core/DolphinWX/LogWindow.cpp

@@ -2,14 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "LogWindow.h"
-#include "IniFile.h"
-#include "FileUtil.h"
-#include "Debugger/DebuggerUIUtil.h"
-#include "WxUtils.h"
-
 #include <wx/fontmap.h>
 
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+#include "DolphinWX/LogWindow.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/DebuggerUIUtil.h"
+
 // Milliseconds between msgQueue flushes to wxTextCtrl
 #define UPDATETIME 200
 

Source/Core/DolphinWX/LogWindow.h

@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include "LogManager.h"
-#include "Frame.h"
-#include "Thread.h"
 #include <queue>
 
+#include "Common/LogManager.h"
+#include "Common/Thread.h"
+#include "DolphinWX/Frame.h"
+
 enum
 {
 	IDM_LOG,

Source/Core/DolphinWX/Main.cpp

@@ -2,34 +2,33 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "Common.h"
-#include "CommonPaths.h"
+#include "Common/Common.h"
+#include "Common/CommonPaths.h"
+#include "Common/CPUDetect.h"
+#include "Common/ExtendedTrace.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 
 #if defined HAVE_X11 && HAVE_X11
 #include <X11/Xlib.h>
 #endif
 
-#include "CPUDetect.h"
-#include "IniFile.h"
-#include "FileUtil.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Host.h"
+#include "Core/HW/Wiimote.h"
 
-#include "Host.h" // Core
-#include "HW/Wiimote.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.h"
+#include "DolphinWX/Main.h"
+#include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
+#include "DolphinWX/Debugger/JitWindow.h"
 
-#include "WxUtils.h"
-#include "Globals.h" // Local
-#include "Main.h"
-#include "ConfigManager.h"
-#include "Debugger/CodeWindow.h"
-#include "Debugger/JitWindow.h"
-#include "ExtendedTrace.h"
-#include "BootManager.h"
-#include "Frame.h"
-
-#include "VideoBackendBase.h"
+#include "VideoCommon/VideoBackendBase.h"
 
 #include <wx/intl.h>
 

Source/Core/DolphinWX/Main.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Frame.h"
+#include "DolphinWX/Frame.h"
 
 // Define a new application
 class CFrame;

Source/Core/DolphinWX/MainNoGUI.cpp

@@ -2,40 +2,40 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdarg>
 #include <getopt.h>
 
-#include "Common.h"
-#include "FileUtil.h"
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "Common/FileUtil.h"
+#include "Common/LogManager.h"
+#include "Common/Thread.h"
 
 #if HAVE_X11
 #include <X11/keysym.h>
-#include "State.h"
-#include "X11Utils.h"
+#include "Core/State.h"
+#include "DolphinWX/X11Utils.h"
 #endif
 
 #if HAVE_WAYLAND
 #include <wayland-client.h>
-#include "GLInterface/GLInterface.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
 #endif
 
 #ifdef __APPLE__
 #import <Cocoa/Cocoa.h>
 #endif
 
-#include "Core.h"
-#include "Host.h"
-#include "CPUDetect.h"
-#include "Thread.h"
-#include "PowerPC/PowerPC.h"
-#include "HW/Wiimote.h"
+#include "Core/BootManager.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/Host.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/PowerPC/PowerPC.h"
 
-#include "VideoBackendBase.h"
-#include "ConfigManager.h"
-#include "LogManager.h"
-#include "BootManager.h"
+#include "VideoCommon/VideoBackendBase.h"
 
 bool rendererHasFocus = true;
 bool running = true;

Source/Core/DolphinWX/MemcardManager.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "MemcardManager.h"
-#include "Common.h"
+#include <wx/mstream.h>
 
-#include "WxUtils.h"
-#include "wx/mstream.h"
+#include "Common/Common.h"
+#include "DolphinWX/MemcardManager.h"
+#include "DolphinWX/WxUtils.h"
 
 #define ARROWS slot ? _T("") : ARROW[slot], slot ? ARROW[slot] : _T("")
 

Source/Core/DolphinWX/MemcardManager.h

@@ -13,9 +13,9 @@
 #include <wx/imaglist.h>
 #include <wx/fontmap.h>
 
-#include "IniFile.h"
-#include "FileUtil.h"
-#include "HW/GCMemcard.h"
+#include "Core/HW/GCMemcard.h"
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 
 #undef MEMCARD_MANAGER_STYLE
 #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX

Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.cpp

@@ -10,11 +10,10 @@
 #include <algorithm>
 #include <cinttypes>
 
-#include "WiiSaveCrypted.h"
-#include "FileUtil.h"
-#include "MathUtil.h"
-#include "NandPaths.h"
-#include "FileUtil.h"
+#include "Common/FileUtil.h"
+#include "Common/MathUtil.h"
+#include "Common/NandPaths.h"
+#include "DolphinWX/MemoryCards/WiiSaveCrypted.h"
 
 static Common::replace_v replacements;
 

Source/Core/DolphinWX/MemoryCards/WiiSaveCrypted.h

@@ -4,10 +4,11 @@
 
 #pragma once
 
-#include "StringUtil.h"
-#include "Crypto/tools.h"
 #include <polarssl/aes.h>
-#include "polarssl/md5.h"
+#include <polarssl/md5.h>
+
+#include "Common/StringUtil.h"
+#include "Common/Crypto/tools.h"
 
 // --- this is used for encrypted Wii save files
 

Source/Core/DolphinWX/NetWindow.cpp

@@ -2,20 +2,21 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <FileUtil.h>
-#include <IniFile.h>
-
-#include "WxUtils.h"
-#include "NetPlayClient.h"
-#include "NetPlayServer.h"
-#include "NetWindow.h"
-#include "Frame.h"
-#include "Core.h"
-#include "ConfigManager.h"
-
 #include <sstream>
 #include <string>
 
+#include "Common/FileUtil.h"
+#include "Common/IniFile.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayServer.h"
+
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/NetWindow.h"
+#include "DolphinWX/WxUtils.h"
+
 #define NETPLAY_TITLEBAR  "Dolphin NetPlay"
 #define INITIAL_PAD_BUFFER_SIZE 20
 

Source/Core/DolphinWX/NetWindow.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "CommonTypes.h"
-
 #include <queue>
 #include <string>
 
@@ -18,11 +16,10 @@
 #include <wx/listbox.h>
 #include <wx/spinctrl.h>
 
-#include "GameListCtrl.h"
-
-#include "FifoQueue.h"
-
-#include "NetPlayClient.h"
+#include "Common/CommonTypes.h"
+#include "Common/FifoQueue.h"
+#include "Core/NetPlayClient.h"
+#include "DolphinWX/GameListCtrl.h"
 
 enum
 {

Source/Core/DolphinWX/PHackSettings.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "CommonPaths.h"
-#include "PHackSettings.h"
-#include "ConfigManager.h"
-#include "WxUtils.h"
+#include "Core/ConfigManager.h"
+#include "Common/CommonPaths.h"
+#include "DolphinWX/PHackSettings.h"
+#include "DolphinWX/WxUtils.h"
 
 extern PHackData PHack_Data;
 

Source/Core/DolphinWX/PHackSettings.h

@@ -6,7 +6,8 @@
 
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
-#include "ISOProperties.h"
+
+#include "DolphinWX/ISOProperties.h"
 
 class CPHackSettings : public wxDialog
 {

Source/Core/DolphinWX/PatchAddEdit.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "PatchAddEdit.h"
-#include "WxUtils.h"
+#include "DolphinWX/PatchAddEdit.h"
+#include "DolphinWX/WxUtils.h"
 
 extern std::vector<PatchEngine::Patch> onFrame;
 

Source/Core/DolphinWX/PatchAddEdit.h

@@ -6,7 +6,8 @@
 
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
-#include "ISOProperties.h"
+
+#include "DolphinWX/ISOProperties.h"
 
 class CPatchAddEdit : public wxDialog
 {

Source/Core/DolphinWX/TASInputDlg.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "TASInputDlg.h"
-#include "Movie.h"
+#include "Core/Movie.h"
+#include "DolphinWX/TASInputDlg.h"
 
 BEGIN_EVENT_TABLE(TASInputDlg, wxDialog)
 

Source/Core/DolphinWX/TASInputDlg.h

@@ -6,9 +6,9 @@
 
 #include <wx/wx.h>
 
-#include "Common.h"
-#include "CoreParameter.h"
-#include "../InputCommon/GCPadStatus.h"
+#include "Common/Common.h"
+#include "Core/CoreParameter.h"
+#include "InputCommon/GCPadStatus.h"
 
 class TASInputDlg : public wxDialog
 {

Source/Core/DolphinWX/UDPConfigDiag.cpp

@@ -1,13 +1,12 @@
-#include "UDPConfigDiag.h"
-#include "UDPWrapper.h"
-
-#include "Common.h"
-#include "ControllerEmu.h"
-#include "IniFile.h"
-#include "WxUtils.h"
-
 #include <string>
 
+#include "Common/Common.h"
+#include "Common/IniFile.h"
+#include "DolphinWX/UDPConfigDiag.h"
+#include "DolphinWX/WxUtils.h"
+#include "InputCommon/ControllerEmu.h"
+#include "InputCommon/UDPWrapper.h"
+
 UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) :
 	wxDialog(parent, -1, _("UDP Wiimote"), wxDefaultPosition, wxDefaultSize),
 	wrp(_wrp)

Source/Core/DolphinWX/UDPConfigDiag.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "UDPWrapper.h"
-
 #include <wx/wx.h>
 #include <wx/listbox.h>
 #include <wx/textctrl.h>
@@ -13,6 +11,8 @@
 #include <wx/panel.h>
 #include <wx/spinctrl.h>
 
+#include "InputCommon/UDPWrapper.h"
+
 class UDPConfigDiag : public wxDialog
 {
 public:

Source/Core/DolphinWX/VideoConfigDiag.cpp

@@ -1,12 +1,12 @@
-#include "VideoConfigDiag.h"
-
-#include "FileUtil.h"
-#include "TextureCacheBase.h"
-#include "Core.h"
-#include "Frame.h"
-
 #include <wx/intl.h>
 
+#include "Common/FileUtil.h"
+#include "Core/Core.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/VideoConfigDiag.h"
+#include "VideoCommon/TextureCacheBase.h"
+
+
 #ifdef __APPLE__
 #include <ApplicationServices/ApplicationServices.h>
 #endif

Source/Core/DolphinWX/VideoConfigDiag.h

@@ -1,12 +1,8 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include <map>
-
-#include "ConfigManager.h"
-#include "VideoConfig.h"
-#include "Core.h"
+#include <string>
+#include <vector>
 
 #include <wx/wx.h>
 #include <wx/textctrl.h>
@@ -18,8 +14,11 @@
 #include <wx/panel.h>
 #include <wx/spinctrl.h>
 
-#include "MsgHandler.h"
-#include "WxUtils.h"
+#include "Common/MsgHandler.h"
+#include "Core/Core.h"
+#include "Core/ConfigManager.h"
+#include "DolphinWX/WxUtils.h"
+#include "VideoCommon/VideoConfig.h"
 
 template <typename W>
 class BoolSetting : public W

Source/Core/DolphinWX/WXInputBase.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "WXInputBase.h"
+#include "DolphinWX/WXInputBase.h"
 
 namespace InputCommon
 {

Source/Core/DolphinWX/WXInputBase.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
 #endif

Source/Core/DolphinWX/WiimoteConfigDiag.cpp

@@ -1,9 +1,8 @@
-
-#include "WiimoteConfigDiag.h"
-#include "HW/Wiimote.h"
-#include "HW/WiimoteReal/WiimoteReal.h"
-#include "Frame.h"
-#include "NetPlayProto.h"
+#include "DolphinWX/Frame.h"
+#include "DolphinWX/WiimoteConfigDiag.h"
+#include "Core/NetPlayProto.h"
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteReal/WiimoteReal.h"
 
 WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin)
 	: wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize)

Source/Core/DolphinWX/WiimoteConfigDiag.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <map>
+
 #include <wx/wx.h>
 #include <wx/listbox.h>
 #include <wx/textctrl.h>
@@ -11,11 +13,9 @@
 #include <wx/panel.h>
 #include <wx/spinctrl.h>
 
-#include "InputConfigDiag.h"
-#include "ConfigManager.h"
-#include <HW/Wiimote.h>
-
-#include <map>
+#include "Core/ConfigManager.h"
+#include "Core/HW/Wiimote.h"
+#include "DolphinWX/InputConfigDiag.h"
 
 class WiimoteConfigDiag : public wxDialog
 {

Source/Core/DolphinWX/WxUtils.cpp

@@ -2,12 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common.h"
-
 #include <wx/wx.h>
 #include <wx/string.h>
 
-#include "WxUtils.h"
+#include "Common/Common.h"
+#include "DolphinWX/WxUtils.h"
 
 #ifdef __APPLE__
 #import <AppKit/AppKit.h>

Source/Core/DolphinWX/X11Utils.cpp

@@ -1,32 +1,19 @@
-// Copyright (C) 2003 Dolphin Project.
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
-// 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.
+#include "DolphinWX/X11Utils.h"
 
-// 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/
-
-#include "X11Utils.h"
-
-#include <unistd.h>
 #include <spawn.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 extern char **environ;
 
 #if defined(HAVE_WX) && HAVE_WX
 #include <string>
 #include <algorithm>
-#include "WxUtils.h"
+#include "DolphinWX/WxUtils.h"
 #endif
 
 namespace X11Utils

Source/Core/DolphinWX/X11Utils.h

@@ -4,7 +4,10 @@
 
 #pragma once
 
-#include "Common.h"
+#include "Common/Common.h"
+
+#include "Core/Core.h"
+#include "Core/ConfigManager.h"
 
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
@@ -17,8 +20,6 @@
 #include <X11/extensions/Xrandr.h>
 #endif
 
-#include "Core.h"
-#include "ConfigManager.h"
 
 // EWMH state actions, see
 // http://freedesktop.org/wiki/Specifications/wm-spec?action=show&redirect=Standards%2Fwm-spec

Source/Core/DolphinWX/stdafx.cpp

@@ -2,4 +2,4 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "stdafx.h"
+#include "DolphinWX/stdafx.h"