diff --git a/SConstruct b/SConstruct
index fbcb233845..ffef4df656 100644
--- a/SConstruct
+++ b/SConstruct
@@ -56,6 +56,7 @@ include_paths = [
     basedir + 'Source/Core/VideoCommon/Src',
     basedir + 'Source/Core/InputCommon/Src',
     basedir + 'Source/Core/AudioCommon/Src',
+	basedir + 'Source/Core/DebuggerUICommon/Src',
     basedir + 'Source/Core/DSPCore/Src',
     ]
 
@@ -70,6 +71,7 @@ dirs = [
     'Source/Core/VideoCommon/Src',
     'Source/Core/InputCommon/Src',
     'Source/Core/AudioCommon/Src',
+	'Source/Core/DebuggerUICommon/Src',
     'Source/Core/DSPCore/Src',
     'Source/DSPTool/Src',
     'Source/Plugins/Plugin_VideoOGL/Src',
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 3b87e2b2d8..6ceba317a2 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -29,6 +29,7 @@ files = [
 	"PluginPAD.cpp",
 	"SDCardUtil.cpp",
 	"StringUtil.cpp",
+	"SymbolDB.cpp",
 	"Thread.cpp",
 	"Thunk.cpp",
 	"Timer.cpp",
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
index 7fb5d25eb1..794b17a758 100644
--- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
+++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
@@ -18,7 +18,7 @@
 #include "Common.h"
 #include "StringUtil.h"
 #include "Debugger_SymbolMap.h"
-#include "Debugger_Breakpoints.h"
+#include "Debugger_BreakPoints.h"
 #include "../Core.h"
 #include "../HW/Memmap.h"
 #include "../PowerPC/PowerPC.h"
diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript
index 9642d3e723..d9ae5a9566 100644
--- a/Source/Core/DebuggerWX/Src/SConscript
+++ b/Source/Core/DebuggerWX/Src/SConscript
@@ -29,7 +29,8 @@ wxenv.Append(
 		]
 	)
 libs = [
-    'common'
+    'common',
+	'debugger_ui_util'
 ]
 
 wxenv.StaticLibrary(env['local_libs'] + "debwx", files, LIBS = libs)
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index e9193aa82a..a2bc4bd8e9 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -12,7 +12,7 @@ files = [
 
 libs = [
 	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'inputcommon',
-	'common', 'z'
+	'common', 'z', 'debugger_ui_util'
 	]
 
 if wxenv['HAVE_WX']:
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/DSPDebugInterface.h b/Source/Plugins/Plugin_DSP_LLE/Src/DSPDebugInterface.h
index 5fc1aa67a1..79d0220148 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/DSPDebugInterface.h
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/DSPDebugInterface.h
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "DebugInterface.h"
+#include "Common.h"
 
 class DSPDebugInterface : public DebugInterface
 {
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
index c019c40f32..a9b0153ab1 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript
@@ -12,6 +12,8 @@ if not env['HAVE_AO']:
 
 files = [
 	"Config.cpp",
+	"DSPDebugInterface.cpp",
+	"DSPSymbols.cpp",
 	"Globals.cpp",
 	"main.cpp",
 	"Tools.cpp",
@@ -31,7 +33,7 @@ if env['HAVE_WX']:
 lleenv = env.Clone()
 lleenv.Append(
 	CXXFLAGS = [ '-fPIC' ],
-	LIBS = [ 'dspcore', 'audiocommon', 'common',  ],
+	LIBS = [ 'dspcore', 'audiocommon', 'common', 'debugger_ui_util'  ],
 	)
 
 lleenv.SharedLibrary(env['plugin_dir']+name, files)