Make DolphinWX/ mostly IWYU clean.

Source/Core/DolphinWX/ARCodeAddEdit.cpp

@@ -2,10 +2,33 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cstddef>
+#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/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/Common.h"
+#include "Common/StringUtil.h"
+#include "Core/ActionReplay.h"
 #include "Core/ARDecrypt.h"
 #include "DolphinWX/ARCodeAddEdit.h"
 #include "DolphinWX/WxUtils.h"
 
+class wxWindow;
+
 extern std::vector<ActionReplay::ARCode> arCodes;
 
 BEGIN_EVENT_TABLE(CARCodeAddEdit, wxDialog)

Source/Core/DolphinWX/ARCodeAddEdit.h

@@ -4,10 +4,19 @@
 
 #pragma once
 
-#include <wx/spinctrl.h>
-#include <wx/wx.h>
+#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 "DolphinWX/ISOProperties.h"
+class wxSpinButton;
+class wxSpinEvent;
+class wxTextCtrl;
+class wxWindow;
+
+namespace ActionReplay { struct ARCode; }
 
 class CARCodeAddEdit : public wxDialog
 {

Source/Core/DolphinWX/AboutDolphin.cpp

@@ -2,11 +2,25 @@
 // Licensed under GPLv2
 // 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/image.h>
+#include <wx/mstream.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/translation.h>
+#include <wx/windowid.h>
+
 #include "Common/Common.h"
 #include "DolphinWX/AboutDolphin.h"
-#include "DolphinWX/WxUtils.h"
 #include "DolphinWX/resources/dolphin_logo.cpp"
 
+class wxWindow;
+
 AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
 		const wxString &title, const wxPoint &position,
 		const wxSize& size, long style)

Source/Core/DolphinWX/AboutDolphin.h

@@ -4,13 +4,14 @@
 
 #pragma once
 
-#include <wx/button.h>
+#include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/mstream.h>
-#include <wx/statbmp.h>
-#include <wx/statbox.h>
-#include <wx/stattext.h>
-#include <wx/wx.h>
+#include <wx/gdicmn.h>
+#include <wx/string.h>
+#include <wx/translation.h>
+#include <wx/windowid.h>
+
+class wxWindow;
 
 class AboutDolphin : public wxDialog
 {

Source/Core/DolphinWX/Android/ButtonManager.h

@@ -6,8 +6,6 @@
 
 #include <map>
 #include <string>
-#include "Common/CommonPaths.h"
-#include "VideoCommon/VideoBackendBase.h"
 
 namespace ButtonManager
 {

Source/Core/DolphinWX/CheatsWindow.cpp

@@ -2,18 +2,50 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "Common/CommonPaths.h"
+#include <climits>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+#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/event.h>
+#include <wx/gdicmn.h>
+#include <wx/listbox.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/radiobut.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/toplevel.h>
+#include <wx/translation.h>
+#include <wx/validate.h>
+
+#include "Common/Common.h"
+#include "Common/IniFile.h"
 #include "Core/ActionReplay.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/VolumeHandler.h"
+#include "Core/CoreParameter.h"
+#include "Core/GeckoCode.h"
+#include "Core/GeckoCodeConfig.h"
 #include "Core/HW/Memmap.h"
 #include "DolphinWX/CheatsWindow.h"
 #include "DolphinWX/Frame.h"
-#include "DolphinWX/Globals.h"
+#include "DolphinWX/GeckoCodeDiag.h"
 #include "DolphinWX/ISOProperties.h"
 #include "DolphinWX/WxUtils.h"
 
+class wxWindow;
 
 #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY  256
 extern std::vector<ActionReplay::ARCode> arCodes;

Source/Core/DolphinWX/CheatsWindow.h

@@ -4,25 +4,32 @@
 
 #pragma once
 
+#include <cstddef>
 #include <string>
 #include <vector>
-#include <wx/colour.h>
-#include <wx/filepicker.h>
-#include <wx/gbsizer.h>
-#include <wx/imaglist.h>
-#include <wx/listbox.h>
-#include <wx/mimetype.h>
-#include <wx/notebook.h>
-#include <wx/sizer.h>
-#include <wx/statbmp.h>
-#include <wx/textctrl.h>
-#include <wx/treectrl.h>
-#include <wx/wx.h>
+#include <wx/arrstr.h>
+#include <wx/dialog.h>
+#include <wx/panel.h>
 
+#include "Common/CommonTypes.h"
 #include "Common/IniFile.h"
-#include "Core/ActionReplay.h"
-#include "DiscIO/Filesystem.h"
-#include "DolphinWX/GeckoCodeDiag.h"
+
+class wxButton;
+class wxCheckBox;
+class wxCheckListBox;
+class wxChoice;
+class wxCloseEvent;
+class wxCommandEvent;
+class wxEvent;
+class wxListBox;
+class wxNotebook;
+class wxRadioButton;
+class wxStaticBox;
+class wxStaticText;
+class wxTextCtrl;
+class wxWindow;
+
+namespace Gecko { class CodeConfigPanel; }
 
 class CreateCodeDialog : public wxDialog
 {

Source/Core/DolphinWX/ConfigMain.cpp

@@ -6,7 +6,22 @@
 #include <functional>
 #include <string>
 #include <vector>
+
+#include <wx/checkbox.h>
+#include <wx/choice.h>
+#include <wx/filepicker.h>
+#include <wx/gbsizer.h>
+#include <wx/listbox.h>
+#include <wx/menu.h>
+#include <wx/msgdlg.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/radiobox.h>
+#include <wx/sizer.h>
+#include <wx/slider.h>
 #include <wx/spinbutt.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
 
 #include "Common/Common.h"
 #include "Common/CommonPaths.h"
@@ -15,6 +30,7 @@
 
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+#include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
 #include "Core/HW/EXI.h"
 #include "Core/HW/GCMemcard.h"
@@ -31,6 +47,7 @@
 #include "DolphinWX/HotkeyDlg.h"
 #include "DolphinWX/Main.h"
 #include "DolphinWX/WxUtils.h"
+#include "DolphinWX/Debugger/CodeWindow.h"
 
 #include "VideoCommon/VideoBackendBase.h"
 

Source/Core/DolphinWX/ConfigMain.h

@@ -4,18 +4,42 @@
 
 #pragma once
 
-#include <wx/filepicker.h>
-#include <wx/gbsizer.h>
-#include <wx/notebook.h>
-#include <wx/spinbutt.h>
-#include <wx/spinctrl.h>
-#include <wx/wx.h>
+#include <cstdio>
+#include <string>
 
-#include "Core/ConfigManager.h"
+#include <wx/arrstr.h>
+#include <wx/defs.h>
+#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 "Common/CommonTypes.h"
 #if defined(HAVE_XRANDR) && HAVE_XRANDR
 #include "DolphinWX/X11Utils.h"
 #endif
 
+class wxBoxSizer;
+class wxButton;
+class wxCheckBox;
+class wxChoice;
+class wxDirPickerCtrl;
+class wxFileDirPickerEvent;
+class wxFilePickerCtrl;
+class wxGridBagSizer;
+class wxListBox;
+class wxNotebook;
+class wxPanel;
+class wxRadioBox;
+class wxSlider;
+class wxSpinCtrl;
+class wxSpinEvent;
+class wxStaticBoxSizer;
+class wxStaticText;
+class wxWindow;
+
 class CConfigMain : public wxDialog
 {
 public:

Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp

@@ -2,6 +2,18 @@
 // Licensed under GPLv2
 // 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/sizer.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+
+#include "Common/BreakPoints.h"
+#include "Common/Common.h"
 #include "Common/StringUtil.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "DolphinWX/WxUtils.h"

Source/Core/DolphinWX/Debugger/BreakpointDlg.h

@@ -4,9 +4,11 @@
 
 #pragma once
 
-#include <wx/wx.h>
+#include <wx/dialog.h>
+#include <wx/event.h>
 
 class CBreakPointWindow;
+class wxTextCtrl;
 
 class BreakPointDlg : public wxDialog
 {

Source/Core/DolphinWX/Debugger/BreakpointView.cpp

@@ -2,16 +2,28 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/wx.h>
+#include <cstddef>
+#include <cstdio>
 
-#include "Core/Debugger/Debugger_SymbolMap.h"
-#include "Core/HW/Memmap.h"
+#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"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "DolphinWX/WxUtils.h"
 #include "DolphinWX/Debugger/BreakpointView.h"
 #include "DolphinWX/Debugger/DebuggerUIUtil.h"
 
+class wxWindow;
+struct Symbol;
+
 CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id)
 	: wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize,
 			wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT | wxLC_SINGLE_SEL | wxLC_SORT_ASCENDING)

Source/Core/DolphinWX/Debugger/BreakpointView.h

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

Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp

@@ -2,9 +2,26 @@
 // Licensed under GPLv2
 // 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>
+
+#include "Common/BreakPoints.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
+#include "Common/IniFile.h"
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "DolphinWX/WxUtils.h"
 #include "DolphinWX/Debugger/BreakpointDlg.h"
 #include "DolphinWX/Debugger/BreakpointView.h"
 #include "DolphinWX/Debugger/BreakpointWindow.h"
@@ -17,6 +34,8 @@ extern "C" {
 #include "DolphinWX/resources/toolbar_debugger_delete.c"
 }
 
+class wxWindow;
+
 class CBreakPointBar : public wxAuiToolBar
 {
 public:

Source/Core/DolphinWX/Debugger/BreakpointWindow.h

@@ -4,12 +4,19 @@
 
 #pragma once
 
-#include <wx/listctrl.h>
-#include <wx/wx.h>
-#include <wx/aui/aui.h>
+#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;
 class CCodeWindow;
+class wxListEvent;
+class wxWindow;
 
 class CBreakPointWindow : public wxPanel
 {

Source/Core/DolphinWX/Debugger/CodeView.cpp

@@ -2,9 +2,29 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#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/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/Common.h"
 #include "Common/DebugInterface.h"

Source/Core/DolphinWX/Debugger/CodeView.h

@@ -9,7 +9,10 @@
 
 #include <vector>
 
-#include <wx/wx.h>
+#include <wx/control.h>
+#include <wx/defs.h>
+#include <wx/event.h>
+#include <wx/windowid.h>
 
 #include "Common/Common.h"
 
@@ -17,6 +20,8 @@ DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1);
 
 class DebugInterface;
 class SymbolDB;
+class wxPaintDC;
+class wxWindow;
 
 class CCodeView : public wxControl
 {

Source/Core/DolphinWX/Debugger/CodeWindow.cpp

@@ -2,41 +2,62 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/wx.h>
+#include <cstdio>
+#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/sizer.h>
+#include <wx/string.h>
+#include <wx/textctrl.h>
+#include <wx/textdlg.h>
+#include <wx/thread.h>
+#include <wx/translation.h>
+#include <wx/window.h>
+#include <wx/windowid.h>
+#include <wx/aui/auibar.h>
 
+#include "Common/BreakPoints.h"
 #include "Common/Common.h"
-#include "Common/FileUtil.h"
-#include "Common/LogManager.h"
-#include "Core/ConfigManager.h"
+#include "Common/StringUtil.h"
+#include "Common/SymbolDB.h"
 #include "Core/Core.h"
+#include "Core/CoreParameter.h"
 #include "Core/Host.h"
-#include "Core/Boot/Boot.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/Debugger/PPCDebugInterface.h"
-#include "Core/HLE/HLE.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/Memmap.h"
+#include "Core/PowerPC/Gekko.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/Frame.h"
+#include "DolphinWX/Globals.h"
 #include "DolphinWX/WxUtils.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/DebuggerUIUtil.h"
 #include "DolphinWX/Debugger/RegisterWindow.h"
 
-
 extern "C"  // Bitmaps
 {
 	#include "DolphinWX/resources/toolbar_add_memorycheck.c" // NOLINT
 	#include "DolphinWX/resources/toolbar_add_breakpoint.c" // NOLINT
 }
 
+class DebugInterface;
+
 // -------
 // Main
 

Source/Core/DolphinWX/Debugger/CodeWindow.h

@@ -4,14 +4,17 @@
 
 #pragma once
 
-#include <wx/artprov.h>
-#include <wx/dialog.h>
-#include <wx/listbox.h>
-#include <wx/textctrl.h>
+#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 "Common/CommonTypes.h"
 #include "Common/Thread.h"
-#include "Core/CoreParameter.h"
-#include "DolphinWX/Frame.h"
 #include "DolphinWX/Globals.h"
 
 class CFrame;
@@ -22,6 +25,12 @@ class CJitWindow;
 class CCodeView;
 class DSPDebuggerLLE;
 class GFXDebuggerPanel;
+struct SCoreStartupParameter;
+
+class wxAuiToolBar;
+class wxListBox;
+class wxMenu;
+class wxMenuBar;
 
 class CCodeWindow
 	: public wxPanel

Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp

@@ -2,34 +2,48 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cstddef>
+#include <istream>
+#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/Common.h"
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
-#include "Common/LogManager.h"
+#include "Common/IniFile.h"
+#include "Common/SymbolDB.h"
 
-#include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/Boot/Boot.h"
-#include "Core/Debugger/Debugger_SymbolMap.h"
-#include "Core/Debugger/PPCDebugInterface.h"
 #include "Core/HLE/HLE.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 "DolphinWX/Frame.h"
+#include "DolphinWX/Globals.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"