diff --git a/Demos/OpenCLClothDemo/clstuff.cpp b/Demos/OpenCLClothDemo/clstuff.cpp
index 2b7d41287..13692139e 100644
--- a/Demos/OpenCLClothDemo/clstuff.cpp
+++ b/Demos/OpenCLClothDemo/clstuff.cpp
@@ -71,7 +71,8 @@ void initCL( void* glCtx, void* glDC )
 
 	
 	oclCHECKERROR(ciErrNum, CL_SUCCESS);
-	g_cdDevice = btOclGetMaxFlopsDev(g_cxMainContext);
+	g_cdDevice = btOclGetDev(g_cxMainContext,0);
+	
 	
 	btOclPrintDevInfo(g_cdDevice);
 
diff --git a/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp b/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
index f1ae20f0c..ab3183fc9 100644
--- a/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
+++ b/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
@@ -346,7 +346,7 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
 #endif
 	
 		oclCHECKERROR(ciErrNum, CL_SUCCESS);
-		m_cdDevice = btOclGetMaxFlopsDev(m_cxMainContext);
+		m_cdDevice = btOclGetDev(m_cxMainContext,0);
 		
 		btOclPrintDevInfo(m_cdDevice);
 
diff --git a/Demos/SerializeDemo/main.cpp b/Demos/SerializeDemo/main.cpp
index 9a8e6d798..5665975ce 100644
--- a/Demos/SerializeDemo/main.cpp
+++ b/Demos/SerializeDemo/main.cpp
@@ -72,7 +72,7 @@ bool initCL( void* glCtx, void* glDC )
 //#endif
     
     oclCHECKERROR(ciErrNum, CL_SUCCESS);
-    g_cdDevice = btOclGetMaxFlopsDev(g_cxMainContext);
+    g_cdDevice =  btOclGetDev(g_cxMainContext,0);
     
     if ( bDebug ) {
         btOclPrintDevInfo(g_cdDevice);
diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt
index 54ec735c8..4cbefc8c0 100644
--- a/src/LinearMath/CMakeLists.txt
+++ b/src/LinearMath/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(LinearMath_HDRS
 	btConvexHullComputer.h
 	btDefaultMotionState.h
 	btGeometryUtil.h
+	btGrahamScan2dConvexHull.h
 	btHashMap.h
 	btIDebugDraw.h
 	btList.h