diff --git a/Externals/CLRun/clrun/CLRun.vcproj b/Externals/CLRun/clrun/CLRun.vcproj
index 9bb4b04847..e94a097529 100644
--- a/Externals/CLRun/clrun/CLRun.vcproj
+++ b/Externals/CLRun/clrun/CLRun.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1255"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="CLRun"
 	ProjectGUID="{D4833C30-FA5F-4DFE-BD32-109DE1F09ED1}"
 	RootNamespace="CLRun"
@@ -24,6 +24,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -85,6 +86,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -147,7 +149,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -209,7 +211,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Languages/Languages.vcproj b/Languages/Languages.vcproj
index b9cbd7971c..976d474532 100644
--- a/Languages/Languages.vcproj
+++ b/Languages/Languages.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Languages"
 	ProjectGUID="{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}"
 	RootNamespace="Languages"
@@ -27,7 +27,7 @@
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Core/Common/SVNRevGen.vcproj b/Source/Core/Common/SVNRevGen.vcproj
index a5997f5fbb..1ecfefb805 100644
--- a/Source/Core/Common/SVNRevGen.vcproj
+++ b/Source/Core/Common/SVNRevGen.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="SVNRevGen"
 	ProjectGUID="{B807E8DB-4241-4754-BC2A-2F435BCA881A}"
 	RootNamespace="SVNRevGen"
@@ -21,7 +21,7 @@
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj
index 55a1a81df7..e29233443b 100644
--- a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj
+++ b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="DebuggerUICommon"
 	ProjectGUID="{F81AE75C-3D17-4D8C-A201-82FA5351C123}"
 	RootNamespace="DebuggerUICommon"
@@ -25,6 +25,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -87,6 +88,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -150,7 +152,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -213,7 +215,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -278,7 +280,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -341,7 +343,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index 750be9656c..2ebf55f35b 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="VideoCommon"
 	ProjectGUID="{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"
 	RootNamespace="VideoCommon"
@@ -28,6 +28,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -94,6 +95,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -161,7 +163,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -230,7 +232,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -300,7 +302,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -364,7 +366,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -688,14 +690,6 @@
 			<Filter
 				Name="OpenCL"
 				>
-				<File
-					RelativePath=".\Src\OpenCL.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Src\OpenCL.h"
-					>
-				</File>
 				<File
 					RelativePath=".\Src\OpenCL\OCLTextureDecoder.cpp"
 					>
@@ -704,6 +698,14 @@
 					RelativePath=".\Src\OpenCL\OCLTextureDecoder.h"
 					>
 				</File>
+				<File
+					RelativePath=".\Src\OpenCL.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Src\OpenCL.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\Data\User\OpenCL\TextureDecoder.cl"
 					>
diff --git a/Source/Core/VideoUICommon/VideoUICommon.vcproj b/Source/Core/VideoUICommon/VideoUICommon.vcproj
index 7c961edbb9..85edda3fb1 100644
--- a/Source/Core/VideoUICommon/VideoUICommon.vcproj
+++ b/Source/Core/VideoUICommon/VideoUICommon.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="VideoUICommon"
 	ProjectGUID="{56C4B06E-F2C9-4729-A15A-DD327A9AA465}"
 	RootNamespace="VideoUICommon"
@@ -25,6 +25,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -87,6 +88,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -150,7 +152,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -213,7 +215,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -278,7 +280,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -341,7 +343,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/DSPTool/DSPTool.vcproj b/Source/DSPTool/DSPTool.vcproj
index a7f12da315..4cfcbe21e5 100644
--- a/Source/DSPTool/DSPTool.vcproj
+++ b/Source/DSPTool/DSPTool.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="DSPTool"
 	ProjectGUID="{1970D175-3DE8-4738-942A-4D98D1CDBF64}"
 	RootNamespace="DSPTool"
@@ -176,7 +176,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj
index 7e0d0914fa..009228f17c 100644
--- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj
+++ b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="VideoDX11"
 	ProjectGUID="{21DBE606-2958-43AC-A14E-B6B798D56554}"
 	RootNamespace="Plugin_VideoDX11"
@@ -27,7 +27,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -116,7 +116,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -207,6 +207,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -285,6 +286,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -363,7 +365,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
index 615a9eb6dd..13e96eac66 100644
--- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
+++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="VideoDX9"
 	ProjectGUID="{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
 	RootNamespace="Plugin_VideoDX9"
@@ -27,7 +27,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -118,7 +118,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -211,6 +211,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -291,6 +292,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -371,7 +373,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
index 48f2a65621..8290306987 100644
--- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
+++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="VideoOGL"
 	ProjectGUID="{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}"
 	RootNamespace="Plugin_VideoOGL"
@@ -27,7 +27,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -118,7 +118,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -213,6 +213,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -295,6 +296,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
index 5ecff30818..2654df760f 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
+++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="VideoSoftware"
 	ProjectGUID="{66A4E7BD-E2E8-4373-9B75-8750EB5AE683}"
 	RootNamespace="Plugin_VideoSoftware"
@@ -25,6 +25,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -92,6 +93,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -160,7 +162,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -226,7 +228,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -360,14 +362,6 @@
 			RelativePath=".\Src\Clipper.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWCommandProcessor.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\SWCommandProcessor.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\CPMemLoader.cpp"
 			>
@@ -400,14 +394,6 @@
 			RelativePath=".\Src\EfbInterface.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWGLUtil.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\SWGLUtil.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\HwRasterizer.cpp"
 			>
@@ -416,10 +402,6 @@
 			RelativePath=".\Src\HwRasterizer.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWmain.cpp"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\NativeVertexFormat.h"
 			>
@@ -432,14 +414,6 @@
 			RelativePath=".\Src\OpcodeDecoder.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWPixelEngine.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\SWPixelEngine.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\Rasterizer.cpp"
 			>
@@ -448,14 +422,6 @@
 			RelativePath=".\Src\Rasterizer.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWRenderer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\SWRenderer.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\SetupUnit.cpp"
 			>
@@ -464,14 +430,6 @@
 			RelativePath=".\Src\SetupUnit.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWStatistics.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\SWStatistics.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\stdafx.cpp"
 			>
@@ -512,6 +470,58 @@
 			RelativePath=".\Src\stdafx.h"
 			>
 		</File>
+		<File
+			RelativePath=".\Src\SWCommandProcessor.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWCommandProcessor.h"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWGLUtil.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWGLUtil.h"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWmain.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWPixelEngine.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWPixelEngine.h"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWRenderer.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWRenderer.h"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWStatistics.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWStatistics.h"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWVertexLoader.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Src\SWVertexLoader.h"
+			>
+		</File>
 		<File
 			RelativePath=".\Src\SWVideoConfig.cpp"
 			>
@@ -556,14 +566,6 @@
 			RelativePath=".\Src\Vec3.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\SWVertexLoader.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\SWVertexLoader.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Src\VideoConfigDialog.cpp"
 			>
diff --git a/Source/UnitTests/UnitTests.vcproj b/Source/UnitTests/UnitTests.vcproj
index 74e96a8263..a93651b3e4 100644
--- a/Source/UnitTests/UnitTests.vcproj
+++ b/Source/UnitTests/UnitTests.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="UnitTests"
 	ProjectGUID="{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
 	RootNamespace="UnitTests"
@@ -176,7 +176,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"