diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.h b/Source/Core/DolphinWX/ARCodeAddEdit.h
index 9baeab575d..1a2dec682e 100644
--- a/Source/Core/DolphinWX/ARCodeAddEdit.h
+++ b/Source/Core/DolphinWX/ARCodeAddEdit.h
@@ -14,7 +14,6 @@
 class wxSpinButton;
 class wxSpinEvent;
 class wxTextCtrl;
-class wxWindow;
 
 namespace ActionReplay { struct ARCode; }
 
diff --git a/Source/Core/DolphinWX/AboutDolphin.h b/Source/Core/DolphinWX/AboutDolphin.h
index 96b4ed782d..3c3ba07b20 100644
--- a/Source/Core/DolphinWX/AboutDolphin.h
+++ b/Source/Core/DolphinWX/AboutDolphin.h
@@ -11,8 +11,6 @@
 #include <wx/translation.h>
 #include <wx/windowid.h>
 
-class wxWindow;
-
 class AboutDolphin : public wxDialog
 {
 public:
diff --git a/Source/Core/DolphinWX/Cheats/CheatSearchTab.h b/Source/Core/DolphinWX/Cheats/CheatSearchTab.h
index 45731b7fa6..c483e1fb38 100644
--- a/Source/Core/DolphinWX/Cheats/CheatSearchTab.h
+++ b/Source/Core/DolphinWX/Cheats/CheatSearchTab.h
@@ -9,14 +9,12 @@
 
 class wxButton;
 class wxChoice;
-class wxCommandEvent;
 class wxFocusEvent;
 class wxListBox;
 class wxRadioBox;
 class wxRadioButton;
 class wxStaticText;
 class wxTextCtrl;
-class wxWindow;
 
 class CheatSearchTab final : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/Cheats/CheatsWindow.h b/Source/Core/DolphinWX/Cheats/CheatsWindow.h
index 2a30897cb6..c312c4772a 100644
--- a/Source/Core/DolphinWX/Cheats/CheatsWindow.h
+++ b/Source/Core/DolphinWX/Cheats/CheatsWindow.h
@@ -18,13 +18,11 @@ class wxButton;
 class wxCheckBox;
 class wxCheckListBox;
 class wxCloseEvent;
-class wxCommandEvent;
 class wxListBox;
 class wxNotebook;
 class wxStaticBox;
 class wxStaticText;
 class wxTextCtrl;
-class wxWindow;
 
 namespace Gecko
 {
diff --git a/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h b/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h
index c0ece93e11..d6eb7f36d4 100644
--- a/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h
+++ b/Source/Core/DolphinWX/Cheats/CreateCodeDialog.h
@@ -12,7 +12,6 @@
 
 class wxCheckBox;
 class wxTextCtrl;
-class wxWindow;
 
 wxDECLARE_EVENT(UPDATE_CHEAT_LIST_EVENT, wxCommandEvent);
 
diff --git a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h
index eb569e7455..10d06a8fc4 100644
--- a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h
+++ b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.h
@@ -13,11 +13,9 @@
 class IniFile;
 class wxButton;
 class wxCheckListBox;
-class wxCommandEvent;
 class wxListBox;
 class wxStaticText;
 class wxTextCtrl;
-class wxWindow;
 
 namespace Gecko
 {
diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
index e59a1b84a6..0b9acbca39 100644
--- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
+++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h
@@ -7,7 +7,6 @@
 #include <wx/panel.h>
 
 class wxCheckBox;
-class wxCommandEvent;
 class wxSlider;
 class wxStaticText;
 
diff --git a/Source/Core/DolphinWX/Config/AudioConfigPane.h b/Source/Core/DolphinWX/Config/AudioConfigPane.h
index cb5171dbf5..4d89f34695 100644
--- a/Source/Core/DolphinWX/Config/AudioConfigPane.h
+++ b/Source/Core/DolphinWX/Config/AudioConfigPane.h
@@ -10,7 +10,6 @@
 
 class wxCheckBox;
 class wxChoice;
-class wxCommandEvent;
 class wxRadioBox;
 class wxSlider;
 class wxSpinCtrl;
diff --git a/Source/Core/DolphinWX/Config/ConfigMain.h b/Source/Core/DolphinWX/Config/ConfigMain.h
index 7cc22584df..a5722037cf 100644
--- a/Source/Core/DolphinWX/Config/ConfigMain.h
+++ b/Source/Core/DolphinWX/Config/ConfigMain.h
@@ -9,7 +9,6 @@
 
 class wxNotebook;
 class wxPanel;
-class wxWindow;
 
 wxDECLARE_EVENT(wxDOLPHIN_CFG_REFRESH_LIST, wxCommandEvent);
 
diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
index 346cc01639..73be1b76db 100644
--- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
+++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.h
@@ -8,7 +8,6 @@
 #include <wx/panel.h>
 
 class wxButton;
-class wxCommandEvent;
 class wxCheckBox;
 class wxChoice;
 class wxString;
diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.h b/Source/Core/DolphinWX/Config/GeneralConfigPane.h
index ca8f267251..87929c9b30 100644
--- a/Source/Core/DolphinWX/Config/GeneralConfigPane.h
+++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.h
@@ -8,7 +8,6 @@
 #include <wx/panel.h>
 
 class wxCheckBox;
-class wxCommandEvent;
 class wxChoice;
 class wxRadioBox;
 
diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.h b/Source/Core/DolphinWX/Config/InterfaceConfigPane.h
index 5dd35638ef..4ae141fa62 100644
--- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.h
+++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.h
@@ -10,7 +10,6 @@
 class wxButton;
 class wxCheckBox;
 class wxChoice;
-class wxCommandEvent;
 
 class InterfaceConfigPane final : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.h b/Source/Core/DolphinWX/Config/PathConfigPane.h
index 596733a5f7..f168083d82 100644
--- a/Source/Core/DolphinWX/Config/PathConfigPane.h
+++ b/Source/Core/DolphinWX/Config/PathConfigPane.h
@@ -8,7 +8,6 @@
 
 class wxButton;
 class wxCheckBox;
-class wxCommandEvent;
 class wxListBox;
 class wxDirPickerCtrl;
 class wxFilePickerCtrl;
diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.h b/Source/Core/DolphinWX/Config/WiiConfigPane.h
index 72ea81548a..d28df4836e 100644
--- a/Source/Core/DolphinWX/Config/WiiConfigPane.h
+++ b/Source/Core/DolphinWX/Config/WiiConfigPane.h
@@ -10,7 +10,6 @@
 
 class wxCheckBox;
 class wxChoice;
-class wxCommandEvent;
 
 class WiiConfigPane final : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.h b/Source/Core/DolphinWX/ControllerConfigDiag.h
index 2f846d310e..8b32feb4c6 100644
--- a/Source/Core/DolphinWX/ControllerConfigDiag.h
+++ b/Source/Core/DolphinWX/ControllerConfigDiag.h
@@ -13,7 +13,6 @@
 class InputConfig;
 class wxButton;
 class wxStaticBoxSizer;
-class wxWindow;
 
 class ControllerConfigDiag : public wxDialog
 {
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.h b/Source/Core/DolphinWX/Debugger/BreakpointView.h
index 0013e118cf..4608b5c827 100644
--- a/Source/Core/DolphinWX/Debugger/BreakpointView.h
+++ b/Source/Core/DolphinWX/Debugger/BreakpointView.h
@@ -7,8 +7,6 @@
 #include <wx/listctrl.h>
 #include <wx/windowid.h>
 
-class wxWindow;
-
 class CBreakPointView : public wxListCtrl
 {
 public:
diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h
index eea93964e6..d9c442a807 100644
--- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h
+++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h
@@ -16,7 +16,6 @@
 class CBreakPointView;
 class CCodeWindow;
 class wxListEvent;
-class wxWindow;
 
 class CBreakPointWindow : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h
index f56999a32c..f2f93884bf 100644
--- a/Source/Core/DolphinWX/Debugger/CodeView.h
+++ b/Source/Core/DolphinWX/Debugger/CodeView.h
@@ -23,7 +23,6 @@ wxDECLARE_EVENT(wxEVT_CODEVIEW_CHANGE, wxCommandEvent);
 class DebugInterface;
 class SymbolDB;
 class wxPaintDC;
-class wxWindow;
 
 class CCodeView : public wxControl
 {
diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
index 0a87ae4868..8045d79eb0 100644
--- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
+++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h
@@ -19,7 +19,6 @@ class CMemoryView;
 class wxAuiNotebook;
 class wxAuiToolBar;
 class wxListBox;
-class wxWindow;
 
 class DSPDebuggerLLE : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
index 475879ca2e..c2ca597957 100644
--- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
+++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.h
@@ -12,8 +12,6 @@
 
 #include "Common/CommonTypes.h"
 
-class wxWindow;
-
 class CDSPRegTable : public wxGridTableBase
 {
 private:
diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h
index cc82bf226a..8bf04411d4 100644
--- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h
+++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h
@@ -17,7 +17,6 @@
 class wxButton;
 class wxChoice;
 class wxTextCtrl;
-class wxWindow;
 
 class GFXDebuggerPanel : public wxPanel, public GFXDebuggerBase
 {
diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.h b/Source/Core/DolphinWX/Debugger/JitWindow.h
index 3e3632cf22..8422e6199a 100644
--- a/Source/Core/DolphinWX/Debugger/JitWindow.h
+++ b/Source/Core/DolphinWX/Debugger/JitWindow.h
@@ -22,7 +22,6 @@
 class wxButton;
 class wxListBox;
 class wxTextCtrl;
-class wxWindow;
 
 class JitBlockList : public wxListCtrl
 {
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h
index 79b59aac3d..8af7d2f958 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryView.h
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.h
@@ -10,7 +10,6 @@
 #include "Common/CommonTypes.h"
 
 class DebugInterface;
-class wxWindow;
 
 class CMemoryView : public wxControl
 {
diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h
index 9abaefbe88..94ea60eb52 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h
+++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h
@@ -20,7 +20,6 @@ class wxButton;
 class wxCheckBox;
 class wxListBox;
 class wxTextCtrl;
-class wxWindow;
 
 class CMemoryWindow : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h
index 8b8f030331..0949805d31 100644
--- a/Source/Core/DolphinWX/Debugger/RegisterView.h
+++ b/Source/Core/DolphinWX/Debugger/RegisterView.h
@@ -12,8 +12,6 @@
 
 #include "Common/CommonTypes.h"
 
-class wxWindow;
-
 // New register view:
 // R0  0x8000000    F0   0.0000       F0_PS1 0.0000
 // R1  0x8000000    F1   0.0000       F1_PS1 0.0000
diff --git a/Source/Core/DolphinWX/Debugger/RegisterWindow.h b/Source/Core/DolphinWX/Debugger/RegisterWindow.h
index 460afef158..28fa0ed234 100644
--- a/Source/Core/DolphinWX/Debugger/RegisterWindow.h
+++ b/Source/Core/DolphinWX/Debugger/RegisterWindow.h
@@ -13,7 +13,6 @@
 #include <wx/windowid.h>
 
 class CRegisterView;
-class wxWindow;
 
 class CRegisterWindow : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/Debugger/WatchView.h b/Source/Core/DolphinWX/Debugger/WatchView.h
index df21880e7b..540bf31d1c 100644
--- a/Source/Core/DolphinWX/Debugger/WatchView.h
+++ b/Source/Core/DolphinWX/Debugger/WatchView.h
@@ -13,8 +13,6 @@
 
 #include "Common/CommonTypes.h"
 
-class wxWindow;
-
 class CWatchTable : public wxGridTableBase
 {
 	enum
diff --git a/Source/Core/DolphinWX/Debugger/WatchWindow.h b/Source/Core/DolphinWX/Debugger/WatchWindow.h
index 09668a7af3..24ad215699 100644
--- a/Source/Core/DolphinWX/Debugger/WatchWindow.h
+++ b/Source/Core/DolphinWX/Debugger/WatchWindow.h
@@ -14,7 +14,6 @@
 #include <wx/aui/framemanager.h>
 
 class CWatchView;
-class wxWindow;
 
 class CWatchWindow : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.h b/Source/Core/DolphinWX/FifoPlayerDlg.h
index d2763ee539..117b98b3ed 100644
--- a/Source/Core/DolphinWX/FifoPlayerDlg.h
+++ b/Source/Core/DolphinWX/FifoPlayerDlg.h
@@ -14,9 +14,6 @@
 
 class wxButton;
 class wxCheckBox;
-class wxCommandEvent;
-class wxEvent;
-class wxEvtHandler;
 class wxListBox;
 class wxNotebook;
 class wxPaintEvent;
@@ -25,7 +22,6 @@ class wxSpinCtrl;
 class wxSpinEvent;
 class wxStaticText;
 class wxTextCtrl;
-class wxWindow;
 
 class FifoPlayerDlg : public wxDialog
 {
diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h
index 5cd026e05b..b536669907 100644
--- a/Source/Core/DolphinWX/Frame.h
+++ b/Source/Core/DolphinWX/Frame.h
@@ -48,7 +48,6 @@ class wxAuiNotebook;
 class wxAuiNotebookEvent;
 class wxListEvent;
 class wxMenuItem;
-class wxWindow;
 
 class CRenderFrame : public wxFrame
 {
diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h
index 15f89b2944..b1c80eee0f 100644
--- a/Source/Core/DolphinWX/GameListCtrl.h
+++ b/Source/Core/DolphinWX/GameListCtrl.h
@@ -17,9 +17,6 @@
 
 #include "DolphinWX/ISOFile.h"
 
-class wxListEvent;
-class wxWindow;
-
 class wxEmuStateTip : public wxTipWindow
 {
 public:
diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h
index 9dd5307928..3ed92fcfcb 100644
--- a/Source/Core/DolphinWX/HotkeyDlg.h
+++ b/Source/Core/DolphinWX/HotkeyDlg.h
@@ -21,8 +21,6 @@
 #endif
 
 class wxButton;
-class wxTimerEvent;
-class wxWindow;
 
 class HotkeyConfigDialog : public wxDialog
 {
diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h
index 36c539bbbc..4a3364eca3 100644
--- a/Source/Core/DolphinWX/ISOProperties.h
+++ b/Source/Core/DolphinWX/ISOProperties.h
@@ -36,7 +36,7 @@ class wxSpinCtrl;
 class wxStaticBitmap;
 class wxTextCtrl;
 class wxTreeCtrl;
-class wxWindow;
+
 namespace DiscIO { struct SFileInfo; }
 namespace Gecko { class CodeConfigPanel; }
 
diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h
index 87dfe08a7c..251de642b6 100644
--- a/Source/Core/DolphinWX/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/InputConfigDiag.h
@@ -32,16 +32,12 @@
 
 class InputConfig;
 class wxComboBox;
-class wxCommandEvent;
-class wxEvent;
 class wxListBox;
 class wxNotebook;
 class wxSlider;
 class wxStaticBitmap;
 class wxStaticText;
 class wxTextCtrl;
-class wxTimerEvent;
-class wxWindow;
 
 class PadSetting
 {
diff --git a/Source/Core/DolphinWX/LogConfigWindow.h b/Source/Core/DolphinWX/LogConfigWindow.h
index b022e68b9c..462a7ec5d3 100644
--- a/Source/Core/DolphinWX/LogConfigWindow.h
+++ b/Source/Core/DolphinWX/LogConfigWindow.h
@@ -12,9 +12,7 @@ class LogManager;
 class CLogWindow;
 class wxCheckBox;
 class wxCheckListBox;
-class wxCommandEvent;
 class wxRadioBox;
-class wxWindow;
 
 class LogConfigWindow : public wxPanel
 {
diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h
index cf998a2358..9a5c6425a4 100644
--- a/Source/Core/DolphinWX/MemcardManager.h
+++ b/Source/Core/DolphinWX/MemcardManager.h
@@ -24,7 +24,6 @@ class wxButton;
 class wxFileDirPickerEvent;
 class wxFilePickerCtrl;
 class wxStaticText;
-class wxWindow;
 
 #undef MEMCARD_MANAGER_STYLE
 #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX
diff --git a/Source/Core/DolphinWX/PatchAddEdit.h b/Source/Core/DolphinWX/PatchAddEdit.h
index 7bfee69708..52488c5117 100644
--- a/Source/Core/DolphinWX/PatchAddEdit.h
+++ b/Source/Core/DolphinWX/PatchAddEdit.h
@@ -20,7 +20,6 @@ class wxSpinButton;
 class wxSpinEvent;
 class wxStaticBoxSizer;
 class wxTextCtrl;
-class wxWindow;
 
 class CPatchAddEdit : public wxDialog
 {
diff --git a/Source/Core/DolphinWX/TASInputDlg.h b/Source/Core/DolphinWX/TASInputDlg.h
index d6173c1872..4a00d27522 100644
--- a/Source/Core/DolphinWX/TASInputDlg.h
+++ b/Source/Core/DolphinWX/TASInputDlg.h
@@ -23,7 +23,6 @@ class wxCheckBox;
 class wxSlider;
 class wxStaticBitmap;
 class wxTextCtrl;
-class wxWindow;
 
 class TASInputDlg : public wxDialog
 {