diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f43b738b..8437f1f41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,6 +123,14 @@ OPTION(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES "Add MSVC postfix for executable na
 IF(MSVC)
 	FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH  $ENV{ATISTREAMSDKROOT} )
 	IF(AMD_OPENCL_BASE_DIR)
+		#AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable
+		SET(AMD_OPENCL_INCLUDES $ENV{ATISTREAMSDKROOT}include )
+		MESSAGE(${AMD_OPENCL_INCLUDES})
+		IF (CMAKE_CL_64)
+			SET(CMAKE_ATISTREAMSDK_LIBPATH 		$ENV{ATISTREAMSDKROOT}/lib/x86_64 )
+		ELSE(CMAKE_CL_64)
+			SET(CMAKE_ATISTREAMSDK_LIBPATH		$ENV{ATISTREAMSDKROOT}/lib/x86		)
+		ENDIF(CMAKE_CL_64)
 		OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)"	ON)
 	ELSE()
 		OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)"	OFF)
@@ -130,22 +138,14 @@ IF(MSVC)
 	
 	FIND_PATH(NVIDIA_OPENCL_BASE_DIR OpenCL/common/inc/CL/cl.h PATH  $ENV{NVSDKCOMPUTE_ROOT} )
 	IF(NVIDIA_OPENCL_BASE_DIR)
-		IF(INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-			SET(NVIDIA_OPENCL_INCLUDES $ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/inc )
-			IF (CMAKE_CL_64)
-				SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/lib/x64    )
-			ELSE(CMAKE_CL_64)
-				SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/lib/Win32	)
-			ENDIF(CMAKE_CL_64)
-		ELSE()
-			SET(NVIDIA_OPENCL_INCLUDES $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc )
-			IF (CMAKE_CL_64)
-				SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64 )
-			ELSE(CMAKE_CL_64)
-				SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32	)
-			ENDIF(CMAKE_CL_64)
-		ENDIF()
-		SET(NVIDIA_OPENCL_LIBRARIES		${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)
+		SET(NVIDIA_OPENCL_INCLUDES $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc )
+		MESSAGE(${NVIDIA_OPENCL_INCLUDES})
+		IF (CMAKE_CL_64)
+			SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64 )
+		ELSE(CMAKE_CL_64)
+			SET(CMAKE_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32	)
+		ENDIF(CMAKE_CL_64)
+	SET(NVIDIA_OPENCL_LIBRARIES		${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)
 	
 		OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)"	ON)
 	ELSE()
diff --git a/Demos/OpenCLClothDemo/AMD/CMakeLists.txt b/Demos/OpenCLClothDemo/AMD/CMakeLists.txt
index 4140d59f4..943dcc724 100644
--- a/Demos/OpenCLClothDemo/AMD/CMakeLists.txt
+++ b/Demos/OpenCLClothDemo/AMD/CMakeLists.txt
@@ -4,29 +4,13 @@ INCLUDE_DIRECTORIES(
 ${BULLET_PHYSICS_SOURCE_DIR}/src 
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL
+${AMD_OPENCL_INCLUDES}
 )
 
 ADD_DEFINITIONS(-DUSE_AMD_OPENCL)
 ADD_DEFINITIONS(-DCL_PLATFORM_AMD)
 
 
-IF (INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES(		$ENV{==ATISTREAMSDKROOT=}/include )
-	IF (CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH 		$ENV{==ATISTREAMSDKROOT=}/lib/x86_64		)
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH		$ENV{==ATISTREAMSDKROOT=}/lib/x86		)
-	ENDIF(CMAKE_CL_64)
-ELSE()
-	INCLUDE_DIRECTORIES(		$ENV{ATISTREAMSDKROOT}/include	)
-	IF (CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH 		$ENV{ATISTREAMSDKROOT}/lib/x86_64 )
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH		$ENV{ATISTREAMSDKROOT}/lib/x86		)
-	ENDIF(CMAKE_CL_64)
-ENDIF()
-
-
 IF (CMAKE_CL_64)
 	SET(CMAK_GLEW_LIBRARY
 		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib		)
