diff --git a/Demos/OpenCLClothDemo/Apple/CMakeLists.txt b/Demos/OpenCLClothDemo/Apple/CMakeLists.txt
index 40363be82..18a10d455 100644
--- a/Demos/OpenCLClothDemo/Apple/CMakeLists.txt
+++ b/Demos/OpenCLClothDemo/Apple/CMakeLists.txt
@@ -17,7 +17,6 @@ IF (USE_GLUT)
 	LINK_LIBRARIES(
 		OpenGLSupport 
 		BulletSoftBodySolvers_OpenCL_Apple
-		BulletSoftBodySolvers_CPU
 		BulletMultiThreaded
 		BulletSoftBody
 		BulletDynamics  
diff --git a/Demos/SharedOpenCL/btOpenCLUtils.cpp b/Demos/SharedOpenCL/btOpenCLUtils.cpp
index 0e79acdc2..17638f7a7 100644
--- a/Demos/SharedOpenCL/btOpenCLUtils.cpp
+++ b/Demos/SharedOpenCL/btOpenCLUtils.cpp
@@ -109,8 +109,8 @@ cl_context btOpenCLUtils::createContextFromPlatform(cl_platform_id platform, cl_
 	* implementation thinks we should be using.     
 	*/
 	cl_context_properties cps[7] = {0,0,0,0,0,0,0};
-
-#ifndef CL_PLATFORM_MINI_CL
+#if defined( _WIN32) && !defined(CL_PLATFORM_MINI_CL)
+//#if !defined (CL_PLATFORM_MINI_CL) && !defined (__APPLE__)
 	cps[0] = CL_CONTEXT_PLATFORM;
 	cps[1] = (cl_context_properties)platform;
 	if (pGLContext && pGLDC)
@@ -120,7 +120,8 @@ cl_context btOpenCLUtils::createContextFromPlatform(cl_platform_id platform, cl_
 		cps[4] = CL_WGL_HDC_KHR;
 		cps[5] = (cl_context_properties)pGLDC;
 	}
-#endif //CL_PLATFORM_MINI_CL
+#endif
+
 	cl_context_properties* cprops = (NULL == platform) ? NULL : cps;
 	retContext = clCreateContextFromType(cprops, 
 		deviceType,                  
diff --git a/config.h.in b/config.h.in
index 11b564d03..043b7bba6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* Architecture is PowerPC */
 #undef ARCH_PPC
 
@@ -79,9 +76,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -100,14 +94,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN