diff --git a/msvc/2005_nvidia_opencl/Demos/OpenCLClothDemo/NVidia/AppOpenCLClothDemo_NVidia.vcproj b/msvc/2005_nvidia_opencl/Demos/OpenCLClothDemo/NVidia/AppOpenCLClothDemo_NVidia.vcproj
index 38fb1f9ab..abef3dbbd 100644
--- a/msvc/2005_nvidia_opencl/Demos/OpenCLClothDemo/NVidia/AppOpenCLClothDemo_NVidia.vcproj
+++ b/msvc/2005_nvidia_opencl/Demos/OpenCLClothDemo/NVidia/AppOpenCLClothDemo_NVidia.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -102,7 +102,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -162,7 +162,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -223,7 +223,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
diff --git a/msvc/2005_nvidia_opencl/Demos/ParticlesOpenCL/NVidia/AppParticlesOCL_Nv.vcproj b/msvc/2005_nvidia_opencl/Demos/ParticlesOpenCL/NVidia/AppParticlesOCL_Nv.vcproj
index ceb5114fd..85d42f39b 100644
--- a/msvc/2005_nvidia_opencl/Demos/ParticlesOpenCL/NVidia/AppParticlesOCL_Nv.vcproj
+++ b/msvc/2005_nvidia_opencl/Demos/ParticlesOpenCL/NVidia/AppParticlesOCL_Nv.vcproj
@@ -54,7 +54,7 @@
 				AdditionalOptions=" /Zm1000 /fp:fast"
 				Optimization="0"
 				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Debug\&quot;"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Debug\&quot;"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -157,7 +157,7 @@
 				AdditionalOptions=" /Zm1000 /fp:fast"
 				Optimization="2"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Release\&quot;"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -175,7 +175,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Release\&quot;"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -257,7 +257,7 @@
 				AdditionalOptions=" /Zm1000 /fp:fast"
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -357,7 +357,7 @@
 				AdditionalOptions=" /Zm1000 /fp:fast"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
@@ -376,7 +376,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
diff --git a/msvc/2005_nvidia_opencl/Demos/VectorAdd_OpenCL/NVidia/AppVectorAdd_NVidia.vcproj b/msvc/2005_nvidia_opencl/Demos/VectorAdd_OpenCL/NVidia/AppVectorAdd_NVidia.vcproj
index d962f7e26..e0a2d140e 100644
--- a/msvc/2005_nvidia_opencl/Demos/VectorAdd_OpenCL/NVidia/AppVectorAdd_NVidia.vcproj
+++ b/msvc/2005_nvidia_opencl/Demos/VectorAdd_OpenCL/NVidia/AppVectorAdd_NVidia.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -102,7 +102,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -162,7 +162,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -223,7 +223,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
diff --git a/msvc/2005_nvidia_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/BulletSoftBodySolvers_OpenCL_NVidia.vcproj b/msvc/2005_nvidia_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/BulletSoftBodySolvers_OpenCL_NVidia.vcproj
index 749f5258c..137969d20 100644
--- a/msvc/2005_nvidia_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/BulletSoftBodySolvers_OpenCL_NVidia.vcproj
+++ b/msvc/2005_nvidia_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/BulletSoftBodySolvers_OpenCL_NVidia.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -92,7 +92,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -143,7 +143,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -176,7 +176,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -195,7 +195,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(NVSDKCOMPUTE_ROOT)\OpenCL\common\inc&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
diff --git a/msvc/2008_amd_opencl/Demos/OpenCLClothDemo/AMD/AppOpenCLClothDemo_AMD.vcproj b/msvc/2008_amd_opencl/Demos/OpenCLClothDemo/AMD/AppOpenCLClothDemo_AMD.vcproj
index 58816b15f..2b5843094 100644
--- a/msvc/2008_amd_opencl/Demos/OpenCLClothDemo/AMD/AppOpenCLClothDemo_AMD.vcproj
+++ b/msvc/2008_amd_opencl/Demos/OpenCLClothDemo/AMD/AppOpenCLClothDemo_AMD.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Debug\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\Debug\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\Debug\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\Debug\BulletSoftBody.lib ..\..\..\src\BulletDynamics\Debug\BulletDynamics.lib ..\..\..\src\BulletCollision\Debug\BulletCollision.lib ..\..\..\src\LinearMath\Debug\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Debug\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\Debug\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\Debug\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\Debug\BulletSoftBody.lib ..\..\..\src\BulletDynamics\Debug\BulletDynamics.lib ..\..\..\src\BulletCollision\Debug\BulletCollision.lib ..\..\..\src\LinearMath\Debug\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppOpenCLClothDemo_AMD_Debug.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -102,7 +102,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -124,7 +124,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Release\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\Release\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\Release\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\Release\BulletSoftBody.lib ..\..\..\src\BulletDynamics\Release\BulletDynamics.lib ..\..\..\src\BulletCollision\Release\BulletCollision.lib ..\..\..\src\LinearMath\Release\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Release\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\Release\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\Release\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\Release\BulletSoftBody.lib ..\..\..\src\BulletDynamics\Release\BulletDynamics.lib ..\..\..\src\BulletCollision\Release\BulletCollision.lib ..\..\..\src\LinearMath\Release\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppOpenCLClothDemo_AMD.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -162,7 +162,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -184,7 +184,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\MinSizeRel\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\MinSizeRel\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\MinSizeRel\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\MinSizeRel\BulletSoftBody.lib ..\..\..\src\BulletDynamics\MinSizeRel\BulletDynamics.lib ..\..\..\src\BulletCollision\MinSizeRel\BulletCollision.lib ..\..\..\src\LinearMath\MinSizeRel\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\MinSizeRel\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\MinSizeRel\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\MinSizeRel\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\MinSizeRel\BulletSoftBody.lib ..\..\..\src\BulletDynamics\MinSizeRel\BulletDynamics.lib ..\..\..\src\BulletCollision\MinSizeRel\BulletCollision.lib ..\..\..\src\LinearMath\MinSizeRel\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppOpenCLClothDemo_AMD_MinsizeRel.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -223,7 +223,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -245,7 +245,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\RelWithDebInfo\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\RelWithDebInfo\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\RelWithDebInfo\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\RelWithDebInfo\BulletSoftBody.lib ..\..\..\src\BulletDynamics\RelWithDebInfo\BulletDynamics.lib ..\..\..\src\BulletCollision\RelWithDebInfo\BulletCollision.lib ..\..\..\src\LinearMath\RelWithDebInfo\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\RelWithDebInfo\OpenGLSupport.lib ..\..\..\src\BulletMultiThreaded\GpuSoftBodySolvers\OpenCL\AMD\RelWithDebInfo\BulletSoftBodySolvers_OpenCL_AMD.lib ..\..\..\src\BulletMultiThreaded\RelWithDebInfo\BulletMultiThreaded.lib ..\..\..\src\BulletSoftBody\RelWithDebInfo\BulletSoftBody.lib ..\..\..\src\BulletDynamics\RelWithDebInfo\BulletDynamics.lib ..\..\..\src\BulletCollision\RelWithDebInfo\BulletCollision.lib ..\..\..\src\LinearMath\RelWithDebInfo\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppOpenCLClothDemo_AMD_RelWithDebugInfo.exe"
 				Version="0.0"
 				LinkIncremental="1"