@@ -39,7 +23,6 @@ IF (USE_GLUT)
 	LINK_LIBRARIES(
 		OpenGLSupport 
 		BulletSoftBodySolvers_OpenCL_AMD
-		BulletSoftBodySolvers_CPU
 		BulletMultiThreaded
 		BulletSoftBody
 		BulletDynamics  
@@ -49,7 +32,7 @@ IF (USE_GLUT)
 		${OPENGL_gl_LIBRARY} 
 		${OPENGL_glu_LIBRARY}
 		${CMAK_GLEW_LIBRARY}
-		${CMAK_ATISTREAMSDK_LIBPATH}/OpenCL.lib
+		${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib
 	)
 
 
@@ -70,31 +53,28 @@ IF (USE_GLUT)
 ELSE (USE_GLUT)
 ENDIF (USE_GLUT)
 
-IF(WIN32)
-IF (CMAKE_CL_64)
-	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-		ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD		POST_BUILD
-					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}	
-					)
-		ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
-					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW64.DLL ${CMAKE_CURRENT_BINARY_DIR})
-	ENDIF()
-ELSE(CMAKE_CL_64)
-	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-		ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
-					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-					)
-		ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
-					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW32.DLL ${CMAKE_CURRENT_BINARY_DIR})
-
-	ENDIF()
-ENDIF(CMAKE_CL_64)
-ENDIF(WIN32)
-
-ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	IF(WIN32)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD		POST_BUILD
+						COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}	
+						)
+			ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
+						COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW64.DLL ${CMAKE_CURRENT_BINARY_DIR})
+		ELSE(CMAKE_CL_64)
+		
+			ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
+						COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+						)
+			ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
+						COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLEW32.DLL ${CMAKE_CURRENT_BINARY_DIR})
+		ENDIF(CMAKE_CL_64)
+	ENDIF(WIN32)
+	ADD_CUSTOM_COMMAND(	TARGET AppOpenCLClothDemo_AMD	POST_BUILD
 			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/amdFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
 			COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/atiFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
-			)
+	)
+ENDIF(NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 
 IF (UNIX)
   TARGET_LINK_LIBRARIES(AppOpenCLClothDemo_AMD pthread)
diff --git a/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt b/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt
index f6731b5a7..244b3566f 100644
--- a/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt
+++ b/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt
@@ -23,7 +23,6 @@ IF (USE_GLUT)
 	LINK_LIBRARIES(
 		OpenGLSupport 
 		BulletSoftBodySolvers_OpenCL_NVidia
-		BulletSoftBodySolvers_CPU
 		BulletMultiThreaded
 		BulletSoftBody
 		BulletDynamics  
diff --git a/Demos/ParticlesOpenCL/AMD/CMakeLists.txt b/Demos/ParticlesOpenCL/AMD/CMakeLists.txt
index f4c4422b6..564bdfdbc 100644
--- a/Demos/ParticlesOpenCL/AMD/CMakeLists.txt
+++ b/Demos/ParticlesOpenCL/AMD/CMakeLists.txt
@@ -4,29 +4,13 @@ INCLUDE_DIRECTORIES(
 ${BULLET_PHYSICS_SOURCE_DIR}/src 
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL
+${AMD_OPENCL_INCLUDES}
 )
 
 ADD_DEFINITIONS(-DUSE_AMD_OPENCL)
 ADD_DEFINITIONS(-DCL_PLATFORM_AMD)
 
 
-IF (INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES(		$ENV{==ATISTREAMSDKROOT=}/include )
-	IF (CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH 		$ENV{==ATISTREAMSDKROOT=}/lib/x86_64		)
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH		$ENV{==ATISTREAMSDKROOT=}/lib/x86		)
-	ENDIF(CMAKE_CL_64)
-ELSE()
-	INCLUDE_DIRECTORIES(		$ENV{ATISTREAMSDKROOT}/include	)
-	IF (CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH 		$ENV{ATISTREAMSDKROOT}/lib/x86_64 )
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_ATISTREAMSDK_LIBPATH		$ENV{ATISTREAMSDKROOT}/lib/x86		)
-	ENDIF(CMAKE_CL_64)
-ENDIF()
-
-
 IF (CMAKE_CL_64)
 	SET(CMAK_GLEW_LIBRARY
 		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib		)
@@ -46,7 +30,7 @@ IF (USE_GLUT)
 		${OPENGL_gl_LIBRARY} 
 		${OPENGL_glu_LIBRARY}
 		${CMAK_GLEW_LIBRARY}
-		${CMAK_ATISTREAMSDK_LIBPATH}/OpenCL.lib
+		${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib
 	)
 
 
diff --git a/Demos/ParticlesOpenCL/MiniCL/MiniCLTaskWrap.cpp b/Demos/ParticlesOpenCL/MiniCL/MiniCLTaskWrap.cpp
index b6b135e57..9f0c0232f 100644
--- a/Demos/ParticlesOpenCL/MiniCL/MiniCLTaskWrap.cpp
+++ b/Demos/ParticlesOpenCL/MiniCL/MiniCLTaskWrap.cpp
@@ -16,6 +16,9 @@ subject to the following restrictions:
 
 #include <MiniCL/cl_MiniCL_Defs.h>
 
+#define MSTRINGIFY(A) A
+#define LOCAL_SIZE_MAX 1024U
+
 #include "../ParticlesOCL.cl"
 
 MINICL_REGISTER(kComputeCellId)
diff --git a/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt b/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
index 4131b4071..c3665737c 100644
--- a/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
+++ b/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
@@ -4,25 +4,10 @@ INCLUDE_DIRECTORIES(
 ${BULLET_PHYSICS_SOURCE_DIR}/src 
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL
+${NVIDIA_OPENCL_INCLUDES}
 )
 
 
-IF(INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES( $ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/inc	)
-	IF (CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/lib/x64    )
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/lib/Win32	)
-	ENDIF(CMAKE_CL_64)
-ELSE()
-	INCLUDE_DIRECTORIES( $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc	)
-	IF (CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64 )
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32	)
-	ENDIF(CMAKE_CL_64)
-ENDIF()
-
 IF (CMAKE_CL_64)
 	SET(CMAK_GLEW_LIBRARY		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib		)
 ELSE(CMAKE_CL_64)
