diff --git a/Externals/Bochs_disasm/SConscript b/Externals/Bochs_disasm/SConscript
index 247036893d..b2d8a2d581 100644
--- a/Externals/Bochs_disasm/SConscript
+++ b/Externals/Bochs_disasm/SConscript
@@ -15,6 +15,4 @@ if sys.platform == 'win32':
 	files += [ "stdafx.cpp" ]
 
 env['CPPPATH'] += ['#Externals/Bochs_disasm']
-#env['LIBS'] += env.StaticObject(files)
-bochs = env.StaticObject(files)
-env['LIBS'] += bochs
+env['LIBS'] += env.StaticObject(files)
diff --git a/SConstruct b/SConstruct
index 38e009b532..0dc071a593 100644
--- a/SConstruct
+++ b/SConstruct
@@ -338,10 +338,10 @@ dirs = [
     'Source/Core/InputCommon/Src',
     'Source/Core/VideoCommon/Src',
     'Source/Core/VideoUICommon/Src',
-    #'Source/DSPTool/Src',
+    'Source/DSPTool/Src',
     'Source/Plugins/Plugin_VideoOGL/Src',
     'Source/Plugins/Plugin_VideoSoftware/Src',
-    #'Source/UnitTests',
+    'Source/UnitTests',
     ]
 
 # Now that platform configuration is done, propagate it to modules
diff --git a/Source/Core/Common/Src/SConscript b/Source/Core/Common/Src/SConscript
index 577633fc1a..5027f7d9f6 100644
--- a/Source/Core/Common/Src/SConscript
+++ b/Source/Core/Common/Src/SConscript
@@ -53,5 +53,6 @@ if sys.platform == 'win32':
 	files += [ "ExtendedTrace.cpp" ]
 	files += [ "stdafx.cpp" ]
 
+env['common'] = env.StaticObject(files)
 env['CPPPATH'] += ['.']
-env['LIBS'] += env.StaticObject(files)
+env['LIBS'] += env['common']
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index 0b5fe90e85..ecaa7ec3bb 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -28,6 +28,9 @@ files = [
 	"Debugger/Debugger_SymbolMap.cpp",
 	"Debugger/Dump.cpp",
 	"Debugger/PPCDebugInterface.cpp",
+	]
+
+dspcorefiles = [
 	"DSP/assemble.cpp",
 	"DSP/disassemble.cpp",
 	"DSP/DSPAccelerator.cpp",
@@ -57,6 +60,9 @@ files = [
 	"DSP/Jit/DSPJitMultiplier.cpp",
 	"DSP/Jit/DSPJitMisc.cpp",
 	"DSP/Jit/DSPJitRegCache.cpp",
+	]
+
+files += [
 	"GeckoCode.cpp",
 	"GeckoCodeConfig.cpp",
 	"HLE/HLE.cpp",
@@ -196,4 +202,6 @@ elif sys.platform == 'linux2' and env['HAVE_BLUEZ']:
 else:
 	files += [ "HW/BBA-TAP/TAP_Unix.cpp", "HW/WiimoteReal/IODummy.cpp" ]
 
+env['dspcore'] = env.StaticObject(dspcorefiles)
 env['LIBS'] += env.StaticObject(files)
+env['LIBS'] += env['dspcore']
diff --git a/Source/DSPTool/Src/SConscript b/Source/DSPTool/Src/SConscript
index 84abeace18..33df45ed1b 100644
--- a/Source/DSPTool/Src/SConscript
+++ b/Source/DSPTool/Src/SConscript
@@ -8,8 +8,8 @@ files = [
 	]
 
 libs = [
-	'core',
-	'common',
+	env['common'],
+	env['dspcore'],
 	]
 
 if sys.platform == 'darwin':
diff --git a/Source/UnitTests/SConscript b/Source/UnitTests/SConscript
index 229a625321..38c6432bfb 100644
--- a/Source/UnitTests/SConscript
+++ b/Source/UnitTests/SConscript
@@ -10,7 +10,8 @@ files = [
 	]
 
 libs = [
-	'core', 'common',
+	env['common'],
+	env['dspcore'],
 	]
 
 if sys.platform == 'darwin':