diff --git a/Source/Core/DolphinWX/Debugger/CodeView.h b/Source/Core/DolphinWX/Debugger/CodeView.h
index 7c200e854c..f56999a32c 100644
--- a/Source/Core/DolphinWX/Debugger/CodeView.h
+++ b/Source/Core/DolphinWX/Debugger/CodeView.h
@@ -30,19 +30,10 @@ class CCodeView : public wxControl
 public:
 	CCodeView(DebugInterface* debuginterface, SymbolDB *symbol_db,
 			wxWindow* parent, wxWindowID Id = wxID_ANY);
-	void OnPaint(wxPaintEvent& event);
-	void OnErase(wxEraseEvent& event);
-	void OnScrollWheel(wxMouseEvent& event);
-	void OnMouseDown(wxMouseEvent& event);
-	void OnMouseMove(wxMouseEvent& event);
-	void OnMouseUpL(wxMouseEvent& event);
-	void OnMouseUpR(wxMouseEvent& event);
-	void OnPopupMenu(wxCommandEvent& event);
-	void InsertBlrNop(int);
 
 	void ToggleBreakpoint(u32 address);
 
-	u32 GetSelection()
+	u32 GetSelection() const
 	{
 		return m_selection;
 	}
@@ -60,6 +51,16 @@ public:
 	}
 
 private:
+	void OnPaint(wxPaintEvent& event);
+	void OnErase(wxEraseEvent& event);
+	void OnScrollWheel(wxMouseEvent& event);
+	void OnMouseDown(wxMouseEvent& event);
+	void OnMouseMove(wxMouseEvent& event);
+	void OnMouseUpL(wxMouseEvent& event);
+	void OnMouseUpR(wxMouseEvent& event);
+	void OnPopupMenu(wxCommandEvent& event);
+	void InsertBlrNop(int);
+
 	void RaiseEvent();
 	int YToAddress(int y);
 
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.h b/Source/Core/DolphinWX/Debugger/CodeWindow.h
index 0b5d52e0aa..dc46b9a13a 100644
--- a/Source/Core/DolphinWX/Debugger/CodeWindow.h
+++ b/Source/Core/DolphinWX/Debugger/CodeWindow.h
@@ -75,10 +75,6 @@ public:
 	void UpdateManager();
 
 	// Menu bar
-	// -------------------
-	void OnCPUMode(wxCommandEvent& event); // CPU Mode menu
-	void OnJITOff(wxCommandEvent& event);
-
 	void ToggleCodeWindow(bool bShow);
 	void ToggleRegisterWindow(bool bShow);
 	void ToggleWatchWindow(bool bShow);
@@ -88,14 +84,6 @@ public:
 	void ToggleSoundWindow(bool bShow);
 	void ToggleVideoWindow(bool bShow);
 
-	void OnChangeFont(wxCommandEvent& event);
-
-	void OnCodeStep(wxCommandEvent& event);
-	void OnAddrBoxChange(wxCommandEvent& event);
-	void OnSymbolsMenu(wxCommandEvent& event);
-	void OnJitMenu(wxCommandEvent& event);
-	void OnProfilerMenu(wxCommandEvent& event);
-
 	// Sub dialogs
 	CRegisterWindow* m_RegisterWindow;
 	CWatchWindow* m_WatchWindow;
@@ -111,6 +99,16 @@ public:
 	int iNbAffiliation[IDM_CODE_WINDOW - IDM_LOG_WINDOW + 1];
 
 private:
+	void OnCPUMode(wxCommandEvent& event);
+
+	void OnChangeFont(wxCommandEvent& event);
+
+	void OnCodeStep(wxCommandEvent& event);
+	void OnAddrBoxChange(wxCommandEvent& event);
+	void OnSymbolsMenu(wxCommandEvent& event);
+	void OnJitMenu(wxCommandEvent& event);
+	void OnProfilerMenu(wxCommandEvent& event);
+
 	void OnSymbolListChange(wxCommandEvent& event);
 	void OnSymbolListContextMenu(wxContextMenuEvent& event);
 	void OnCallstackListChange(wxCommandEvent& event);
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.h b/Source/Core/DolphinWX/Debugger/MemoryView.h
index a098d2d291..79b59aac3d 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryView.h
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.h
@@ -16,16 +16,9 @@ class CMemoryView : public wxControl
 {
 public:
 	CMemoryView(DebugInterface* debuginterface, wxWindow* parent);
-	void OnPaint(wxPaintEvent& event);
-	void OnMouseDownL(wxMouseEvent& event);
-	void OnMouseMove(wxMouseEvent& event);
-	void OnMouseUpL(wxMouseEvent& event);
-	void OnMouseDownR(wxMouseEvent& event);
-	void OnScrollWheel(wxMouseEvent& event);
-	void OnPopupMenu(wxCommandEvent& event);
 
-	u32 GetSelection() { return selection ; }
-	int GetMemoryType() { return memory; }
+	u32 GetSelection() const { return selection ; }
+	int GetMemoryType() const { return memory; }
 
 	void Center(u32 addr)
 	{
@@ -36,6 +29,14 @@ public:
 	int curAddress; // Will be accessed by parent
 
 private:
+	void OnPaint(wxPaintEvent& event);
+	void OnMouseDownL(wxMouseEvent& event);
+	void OnMouseMove(wxMouseEvent& event);
+	void OnMouseUpL(wxMouseEvent& event);
+	void OnMouseDownR(wxMouseEvent& event);
+	void OnScrollWheel(wxMouseEvent& event);
+	void OnPopupMenu(wxCommandEvent& event);
+
 	int YToAddress(int y);
 	void OnResize(wxSizeEvent& event);
 
diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h
index 479cdcbd5d..9abaefbe88 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h
+++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h
@@ -32,12 +32,6 @@ public:
 	              long style = wxTAB_TRAVERSAL | wxBORDER_NONE,
 	              const wxString& name = _("Memory"));
 
-	wxCheckBox* chk8;
-	wxCheckBox* chk16;
-	wxCheckBox* chk32;
-	wxButton*   btnSearch;
-	wxCheckBox* chkAscii;
-	wxCheckBox* chkHex;
 	void Save(IniFile& _IniFile) const;
 	void Load(IniFile& _IniFile);
 
@@ -49,13 +43,6 @@ public:
 private:
 	DECLARE_EVENT_TABLE()
 
-	CMemoryView* memview;
-	wxListBox* symbols;
-
-	wxButton* buttonGo;
-	wxTextCtrl* addrbox;
-	wxTextCtrl* valbox;
-
 	void U8(wxCommandEvent& event);
 	void U16(wxCommandEvent& event);
 	void U32(wxCommandEvent& event);
@@ -71,4 +58,18 @@ private:
 	void OnDumpMemory(wxCommandEvent& event);
 	void OnDumpMem2(wxCommandEvent& event);
 	void OnDumpFakeVMEM(wxCommandEvent& event);
+
+	wxCheckBox* chk8;
+	wxCheckBox* chk16;
+	wxCheckBox* chk32;
+	wxButton*   btnSearch;
+	wxCheckBox* chkAscii;
+	wxCheckBox* chkHex;
+
+	CMemoryView* memview;
+	wxListBox* symbols;
+
+	wxButton* buttonGo;
+	wxTextCtrl* addrbox;
+	wxTextCtrl* valbox;
 };
diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.h b/Source/Core/DolphinWX/Debugger/RegisterView.h
index af4d55843d..8b8f030331 100644
--- a/Source/Core/DolphinWX/Debugger/RegisterView.h
+++ b/Source/Core/DolphinWX/Debugger/RegisterView.h
@@ -71,10 +71,11 @@ class CRegisterView : public wxGrid
 public:
 	CRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY);
 	void Update() override;
+
+private:
 	void OnMouseDownR(wxGridEvent& event);
 	void OnPopupMenu(wxCommandEvent& event);
 
-private:
 	u32 m_selectedAddress = 0;
 
 	// Owned by wx. Deleted implicitly upon destruction.
diff --git a/Source/Core/DolphinWX/Debugger/WatchView.h b/Source/Core/DolphinWX/Debugger/WatchView.h
index 4235628d18..df21880e7b 100644
--- a/Source/Core/DolphinWX/Debugger/WatchView.h
+++ b/Source/Core/DolphinWX/Debugger/WatchView.h
@@ -46,10 +46,11 @@ class CWatchView : public wxGrid
 public:
 	CWatchView(wxWindow* parent, wxWindowID id = wxID_ANY);
 	void Update() override;
+
+private:
 	void OnMouseDownR(wxGridEvent& event);
 	void OnPopupMenu(wxCommandEvent& event);
 
-private:
 	u32 m_selectedAddress = 0;
 	u32 m_selectedRow = 0;
 	CWatchTable* m_watch_table;