diff --git a/msvc/2008_amd_opencl/Demos/ParticlesOpenCL/AMD/AppParticlesOCL_AMD.vcproj b/msvc/2008_amd_opencl/Demos/ParticlesOpenCL/AMD/AppParticlesOCL_AMD.vcproj
index ce65a989c..d65a5865b 100644
--- a/msvc/2008_amd_opencl/Demos/ParticlesOpenCL/AMD/AppParticlesOCL_AMD.vcproj
+++ b/msvc/2008_amd_opencl/Demos/ParticlesOpenCL/AMD/AppParticlesOCL_AMD.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Debug\OpenGLSupport.lib ..\..\..\src\BulletDynamics\Debug\BulletDynamics.lib ..\..\..\src\BulletCollision\Debug\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\Debug\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Debug\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Debug\OpenGLSupport.lib ..\..\..\src\BulletDynamics\Debug\BulletDynamics.lib ..\..\..\src\BulletCollision\Debug\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\Debug\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Debug\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppParticlesOCL_AMD_Debug.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -102,7 +102,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -124,7 +124,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Release\OpenGLSupport.lib ..\..\..\src\BulletDynamics\Release\BulletDynamics.lib ..\..\..\src\BulletCollision\Release\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\Release\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Release\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\Release\OpenGLSupport.lib ..\..\..\src\BulletDynamics\Release\BulletDynamics.lib ..\..\..\src\BulletCollision\Release\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\Release\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Release\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppParticlesOCL_AMD.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -162,7 +162,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -184,7 +184,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\MinSizeRel\OpenGLSupport.lib ..\..\..\src\BulletDynamics\MinSizeRel\BulletDynamics.lib ..\..\..\src\BulletCollision\MinSizeRel\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\MinSizeRel\BulletMultiThreaded.lib ..\..\..\src\LinearMath\MinSizeRel\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\MinSizeRel\OpenGLSupport.lib ..\..\..\src\BulletDynamics\MinSizeRel\BulletDynamics.lib ..\..\..\src\BulletCollision\MinSizeRel\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\MinSizeRel\BulletMultiThreaded.lib ..\..\..\src\LinearMath\MinSizeRel\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppParticlesOCL_AMD_MinsizeRel.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -223,7 +223,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;..\..\..\..\..\Demos\SharedOpenCL;..\..\..\..\..\Demos\OpenGL;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -245,7 +245,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\RelWithDebInfo\OpenGLSupport.lib ..\..\..\src\BulletDynamics\RelWithDebInfo\BulletDynamics.lib ..\..\..\src\BulletCollision\RelWithDebInfo\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\RelWithDebInfo\BulletMultiThreaded.lib ..\..\..\src\LinearMath\RelWithDebInfo\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\OpenGL\RelWithDebInfo\OpenGLSupport.lib ..\..\..\src\BulletDynamics\RelWithDebInfo\BulletDynamics.lib ..\..\..\src\BulletCollision\RelWithDebInfo\BulletCollision.lib ..\..\..\src\BulletMultiThreaded\RelWithDebInfo\BulletMultiThreaded.lib ..\..\..\src\LinearMath\RelWithDebInfo\LinearMath.lib ..\..\..\..\..\Glut\glut32.lib opengl32.lib glu32.lib ..\..\..\..\..\Glut\glew32.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppParticlesOCL_AMD_RelWithDebugInfo.exe"
 				Version="0.0"
 				LinkIncremental="1"
