diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index 63d7996662..bdeb779542 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -3,23 +3,29 @@
 Import('env')
 
 files = [
-	"BPMemory.cpp",
-	"CPMemory.cpp",
-	"LookUpTables.cpp",
+	'BPMemory.cpp',
+	'CPMemory.cpp',
+	'memcpy_amd.cpp',
+	'LookUpTables.cpp',
 	'OpcodeDecoding.cpp',
-	"TextureDecoder.cpp",
-	"XFMemory.cpp",
-	"XFBConvert.cpp",
-	"PixelShader.cpp",
-	"PixelShaderManager.cpp",
-	"VertexShader.cpp",
-	"VertexShaderManager.cpp",
-	"ImageWrite.cpp",
-	"NativeVertexWriter.cpp",
-	"Statistics.cpp",
-	"Fifo.cpp",
-	"VideoState.cpp",
-	"Profiler.cpp",
+	'TextureDecoder.cpp',
+	'XFMemory.cpp',
+	'XFBConvert.cpp',
+	'PixelShader.cpp',
+	'PixelShaderManager.cpp',
+	'VertexShader.cpp',
+	'VertexShaderManager.cpp',
+	'VertexLoader.cpp',
+	'VertexLoader_Color.cpp',
+	'VertexLoader_Normal.cpp',
+	'VertexLoader_Position.cpp',
+	'VertexLoader_TextCoord.cpp',
+	'ImageWrite.cpp',
+	'NativeVertexWriter.cpp',
+	'Statistics.cpp',
+	'Fifo.cpp',
+	'VideoState.cpp',
+	'Profiler.cpp',
 	]
 
 env_common = env.Clone()
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
index d32d66d51c..e790407d4d 100644
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ b/Source/Core/VideoCommon/Src/VideoCommon.h
@@ -85,9 +85,13 @@ void HandleGLError();
 
 #define ERROR_LOG __Log
 
+
 #if defined(_DEBUG) || defined(DEBUGFAST)
-#define INFO_LOG if( g_Config.iLog & CONF_LOG ) __Log
-#define PRIM_LOG if( g_Config.iLog & CONF_PRIMLOG ) __Log
+// FIXME ugly hack for debug to build should use logmanager
+//#define INFO_LOG if( g_Config.iLog & CONF_LOG ) __Log
+//#define PRIM_LOG if( g_Config.iLog & CONF_PRIMLOG ) __Log
+#define INFO_LOG __Log
+#define PRIM_LOG __Log
 #define DEBUG_LOG __Log
 #else
 #define INFO_LOG(...)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index c30b5aa9e6..1bf8705852 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -13,21 +13,15 @@ files = [
 	'BPStructs.cpp',
 	'Globals.cpp',
 	'Config.cpp',
-	'memcpy_amd.cpp',
 	'rasterfont.cpp',
 	'Render.cpp',
 	'TextureMngr.cpp',
 	'NativeVertexFormat.cpp',
-	'VertexManager.cpp',
-	'VertexLoader.cpp',
-	'VertexLoader_Color.cpp',
-	'VertexLoader_Normal.cpp',
-	'VertexLoader_Position.cpp',
-	'VertexLoader_TextCoord.cpp',
-	'VertexLoaderManager.cpp',
 	'PixelShaderCache.cpp',
 	'VertexShaderCache.cpp',
 	'TextureConverter.cpp',
+	'VertexManager.cpp',
+	'VertexLoaderManager.cpp',
 	'XFB.cpp',
 	'XFStructs.cpp',
 	]