diff --git a/Source/Core/DebuggerUICommon/CMakeLists.txt b/Source/Core/DebuggerUICommon/CMakeLists.txt
index 4b88b6a162..df83233511 100644
--- a/Source/Core/DebuggerUICommon/CMakeLists.txt
+++ b/Source/Core/DebuggerUICommon/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SRCS	Src/CodeView.cpp
-			Src/DebuggerUIUtil.cpp
-			Src/MemoryView.cpp)
+		Src/DebuggerUIUtil.cpp
+		Src/MemoryView.cpp)
 
 add_library(debugger_ui_util STATIC ${SRCS})
 target_link_libraries(debugger_ui_util ${wxWidgets_LIBRARIES})
diff --git a/Source/Core/DebuggerUICommon/Src/CodeView.cpp b/Source/Core/DebuggerUICommon/Src/CodeView.cpp
index 79056245ff..d40e6de15e 100644
--- a/Source/Core/DebuggerUICommon/Src/CodeView.cpp
+++ b/Source/Core/DebuggerUICommon/Src/CodeView.cpp
@@ -15,10 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-// #include "Debugger.h"
-// #include "Debugger/PPCDebugInterface.h"
-
-// #include "PowerPC/SymbolDB.h"
 #include "Common.h"
 #include "StringUtil.h"
 #include "DebuggerUIUtil.h"
@@ -27,7 +23,6 @@
 #include "Host.h"
 #include "CodeView.h"
 #include "SymbolDB.h"
-// #include "JitWindow.h"
 
 #include <wx/event.h>
 #include <wx/clipbrd.h>
diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj
index beb574cd5b..c4c594c7c2 100644
--- a/Source/Core/DebuggerWX/DebuggerWX.vcproj
+++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj
@@ -784,10 +784,6 @@
 			RelativePath=".\Src\CodeWindowFunctions.cpp"
 			>
 		</File>
-		<File
-			RelativePath=".\src\Debugger.h"
-			>
-		</File>
 		<File
 			RelativePath=".\src\JitWindow.cpp"
 			>
diff --git a/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp b/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp
index 7d54e1bd06..8764f77aad 100644
--- a/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp
+++ b/Source/Core/DebuggerWX/Src/BreakpointDlg.cpp
@@ -17,7 +17,6 @@
 
 #include "Common.h"
 #include "Host.h"
-#include "Debugger.h"
 #include "StringUtil.h"
 #include "PowerPC/PowerPC.h"
 #include "BreakpointWindow.h"
diff --git a/Source/Core/DebuggerWX/Src/BreakpointView.cpp b/Source/Core/DebuggerWX/Src/BreakpointView.cpp
index da356ce138..3a7f8c5537 100644
--- a/Source/Core/DebuggerWX/Src/BreakpointView.cpp
+++ b/Source/Core/DebuggerWX/Src/BreakpointView.cpp
@@ -15,9 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Debugger.h"
-
 #include "BreakpointView.h"
+#include "DebuggerUIUtil.h"
 #include "Debugger/Debugger_SymbolMap.h"
 #include "PowerPC/PPCSymbolDB.h"
 #include "PowerPC/PowerPC.h"
diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
index ffa2ffaf98..caa5f8ff35 100644
--- a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
@@ -15,7 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Debugger.h"
 #include "BreakpointView.h"
 #include "CodeWindow.h"
 #include "HW/Memmap.h"
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index e0f7678964..7250b2eba0 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -28,8 +28,6 @@
 
 #include "Host.h"
 
-#include "Debugger.h"
-
 #include "RegisterWindow.h"
 #include "BreakpointWindow.h"
 #include "MemoryWindow.h"
diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
index 1010da6970..c6b68afcd9 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
@@ -31,7 +31,6 @@
 
 #include "Host.h"
 
-#include "Debugger.h"
 #include "DebuggerUIUtil.h"
 
 #include "RegisterWindow.h"
diff --git a/Source/Core/DebuggerWX/Src/Debugger.h b/Source/Core/DebuggerWX/Src/Debugger.h
deleted file mode 100644
index ba7c695eaa..0000000000
--- a/Source/Core/DebuggerWX/Src/Debugger.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#ifndef _DEBUGGER_H
-#define _DEBUGGER_H
-
-#include <wx/wx.h>
-
-#include "DebuggerUIUtil.h"
-
-#include "IniFile.h"
-
-#endif
diff --git a/Source/Core/DebuggerWX/Src/JitWindow.cpp b/Source/Core/DebuggerWX/Src/JitWindow.cpp
index d5e668fd23..a32761bbfb 100644
--- a/Source/Core/DebuggerWX/Src/JitWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/JitWindow.cpp
@@ -15,8 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Debugger.h"
-
 #include <wx/button.h>
 #include <wx/textctrl.h>
 #include <wx/listctrl.h>
