diff --git a/src/gui/wxgui/AudioDebuggerWindow.h b/src/gui/wxgui/AudioDebuggerWindow.h
index 5a6f1242..896d4999 100644
--- a/src/gui/wxgui/AudioDebuggerWindow.h
+++ b/src/gui/wxgui/AudioDebuggerWindow.h
@@ -2,6 +2,8 @@
 
 #include <wx/wx.h>
 
+class wxListCtrl;
+
 class AudioDebuggerWindow : public wxFrame
 {
 public:
@@ -25,4 +27,4 @@ private:
 	wxDECLARE_EVENT_TABLE();
 
 
-};
\ No newline at end of file
+};
diff --git a/src/gui/wxgui/GeneralSettings2.h b/src/gui/wxgui/GeneralSettings2.h
index e20a3371..634f0cfa 100644
--- a/src/gui/wxgui/GeneralSettings2.h
+++ b/src/gui/wxgui/GeneralSettings2.h
@@ -3,7 +3,16 @@
 #include <wx/propgrid/propgrid.h>
 #include <Cafe/Account/Account.h>
 
+class wxCheckBox;
+class wxChoice;
 class wxColourPickerCtrl;
+class wxListBox;
+class wxNotebook;
+class wxRadioBox;
+class wxSlider;
+class wxSpinCtrl;
+class wxSpinCtrlDouble;
+class wxStaticText;
 
 wxDECLARE_EVENT(wxEVT_ACCOUNTLIST_REFRESH, wxCommandEvent);
 
diff --git a/src/gui/wxgui/MemorySearcherTool.h b/src/gui/wxgui/MemorySearcherTool.h
index 495b60da..cb669d1c 100644
--- a/src/gui/wxgui/MemorySearcherTool.h
+++ b/src/gui/wxgui/MemorySearcherTool.h
@@ -6,11 +6,19 @@
 #include <future>
 
 #include <wx/listctrl.h>
+#include <wx/frame.h>
 
 #include "Cafe/HW/MMU/MMU.h"
 #include "util/helpers/helpers.h"
 #include "wxgui/helpers/wxCustomEvents.h"
 
+class wxComboBox;
+class wxDataViewEvent;
+class wxDataViewListCtrl;
+class wxStaticText;
+class wxTimer;
+class wxTimerEvent;
+
 enum SearchDataType
 {
 	SearchDataType_None,
diff --git a/src/gui/wxgui/PadViewFrame.h b/src/gui/wxgui/PadViewFrame.h
index 2be173ab..7e343d7e 100644
--- a/src/gui/wxgui/PadViewFrame.h
+++ b/src/gui/wxgui/PadViewFrame.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <wx/frame.h>
+
 #define WM_CREATE_PAD	(WM_USER+1)
 #define WM_DESTROY_PAD	(WM_USER+2)
 
diff --git a/src/gui/wxgui/debugger/BreakpointWindow.h b/src/gui/wxgui/debugger/BreakpointWindow.h
index 79c10f1f..330247e0 100644
--- a/src/gui/wxgui/debugger/BreakpointWindow.h
+++ b/src/gui/wxgui/debugger/BreakpointWindow.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <wx/frame.h>
+
 class DebuggerWindow2;
+class wxListEvent;
+class wxListView;
 
 class BreakpointWindow : public wxFrame
 {
@@ -21,4 +25,4 @@ private:
 	void OnContextMenuClickSelected(wxCommandEvent& evt);
 
 	wxListView* m_breakpoints;
-};
\ No newline at end of file
+};
diff --git a/src/gui/wxgui/debugger/ModuleWindow.h b/src/gui/wxgui/debugger/ModuleWindow.h
index 6730fa78..76bb0c67 100644
--- a/src/gui/wxgui/debugger/ModuleWindow.h
+++ b/src/gui/wxgui/debugger/ModuleWindow.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <wx/frame.h>
+
 class DebuggerWindow2;
+class wxListView;
 
 class ModuleWindow : public wxFrame
 {
@@ -14,4 +17,4 @@ private:
 	void OnLeftDClick(wxMouseEvent& event);
 
 	wxListView* m_modules;
-};
\ No newline at end of file
+};
diff --git a/src/gui/wxgui/debugger/RegisterWindow.h b/src/gui/wxgui/debugger/RegisterWindow.h
index 24fc4e5f..9cb50840 100644
--- a/src/gui/wxgui/debugger/RegisterWindow.h
+++ b/src/gui/wxgui/debugger/RegisterWindow.h
@@ -1,7 +1,9 @@
 #pragma once
 #include "Cafe/HW/Espresso/Debugger/Debugger.h"
+#include <wx/frame.h>
 
 class DebuggerWindow2;
+class wxTextCtrl;
 
 class RegisterWindow : public wxFrame
 {
@@ -24,4 +26,4 @@ private:
 	wxColour m_changed_color = {0xFF0000FF};
 
 	wxTextCtrl* m_context_ctrl;
-};
\ No newline at end of file
+};
diff --git a/src/gui/wxgui/debugger/SymbolWindow.h b/src/gui/wxgui/debugger/SymbolWindow.h
index 766ac65e..505328fa 100644
--- a/src/gui/wxgui/debugger/SymbolWindow.h
+++ b/src/gui/wxgui/debugger/SymbolWindow.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "wxgui/debugger/SymbolCtrl.h"
+#include <wx/frame.h>
 
 class DebuggerWindow2;
 
@@ -19,4 +20,4 @@ private:
 	SymbolListCtrl* m_symbol_ctrl;
 
 	void OnFilterChanged(wxCommandEvent& event);
-};
\ No newline at end of file
+};
diff --git a/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h b/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h
index f6dc9060..5b502e32 100644
--- a/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h
+++ b/src/gui/wxgui/windows/PPCThreadsViewer/DebugPPCThreadsWindow.h
@@ -2,6 +2,8 @@
 
 #include <wx/wx.h>
 
+class wxListView;
+
 class DebugPPCThreadsWindow: public wxFrame
 {
 public:
diff --git a/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.h b/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.h
index aacab7b4..f429a0ed 100644
--- a/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.h
+++ b/src/gui/wxgui/windows/TextureRelationViewer/TextureRelationWindow.h
@@ -2,6 +2,8 @@
 
 #include <wx/wx.h>
 
+class wxListCtrl;
+
 class TextureRelationViewerWindow : public wxFrame
 {
 public:
@@ -28,4 +30,4 @@ private:
 	bool showTextureViews;
 };
 
-void openTextureViewer(wxFrame& parentFrame);
\ No newline at end of file
+void openTextureViewer(wxFrame& parentFrame);