diff --git a/msvc/2008_amd_opencl/Demos/VectorAdd_OpenCL/AMD/AppVectorAdd_AMD.vcproj b/msvc/2008_amd_opencl/Demos/VectorAdd_OpenCL/AMD/AppVectorAdd_AMD.vcproj
index 77c2913cc..d0709a76f 100644
--- a/msvc/2008_amd_opencl/Demos/VectorAdd_OpenCL/AMD/AppVectorAdd_AMD.vcproj
+++ b/msvc/2008_amd_opencl/Demos/VectorAdd_OpenCL/AMD/AppVectorAdd_AMD.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\Debug\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Debug\LinearMath.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\Debug\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Debug\LinearMath.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppVectorAdd_AMD_Debug.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -84,7 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -102,7 +102,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -124,7 +124,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\Release\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Release\LinearMath.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\Release\BulletMultiThreaded.lib ..\..\..\src\LinearMath\Release\LinearMath.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppVectorAdd_AMD.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -162,7 +162,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -184,7 +184,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\MinSizeRel\BulletMultiThreaded.lib ..\..\..\src\LinearMath\MinSizeRel\LinearMath.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\MinSizeRel\BulletMultiThreaded.lib ..\..\..\src\LinearMath\MinSizeRel\LinearMath.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppVectorAdd_AMD_MinsizeRel.exe"
 				Version="0.0"
 				LinkIncremental="1"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -223,7 +223,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\Glut;..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -245,7 +245,7 @@
 				Name="VCLinkerTool"
 				LinkLibraryDependencies="true"
 				AdditionalOptions=" /STACK:10000000 /machine:X86 /debug"
-				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\RelWithDebInfo\BulletMultiThreaded.lib ..\..\..\src\LinearMath\RelWithDebInfo\LinearMath.lib $(ATISTREAMSDKROOT)lib\x86\OpenCL.lib "
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  ..\..\..\src\BulletMultiThreaded\RelWithDebInfo\BulletMultiThreaded.lib ..\..\..\src\LinearMath\RelWithDebInfo\LinearMath.lib &quot;$(ATISTREAMSDKROOT)lib\x86\OpenCL.lib&quot; "
 				OutputFile="..\..\..\..\..\AppVectorAdd_AMD_RelWithDebugInfo.exe"
 				Version="0.0"
 				LinkIncremental="1"
diff --git a/msvc/2008_amd_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/BulletSoftBodySolvers_OpenCL_AMD.vcproj b/msvc/2008_amd_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/BulletSoftBodySolvers_OpenCL_AMD.vcproj
index 97cbab4cc..9d76690e6 100644
--- a/msvc/2008_amd_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/BulletSoftBodySolvers_OpenCL_AMD.vcproj
+++ b/msvc/2008_amd_opencl/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/BulletSoftBodySolvers_OpenCL_AMD.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				BasicRuntimeChecks="3"
 				CompileAs="2"
 				DebugInformationFormat="3"
@@ -41,7 +41,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,_DEBUG,_DEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -92,7 +92,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				EnableEnhancedInstructionSet="1"
 				ExceptionHandling="1"
@@ -143,7 +143,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -176,7 +176,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions=" /Zm1000 /fp:fast"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				CompileAs="2"
 				DebugInformationFormat="3"
 				EnableEnhancedInstructionSet="1"
@@ -195,7 +195,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;$(ATISTREAMSDKROOT)include;"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\..\Glut;..\..\..\..\..\..\..\src;&quot;$(ATISTREAMSDKROOT)include&quot;;"
 				PreprocessorDefinitions="WIN32,NDEBUG,USE_GRAPHICAL_BENCHMARK,_IRR_STATIC_LIB_,_CRT_SECURE_NO_WARNINGS,_CRT_SECURE_NO_DEPRECATE,_SCL_SECURE_NO_WARNINGS,USE_AMD_OPENCL,CL_PLATFORM_AMD,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
 				Name="VCMIDLTool"