diff --git a/Source/Core/DebuggerWX/Src/JitWindow.h b/Source/Core/DebuggerWX/Src/JitWindow.h
index b8b2443f62..652f09b922 100644
--- a/Source/Core/DebuggerWX/Src/JitWindow.h
+++ b/Source/Core/DebuggerWX/Src/JitWindow.h
@@ -25,7 +25,6 @@
 #include <wx/listctrl.h>
 #include <wx/listbox.h>
 
-#include "Debugger.h"
 #include "MemoryView.h"
 #include "Thread.h"
 #include "CoreParameter.h"
diff --git a/Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp b/Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp
index dbf6764609..84c9e4dd1a 100644
--- a/Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp
+++ b/Source/Core/DebuggerWX/Src/MemoryCheckDlg.cpp
@@ -17,7 +17,6 @@
 
 #include "MemoryCheckDlg.h"
 #include "Common.h"
-#include "Debugger.h"
 #include "StringUtil.h"
 #include "Host.h"
 #include "PowerPC/PowerPC.h"
diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
index 933bd12f3b..85ab61e44f 100644
--- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp
@@ -15,8 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Debugger.h"
-
 #include <wx/button.h>
 #include <wx/textctrl.h>
 #include <wx/listctrl.h>
diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.h b/Source/Core/DebuggerWX/Src/MemoryWindow.h
index 83ca3771c6..e1a7a98085 100644
--- a/Source/Core/DebuggerWX/Src/MemoryWindow.h
+++ b/Source/Core/DebuggerWX/Src/MemoryWindow.h
@@ -21,7 +21,6 @@
 #include <wx/dialog.h>
 #include <wx/textctrl.h>
 #include <wx/listbox.h>
-#include "Debugger.h"
 #include "MemoryView.h"
 #include "Thread.h"
 #include "StringUtil.h"
diff --git a/Source/Core/DebuggerWX/Src/RegisterView.cpp b/Source/Core/DebuggerWX/Src/RegisterView.cpp
index 52e5e3a9bf..8cfb6474d0 100644
--- a/Source/Core/DebuggerWX/Src/RegisterView.cpp
+++ b/Source/Core/DebuggerWX/Src/RegisterView.cpp
@@ -15,10 +15,11 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Debugger.h"
+#include "DebuggerUIUtil.h"
 #include "RegisterView.h"
 #include "PowerPC/PowerPC.h"
 #include "HW/ProcessorInterface.h"
+#include "IniFile.h"
 
 // F-zero 80005e60 wtf??
 
diff --git a/Source/Core/DebuggerWX/Src/RegisterWindow.cpp b/Source/Core/DebuggerWX/Src/RegisterWindow.cpp
index f6efd07943..b067740c84 100644
--- a/Source/Core/DebuggerWX/Src/RegisterWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/RegisterWindow.cpp
@@ -15,7 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Debugger.h"
+#include <wx/wx.h>
+
 #include "RegisterWindow.h"
 #include "PowerPC/PowerPC.h"
 #include "RegisterView.h"
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index ac7ae3fb45..6ed390c84f 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -72,7 +72,7 @@ void GFXDebuggerCheckAndPause(bool update)
 			UpdateFPSDisplay("Paused by Video Debugger");
 
 			if (update)	GFXDebuggerUpdateScreen();
-			Sleep(5);
+			SLEEP(5);
 		}
 		g_pdebugger->OnContinue();
 	}
diff --git a/Source/Core/VideoCommon/Src/Debugger.h b/Source/Core/VideoCommon/Src/Debugger.h
index a247b76b8c..47099f239a 100644
--- a/Source/Core/VideoCommon/Src/Debugger.h
+++ b/Source/Core/VideoCommon/Src/Debugger.h
@@ -84,7 +84,7 @@ void GFXDebuggerUpdateScreen();
 #define GFX_DEBUGGER_PAUSE_AT(event,update)
 #define GFX_DEBUGGER_PAUSE_LOG_AT(event,update,dumpfunc)
 #define GFX_DEBUGGER_LOG_AT(event,dumpfunc)
-#endif ENABLE_GFX_DEBUGGER
+#endif // ENABLE_GFX_DEBUGGER
 
 
 #endif // _GFX_DEBUGGER_H_
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index 7bcd004762..8d71832058 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -8,7 +8,7 @@ files = [
 	'BPStructs.cpp',
 	'CPMemory.cpp',
 	'CommandProcessor.cpp',
-	'DebuggerPanel.cpp',
+	'Debugger.cpp',
 	'DLCache.cpp',
 	'Fifo.cpp',
 	'FramebufferManagerBase.cpp',