diff --git a/Demos/ParticlesOpenCL/ParticlesOCL.cl b/Demos/ParticlesOpenCL/ParticlesOCL.cl
index e8ddddbfc..2e80e3a5d 100644
--- a/Demos/ParticlesOpenCL/ParticlesOCL.cl
+++ b/Demos/ParticlesOpenCL/ParticlesOCL.cl
@@ -1,3 +1,5 @@
+MSTRINGIFY(
+
 /*
 Bullet Continuous Collision Detection and Physics Library, http://bulletphysics.org
 Copyright (C) 2006 - 2009 Sony Computer Entertainment Inc. 
@@ -13,12 +15,6 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#if defined(GUID_ARG)
-	extern int gMiniCLNumOutstandingTasks;
-#else
-	#define GUID_ARG 
-	#define GUID_ARG_VAL
-#endif
 
 
 int4 getGridPos(float4 worldPos, __global float4* pParams)
@@ -313,8 +309,7 @@ __kernel void kCollideParticles(int numParticles,
  * 
  */
 
-//#define LOCAL_SIZE_LIMIT 1024U
-#define LOCAL_SIZE_MAX 1024U
+
 
 inline void ComparatorPrivate(int2* keyA, int2* keyB, uint dir)
 {
@@ -469,3 +464,4 @@ __kernel void kBitonicSortCellIdMergeLocal(__global int2* pKey, uint arrayLength
     pKey[(localSizeLimit / 2)] = l_key[get_local_id(0) + (localSizeLimit / 2)];
 }
 
+);
diff --git a/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp b/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
index f35e44d37..728cc94bf 100644
--- a/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
+++ b/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
@@ -45,6 +45,15 @@ subject to the following restrictions:
 #include "btParticlesDynamicsWorld.h"
 #include "GL_DialogWindow.h"
 
+//when loading from disk, you need to remove the 'MSTRINGIFY' line at the start, and ); at the end of the .cl file
+
+#define LOAD_FROM_MEMORY
+#ifdef LOAD_FROM_MEMORY
+#define MSTRINGIFY(A) #A
+static char* source= 
+#include "ParticlesOCL.cl"
+#endif //LOAD_FROM_MEMORY
+
 btParticlesDynamicsWorld::~btParticlesDynamicsWorld()
 {
 }
@@ -343,6 +352,12 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
 	}
 	// Program Setup
 	size_t program_length;
+
+
+#ifdef LOAD_FROM_MEMORY
+	program_length = strlen(source);
+#else
+
 	char* fileName = "ParticlesOCL.cl";
 	FILE * fp = fopen(fileName, "rb");
 	char newFileName[512];
@@ -389,12 +404,29 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
 
 	// create the program
 	printf("OpenCL compiles %s ...", fileName);
+
+#endif //LOAD_FROM_MEMORY
+
+
+	//printf("%s\n", source);
+
 	m_cpProgram = clCreateProgramWithSource(m_cxMainContext, 1, (const char**)&source, &program_length, &ciErrNum);
 	oclCHECKERROR(ciErrNum, CL_SUCCESS);
+#ifndef LOAD_FROM_MEMORY
 	free(source);
+#endif //LOAD_FROM_MEMORY
 
+	//#define LOCAL_SIZE_LIMIT 1024U
+#define LOCAL_SIZE_MAX 1024U
+
+		    // Build the program with 'mad' Optimization option
+#ifdef MAC
+	char* flags = "-I. -DLOCAL_SIZE_MAX=1024U -cl-mad-enable -DMAC -DGUID_ARG";
+#else
+	const char* flags = "-I. -DLOCAL_SIZE_MAX=1024U -DGUID_ARG= ";
+#endif
 	// build the program
