Merge pull request #2379 from lioncash/header

DolphinWX: Remove unnecessary includes

Source/Core/DolphinWX/ARCodeAddEdit.cpp

@@ -7,20 +7,13 @@
 #include <cstdlib>
 #include <string>
 #include <vector>
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/gbsizer.h>
-#include <wx/gdicmn.h>
 #include <wx/msgdlg.h>
 #include <wx/sizer.h>
 #include <wx/spinbutt.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"

Source/Core/DolphinWX/ARCodeAddEdit.h

@@ -5,11 +5,6 @@
 #pragma once
 
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 class wxSpinButton;
 class wxSpinEvent;

Source/Core/DolphinWX/AboutDolphin.cpp

@@ -3,18 +3,13 @@
 // Refer to the license.txt file included.
 
 #include <wx/bitmap.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/gdicmn.h>
 #include <wx/hyperlink.h>
 #include <wx/image.h>
 #include <wx/mstream.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 #include <wx/generic/statbmpg.h>
 
 #ifdef __APPLE__

Source/Core/DolphinWX/AboutDolphin.h

@@ -4,12 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/gdicmn.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 class AboutDolphin : public wxDialog
 {

Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp

@@ -5,16 +5,13 @@
 #include <array>
 #include <wx/button.h>
 #include <wx/choice.h>
-#include <wx/event.h>
 #include <wx/listbox.h>
 #include <wx/panel.h>
 #include <wx/radiobox.h>
 #include <wx/radiobut.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/window.h>
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/Cheats/CheatsWindow.cpp

@@ -9,11 +9,9 @@
 #include <string>
 #include <vector>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/checklst.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/listbox.h>
 #include <wx/msgdlg.h>
 #include <wx/notebook.h>
@@ -21,11 +19,7 @@
 #include <wx/sizer.h>
 #include <wx/statbox.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/validate.h>
-#include <wx/window.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/IniFile.h"

Source/Core/DolphinWX/Cheats/CreateCodeDialog.cpp

@@ -4,12 +4,9 @@
 
 #include <wx/checkbox.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/window.h>
 
 #include "Core/ActionReplay.h"
 #include "Core/ConfigManager.h"

Source/Core/DolphinWX/Cheats/CreateCodeDialog.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <wx/dialog.h>
-#include <wx/event.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/ActionReplay.h"

Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp

@@ -7,20 +7,13 @@
 #include <vector>
 #include <SFML/Network/Http.hpp>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checklst.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/listbox.h>
 #include <wx/msgdlg.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/window.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"

Source/Core/DolphinWX/ControllerConfigDiag.cpp

@@ -5,17 +5,10 @@
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"

Source/Core/DolphinWX/ControllerConfigDiag.h

@@ -3,8 +3,6 @@
 #include <array>
 #include <map>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/windowid.h>
 
 #include "Common/SysConf.h"
 #include "Core/ConfigManager.h"

Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp

@@ -3,14 +3,9 @@
 // Refer to the license.txt file included.
 
 #include <string>
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/msgdlg.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 
 #include "Common/BreakPoints.h"

Source/Core/DolphinWX/Debugger/BreakpointDlg.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <wx/dialog.h>
-#include <wx/event.h>
 
 class CBreakPointWindow;
 class wxTextCtrl;

Source/Core/DolphinWX/Debugger/BreakpointView.cpp

@@ -5,13 +5,7 @@
 #include <cstddef>
 #include <cstdio>
 
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/gdicmn.h>
-#include <wx/listbase.h>
 #include <wx/listctrl.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/BreakPoints.h"
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/Debugger/BreakpointView.h

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

Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp

@@ -3,15 +3,9 @@
 // Refer to the license.txt file included.
 
 #include <wx/bitmap.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/listbase.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 #include <wx/aui/auibar.h>
 #include <wx/aui/framemanager.h>
 

Source/Core/DolphinWX/Debugger/BreakpointWindow.h

@@ -4,13 +4,7 @@
 
 #pragma once
 
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 #include <wx/aui/framemanager.h>
 
 class CBreakPointView;

Source/Core/DolphinWX/Debugger/CodeView.cpp

@@ -10,24 +10,14 @@
 #include <string>
 #include <vector>
 #include <wx/brush.h>
-#include <wx/chartype.h>
 #include <wx/clipbrd.h>
 #include <wx/colour.h>
-#include <wx/control.h>
 #include <wx/dataobj.h>
 #include <wx/dcclient.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/graphics.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/pen.h>
-#include <wx/setup.h>
-#include <wx/string.h>
 #include <wx/textdlg.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/DebugInterface.h"

Source/Core/DolphinWX/Debugger/CodeView.h

@@ -11,10 +11,7 @@
 #include <vector>
 
 #include <wx/control.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/graphics.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 

Source/Core/DolphinWX/Debugger/CodeWindow.cpp

@@ -6,24 +6,15 @@
 #include <string>
 #include <vector>
 #include <wx/bitmap.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/listbox.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/panel.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/textdlg.h>
 #include <wx/thread.h>
 #include <wx/toolbar.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 #include <wx/aui/auibar.h>
 
 #include "Common/BreakPoints.h"

Source/Core/DolphinWX/Debugger/CodeWindow.h

@@ -5,13 +5,7 @@
 #pragma once
 
 #include <wx/bitmap.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 #include <wx/aui/framemanager.h>
 
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp

@@ -7,21 +7,14 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/font.h>
 #include <wx/fontdata.h>
 #include <wx/fontdlg.h>
 #include <wx/listbox.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/mimetype.h>
-#include <wx/string.h>
 #include <wx/textdlg.h>
-#include <wx/translation.h>
-#include <wx/utils.h>
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp

@@ -4,18 +4,11 @@
 
 #include <cstdio>
 #include <wx/artprov.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/listbox.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/thread.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 #include <wx/aui/auibar.h>
 #include <wx/aui/auibook.h>
 #include <wx/aui/framemanager.h>

Source/Core/DolphinWX/Debugger/DSPDebugWindow.h

@@ -4,10 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/panel.h>
-#include <wx/windowid.h>
 #include <wx/aui/framemanager.h>
 
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp

@@ -2,13 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/chartype.h>
 #include <wx/colour.h>
-#include <wx/defs.h>
-#include <wx/gdicmn.h>
 #include <wx/grid.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/DSP/DSPCore.h"

Source/Core/DolphinWX/Debugger/DSPRegisterView.h

@@ -5,10 +5,7 @@
 #pragma once
 
 #include <cstring>
-#include <wx/defs.h>
 #include <wx/grid.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 

Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp

@@ -5,19 +5,11 @@
 #include <cstddef>
 #include <string>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/choice.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/msgdlg.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/validate.h>
-#include <wx/windowid.h>
 
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"

Source/Core/DolphinWX/Debugger/DebuggerPanel.h

@@ -4,14 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
-
 #include "VideoCommon/Debugger.h"
 
 class wxButton;

Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp

@@ -2,10 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/font.h>
-
 #include "DolphinWX/Debugger/DebuggerUIUtil.h"
 
 // The default font

Source/Core/DolphinWX/Debugger/JitWindow.cpp

@@ -16,19 +16,10 @@
 #endif
 
 #include <wx/button.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/listbase.h>
 #include <wx/listctrl.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"

Source/Core/DolphinWX/Debugger/JitWindow.h

@@ -8,14 +8,8 @@
 #include <memory>
 #include <vector>
 
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/listctrl.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 

Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp

@@ -3,17 +3,11 @@
 // Refer to the license.txt file included.
 
 #include <string>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
 
 #include "Common/BreakPoints.h"
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/Debugger/MemoryCheckDlg.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <wx/dialog.h>
-#include <wx/event.h>
 
 class CBreakPointWindow;
 class wxCheckBox;

Source/Core/DolphinWX/Debugger/MemoryView.cpp

@@ -5,21 +5,14 @@
 #include <cmath>
 #include <string>
 #include <wx/brush.h>
-#include <wx/chartype.h>
 #include <wx/clipbrd.h>
 #include <wx/colour.h>
 #include <wx/control.h>
 #include <wx/dataobj.h>
 #include <wx/dcclient.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/font.h>
-#include <wx/gdicmn.h>
 #include <wx/menu.h>
 #include <wx/pen.h>
-#include <wx/setup.h>
-#include <wx/string.h>
-#include <wx/window.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/DebugInterface.h"

Source/Core/DolphinWX/Debugger/MemoryView.h

@@ -5,8 +5,6 @@
 #pragma once
 
 #include <wx/control.h>
-#include <wx/event.h>
-
 #include "Common/CommonTypes.h"
 
 class DebugInterface;

Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

@@ -8,21 +8,12 @@
 #include <string>
 #include <vector>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/listbox.h>
 #include <wx/msgdlg.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
-#include <wx/wxcrtvararg.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"

Source/Core/DolphinWX/Debugger/MemoryWindow.h

@@ -4,14 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
-
 #include "Common/CommonTypes.h"
 
 class CMemoryView;

Source/Core/DolphinWX/Debugger/RegisterView.cpp

@@ -2,13 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/chartype.h>
 #include <wx/colour.h>
-#include <wx/defs.h>
 #include <wx/grid.h>
 #include <wx/menu.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"

Source/Core/DolphinWX/Debugger/RegisterView.h

@@ -5,10 +5,7 @@
 #pragma once
 
 #include <cstring>
-#include <wx/defs.h>
 #include <wx/grid.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 

Source/Core/DolphinWX/Debugger/RegisterWindow.cpp

@@ -3,13 +3,8 @@
 // Refer to the license.txt file included.
 
 #include <cstddef>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Core/PowerPC/PowerPC.h"
 #include "DolphinWX/Debugger/RegisterView.h"

Source/Core/DolphinWX/Debugger/RegisterWindow.h

@@ -4,13 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 class CRegisterView;
 

Source/Core/DolphinWX/Debugger/WatchView.cpp

@@ -2,13 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/chartype.h>
 #include <wx/colour.h>
-#include <wx/defs.h>
 #include <wx/grid.h>
 #include <wx/menu.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/GekkoDisassembler.h"
 #include "Core/HW/Memmap.h"

Source/Core/DolphinWX/Debugger/WatchView.h

@@ -6,10 +6,7 @@
 
 #include <array>
 #include <string>
-#include <wx/defs.h>
 #include <wx/grid.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 

Source/Core/DolphinWX/Debugger/WatchWindow.cpp

@@ -5,12 +5,7 @@
 #include <cstddef>
 
 #include <wx/bitmap.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/windowid.h>
 #include <wx/aui/auibar.h>
 
 #include "Common/FileUtil.h"

Source/Core/DolphinWX/Debugger/WatchWindow.h

@@ -4,13 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 #include <wx/aui/framemanager.h>
 
 class CWatchView;

Source/Core/DolphinWX/FifoPlayerDlg.cpp

@@ -8,17 +8,12 @@
 #include <string>
 #include <vector>
 
-#include <wx/accel.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/clipbrd.h>
 #include <wx/dataobj.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/filedlg.h>
-#include <wx/gdicmn.h>
 #include <wx/listbox.h>
 #include <wx/msgdlg.h>
 #include <wx/notebook.h>
@@ -28,10 +23,7 @@
 #include <wx/spinctrl.h>
 #include <wx/statbox.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/utils.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/FifoPlayer/FifoDataFile.h"

Source/Core/DolphinWX/FifoPlayerDlg.h

@@ -6,9 +6,7 @@
 
 #include <cstddef>
 #include <vector>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/string.h>
 
 #include "Common/CommonTypes.h"
 

Source/Core/DolphinWX/Frame.cpp

@@ -11,28 +11,17 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/filename.h>
 #include <wx/frame.h>
-#include <wx/gdicmn.h>
 #include <wx/icon.h>
 #include <wx/listbase.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
-#include <wx/mousestate.h>
 #include <wx/msgdlg.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/statusbr.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/thread.h>
-#include <wx/toplevel.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 #include <wx/aui/auibook.h>
 #include <wx/aui/framemanager.h>
 

Source/Core/DolphinWX/Frame.h

@@ -9,18 +9,10 @@
 #include <string>
 #include <vector>
 #include <wx/bitmap.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/frame.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
-#include <wx/mstream.h>
 #include <wx/panel.h>
-#include <wx/string.h>
 #include <wx/timer.h>
-#include <wx/toplevel.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/Event.h"

Source/Core/DolphinWX/FrameAui.cpp

@@ -5,27 +5,16 @@
 #include <cstddef>
 #include <string>
 #include <vector>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/dynarray.h>
-#include <wx/event.h>
 #include <wx/frame.h>
-#include <wx/gdicmn.h>
 #include <wx/list.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/msgdlg.h>
-#include <wx/object.h>
 #include <wx/panel.h>
 #include <wx/rtti.h>
 #include <wx/sizer.h>
 #include <wx/statusbr.h>
-#include <wx/string.h>
 #include <wx/textdlg.h>
 #include <wx/toplevel.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 #include <wx/aui/auibar.h>
 #include <wx/aui/auibook.h>
 #include <wx/aui/framemanager.h>

Source/Core/DolphinWX/FrameTools.cpp

@@ -9,26 +9,16 @@
 #include <vector>
 #include <wx/app.h>
 #include <wx/bitmap.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/filefn.h>
-#include <wx/gdicmn.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/msgdlg.h>
 #include <wx/panel.h>
 #include <wx/progdlg.h>
 #include <wx/statusbr.h>
-#include <wx/strconv.h>
-#include <wx/string.h>
 #include <wx/thread.h>
 #include <wx/toolbar.h>
 #include <wx/toplevel.h>
-#include <wx/translation.h>
-#include <wx/utils.h>
-#include <wx/window.h>
 #include <wx/aui/framemanager.h>
 
 #ifdef __APPLE__

Source/Core/DolphinWX/GameListCtrl.cpp

@@ -10,34 +10,20 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include <wx/app.h>
 #include <wx/bitmap.h>
 #include <wx/buffer.h>
-#include <wx/chartype.h>
 #include <wx/colour.h>
-#include <wx/defs.h>
 #include <wx/dirdlg.h>
-#include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/filefn.h>
 #include <wx/filename.h>
-#include <wx/gdicmn.h>
 #include <wx/imaglist.h>
-#include <wx/listbase.h>
 #include <wx/listctrl.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/msgdlg.h>
 #include <wx/progdlg.h>
 #include <wx/settings.h>
-#include <wx/string.h>
 #include <wx/tipwin.h>
-#include <wx/translation.h>
-#include <wx/unichar.h>
-#include <wx/utils.h>
-#include <wx/version.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 
 #include "Common/CDUtils.h"
 #include "Common/CommonPaths.h"

Source/Core/DolphinWX/GameListCtrl.h

@@ -8,12 +8,8 @@
 #include <string>
 #include <vector>
 
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/listctrl.h>
-#include <wx/string.h>
 #include <wx/tipwin.h>
-#include <wx/windowid.h>
 
 #include "DolphinWX/ISOFile.h"
 

Source/Core/DolphinWX/HotkeyDlg.cpp

@@ -3,24 +3,15 @@
 // Refer to the license.txt file included.
 
 #include <cstddef>
-#include <wx/app.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/font.h>
 #include <wx/gbsizer.h>
-#include <wx/gdicmn.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
-#include <wx/setup.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/timer.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Core/ConfigManager.h"
 #include "Core/CoreParameter.h"

Source/Core/DolphinWX/HotkeyDlg.h

@@ -4,14 +4,8 @@
 
 #pragma once
 
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/string.h>
 #include <wx/timer.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Core/CoreParameter.h"
 

Source/Core/DolphinWX/ISOFile.cpp

@@ -12,10 +12,8 @@
 #include <wx/app.h>
 #include <wx/bitmap.h>
 #include <wx/filefn.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
-#include <wx/string.h>
-#include <wx/window.h>
+#include <wx/toplevel.h>
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"

Source/Core/DolphinWX/ISOProperties.cpp

@@ -16,21 +16,15 @@
 #include <type_traits>
 #include <vector>
 #include <polarssl/md5.h>
-#include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/checklst.h>
 #include <wx/choice.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
 #include <wx/dirdlg.h>
-#include <wx/dynarray.h>
-#include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/gbsizer.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/imaglist.h>
 #include <wx/itemid.h>
@@ -45,15 +39,12 @@
 #include <wx/spinctrl.h>
 #include <wx/statbmp.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/thread.h>
-#include <wx/translation.h>
 #include <wx/treebase.h>
 #include <wx/treectrl.h>
 #include <wx/utils.h>
 #include <wx/validate.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/ISOProperties.h

@@ -8,15 +8,8 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <wx/arrstr.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/string.h>
-#include <wx/toplevel.h>
-#include <wx/translation.h>
 #include <wx/treebase.h>
-#include <wx/windowid.h>
 
 #include "Common/IniFile.h"
 #include "Core/ActionReplay.h"

Source/Core/DolphinWX/InputConfigDiag.cpp

@@ -10,20 +10,15 @@
 #include <string>
 #include <vector>
 #include <wx/app.h>
-#include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/combobox.h>
 #include <wx/control.h>
 #include <wx/dcmemory.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/font.h>
-#include <wx/gdicmn.h>
 #include <wx/listbox.h>
 #include <wx/msgdlg.h>
 #include <wx/notebook.h>
@@ -33,12 +28,8 @@
 #include <wx/spinctrl.h>
 #include <wx/statbmp.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
-#include <wx/toplevel.h>
-#include <wx/translation.h>
-#include <wx/unichar.h>
 
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"

Source/Core/DolphinWX/InputConfigDiag.h

@@ -16,15 +16,11 @@
 #include <string>
 #include <vector>
 #include <wx/button.h>
-#include <wx/control.h>
 #include <wx/dialog.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
 #include <wx/spinctrl.h>
-#include <wx/string.h>
 #include <wx/timer.h>
-#include <wx/translation.h>
 
 #include "InputCommon/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"

Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp

@@ -9,16 +9,12 @@
 #include <vector>
 #include <wx/bitmap.h>
 #include <wx/brush.h>
-#include <wx/chartype.h>
 #include <wx/colour.h>
 #include <wx/dcmemory.h>
-#include <wx/defs.h>
 #include <wx/font.h>
-#include <wx/gdicmn.h>
 #include <wx/notebook.h>
 #include <wx/pen.h>
 #include <wx/statbmp.h>
-#include <wx/string.h>
 
 #include "DolphinWX/InputConfigDiag.h"
 #include "DolphinWX/WxUtils.h"

Source/Core/DolphinWX/LogConfigWindow.cpp

@@ -3,20 +3,13 @@
 // Refer to the license.txt file included.
 
 #include <vector>
-#include <wx/anybutton.h>
-#include <wx/arrstr.h>
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/checklst.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
 #include <wx/radiobox.h>
 #include <wx/sizer.h>
-#include <wx/translation.h>
 #include <wx/validate.h>
-#include <wx/windowid.h>
 
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"

Source/Core/DolphinWX/LogConfigWindow.h

@@ -4,9 +4,7 @@
 
 #pragma once
 
-#include <wx/defs.h>
 #include <wx/panel.h>
-#include <wx/windowid.h>
 
 class LogManager;
 class CLogWindow;

Source/Core/DolphinWX/LogWindow.cpp

@@ -7,25 +7,16 @@
 #include <queue>
 #include <utility>
 #include <vector>
-#include <wx/anybutton.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/colour.h>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/font.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
 #include <wx/timer.h>
-#include <wx/translation.h>
 #include <wx/validate.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 #include <wx/aui/framemanager.h>
 
 #include "Common/CommonTypes.h"

Source/Core/DolphinWX/LogWindow.h

@@ -8,15 +8,9 @@
 #include <queue>
 #include <utility>
 #include <vector>
-#include <wx/defs.h>
-#include <wx/event.h>
 #include <wx/font.h>
-#include <wx/gdicmn.h>
 #include <wx/panel.h>
-#include <wx/string.h>
 #include <wx/timer.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/LogManager.h"

Source/Core/DolphinWX/Main.cpp

@@ -9,21 +9,14 @@
 #include <utility>
 #include <wx/app.h>
 #include <wx/buffer.h>
-#include <wx/chartype.h>
 #include <wx/cmdline.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/imagpng.h>
 #include <wx/intl.h>
 #include <wx/language.h>
 #include <wx/msgdlg.h>
-#include <wx/setup.h>
-#include <wx/string.h>
 #include <wx/thread.h>
 #include <wx/timer.h>
-#include <wx/translation.h>
 #include <wx/utils.h>
 #include <wx/window.h>
 

Source/Core/DolphinWX/Main.h

@@ -5,10 +5,6 @@
 #pragma once
 
 #include <wx/app.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
-#include <wx/event.h>
-#include <wx/string.h>
 
 class CFrame;
 class wxLocale;

Source/Core/DolphinWX/MemcardManager.cpp

@@ -6,26 +6,17 @@
 #include <string>
 #include <wx/bitmap.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/filedlg.h>
 #include <wx/filepicker.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/imaglist.h>
 #include <wx/listbase.h>
 #include <wx/menu.h>
-#include <wx/menuitem.h>
 #include <wx/msgdlg.h>
 #include <wx/mstream.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"

Source/Core/DolphinWX/MemcardManager.h

@@ -5,16 +5,8 @@
 #pragma once
 
 #include <string>
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/listctrl.h>
-#include <wx/string.h>
-#include <wx/toplevel.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/IniFile.h"

Source/Core/DolphinWX/PatchAddEdit.cpp

@@ -6,22 +6,15 @@
 #include <vector>
 #include <wx/arrstr.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/gbsizer.h>
-#include <wx/gdicmn.h>
 #include <wx/msgdlg.h>
 #include <wx/radiobox.h>
 #include <wx/sizer.h>
 #include <wx/spinbutt.h>
 #include <wx/statbox.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/PatchEngine.h"

Source/Core/DolphinWX/PatchAddEdit.h

@@ -6,11 +6,6 @@
 
 #include <vector>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Core/PatchEngine.h"
 

Source/Core/DolphinWX/PostProcessingConfigDiag.cpp

@@ -6,6 +6,7 @@
 #include <unordered_map>
 
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
 #include <wx/sizer.h>

Source/Core/DolphinWX/PostProcessingConfigDiag.h

@@ -8,16 +8,16 @@
 #include <string>
 #include <vector>
 
-#include <wx/button.h>
-#include <wx/checkbox.h>
 #include <wx/dialog.h>
-#include <wx/sizer.h>
 #include <wx/slider.h>
-#include <wx/stattext.h>
 #include <wx/textctrl.h>
 
 #include "VideoCommon/PostProcessing.h"
 
+class wxButton;
+class wxCheckBox;
+class wxFlexGridSizer;
+
 class PostProcessingConfigDiag : public wxDialog
 {
 public:

Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp

@@ -9,10 +9,10 @@
 #include <wx/combobox.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
+#include <wx/sizer.h>
 #include <wx/spinctrl.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
-#include <wx/wx.h>
 
 #include "Common/FileUtil.h"
 #include "Core/Core.h"

Source/Core/DolphinWX/SoftwareVideoConfigDialog.h

@@ -9,15 +9,8 @@
 
 #include <string>
 #include <vector>
-#include <wx/button.h>
-#include <wx/checkbox.h>
-#include <wx/combobox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/wx.h>
+
+#include <wx/dialog.h>
 
 #include "Core/ConfigManager.h"
 #include "VideoBackends/Software/SWVideoConfig.h"

Source/Core/DolphinWX/TASInputDlg.cpp

@@ -4,23 +4,13 @@
 
 #include <cstddef>
 #include <wx/bitmap.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/dcmemory.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/layout.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/statbmp.h>
-#include <wx/string.h>
 #include <wx/textctrl.h>
-#include <wx/translation.h>
-#include <wx/validate.h>
-#include <wx/window.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/Movie.h"

Source/Core/DolphinWX/TASInputDlg.h

@@ -7,13 +7,7 @@
 #include <wx/bitmap.h>
 #include <wx/dcmemory.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/sizer.h>
-#include <wx/string.h>
-#include <wx/toplevel.h>
-#include <wx/translation.h>
-#include <wx/windowid.h>
 
 #include "Common/CommonTypes.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"

Source/Core/DolphinWX/VideoConfigDiag.cpp

@@ -6,25 +6,17 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <wx/arrstr.h>
 #include <wx/button.h>
-#include <wx/chartype.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/control.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
-#include <wx/gdicmn.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
 #include <wx/radiobut.h>
 #include <wx/sizer.h>
 #include <wx/slider.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/window.h>
 
 #include "Common/FileUtil.h"
 #include "Common/SysConf.h"

Source/Core/DolphinWX/VideoConfigDiag.h

@@ -11,16 +11,11 @@
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
-#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/event.h>
 #include <wx/msgdlg.h>
 #include <wx/radiobut.h>
 #include <wx/spinctrl.h>
 #include <wx/stattext.h>
-#include <wx/string.h>
-#include <wx/translation.h>
-#include <wx/window.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/SysConf.h"

Source/Core/DolphinWX/WxUtils.cpp

@@ -4,12 +4,9 @@
 
 #include <string>
 #include <wx/bitmap.h>
-#include <wx/chartype.h>
-#include <wx/gdicmn.h>
 #include <wx/image.h>
 #include <wx/msgdlg.h>
 #include <wx/mstream.h>
-#include <wx/string.h>
 #include <wx/toolbar.h>
 #include <wx/utils.h>