-	ciErrNum = clBuildProgram(m_cpProgram, 0, NULL, "-I .", NULL, NULL);
+	ciErrNum = clBuildProgram(m_cpProgram, 0, NULL, flags, NULL, NULL);
 	if(ciErrNum != CL_SUCCESS)
 	{
 		// write out standard error
diff --git a/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt b/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt
index 8b0f989ea..1ee438ccf 100644
--- a/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt
+++ b/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt
@@ -1,24 +1,8 @@
 
 
-
-IF (INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES(		$ENV{==ATISTREAMSDKROOT=}/include )
-	IF (CMAKE_CL_64)
-		SET(CMAKE_ATISTREAMSDK_LIBPATH 		$ENV{==ATISTREAMSDKROOT=}/lib/x86_64		)
-	ELSE(CMAKE_CL_64)
-		SET(CMAKE_ATISTREAMSDK_LIBPATH		$ENV{==ATISTREAMSDKROOT=}/lib/x86		)
-	ENDIF(CMAKE_CL_64)
-ELSE()
-	INCLUDE_DIRECTORIES(		$ENV{ATISTREAMSDKROOT}/include	)
-	IF (CMAKE_CL_64)
-		SET(CMAKE_ATISTREAMSDK_LIBPATH 		$ENV{ATISTREAMSDKROOT}/lib/x86_64 )
-	ELSE(CMAKE_CL_64)
-		SET(CMAKE_ATISTREAMSDK_LIBPATH		$ENV{ATISTREAMSDKROOT}/lib/x86		)
-	ENDIF(CMAKE_CL_64)
-ENDIF()
-
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src 
+	${BULLET_PHYSICS_SOURCE_DIR}/src 
+	${AMD_OPENCL_INCLUDES}
 )
 
 LINK_LIBRARIES(
diff --git a/Demos/VectorAdd_OpenCL/NVidia/CMakeLists.txt b/Demos/VectorAdd_OpenCL/NVidia/CMakeLists.txt
index 84da94cfc..3b377e092 100644
--- a/Demos/VectorAdd_OpenCL/NVidia/CMakeLists.txt
+++ b/Demos/VectorAdd_OpenCL/NVidia/CMakeLists.txt
@@ -1,24 +1,10 @@
 
 
 
-IF(INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES( $ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/inc	)
-	IF (CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/lib/x64    )
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/lib/Win32	)
-	ENDIF(CMAKE_CL_64)
-ELSE()
-	INCLUDE_DIRECTORIES( $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc	)
-	IF (CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/x64 )
-	ELSE(CMAKE_CL_64)
-		SET(CMAK_NVSDKCOMPUTE_LIBPATH		$ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/lib/Win32	)
-	ENDIF(CMAKE_CL_64)
-ENDIF()
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src 
+	${BULLET_PHYSICS_SOURCE_DIR}/src 
+	${NVIDIA_OPENCL_INCLUDES}
 )
 
 LINK_LIBRARIES(
diff --git a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt
index 8664eddf9..10cd4dfe4 100644
--- a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt
+++ b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt
@@ -1,19 +1,13 @@
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+	${AMD_OPENCL_INCLUDES}
 )
 
 ADD_DEFINITIONS(-DUSE_AMD_OPENCL)
 ADD_DEFINITIONS(-DCL_PLATFORM_AMD)
 
 
-IF (INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES(		$ENV{==ATISTREAMSDKROOT=}/include )
-ELSE()
-	INCLUDE_DIRECTORIES(		$ENV{ATISTREAMSDKROOT}/include	)
-ENDIF()
-
-
 
 SET(BulletSoftBodyOpenCLSolvers_SRCS
 	../btSoftBodySolver_OpenCL.cpp
diff --git a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt
index 9b5ef7030..ce38adfc7 100644
--- a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt
+++ b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt
@@ -1,17 +1,10 @@
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src
+	${BULLET_PHYSICS_SOURCE_DIR}/src
+	${NVIDIA_OPENCL_INCLUDES}
 )
 
 
-
-IF(INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
-	INCLUDE_DIRECTORIES( $ENV{==NVSDKCOMPUTE_ROOT=}/OpenCL/common/inc	)
-ELSE()
-	INCLUDE_DIRECTORIES( $ENV{NVSDKCOMPUTE_ROOT}/OpenCL/common/inc	)
-ENDIF()
-
-
 SET(BulletSoftBodyOpenCLSolvers_SRCS
 	../btSoftBodySolver_OpenCL.cpp
 )