Index: code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt	(revision 8653)
@@ -1,5 +1,3 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-BUILD_UNIT BulletCollisionBuildUnit.cpp
 
 	BroadphaseCollision/btAxisSweep3.cpp
@@ -84,12 +82,9 @@
 	NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
 	NarrowPhaseCollision/btPersistentManifold.cpp
+	NarrowPhaseCollision/btPolyhedralContactClipping.cpp
 	NarrowPhaseCollision/btRaycastCallback.cpp
 	NarrowPhaseCollision/btSubSimplexConvexCast.cpp
 	NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
 
-END_BUILD_UNIT
-
-    # Raises compiler errors when compiled inside the build unit
-	NarrowPhaseCollision/btPolyhedralContactClipping.cpp
 
 	# Headers
Index: code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt	(revision 8653)
@@ -1,5 +1,3 @@
 ADD_SOURCE_FILES(BULLET_FILES
-
-BUILD_UNIT BulletDynamicsBuildUnit.cpp
 
 	Character/btKinematicCharacterController.cpp
@@ -25,6 +23,4 @@
 	Vehicle/btRaycastVehicle.cpp
 	Vehicle/btWheelInfo.cpp
-
-END_BUILD_UNIT
 
 	# Headers
Index: code/branches/unity_build/src/external/bullet/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/bullet/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/bullet/CMakeLists.txt	(revision 8653)
@@ -32,4 +32,6 @@
   VERSION
     2.78
+  EXCLUDE_FROM_BUILD_UNITS
+    BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
   SOURCE_FILES
     ${BULLET_FILES}
Index: code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt	(revision 8653)
@@ -1,5 +1,4 @@
 ADD_SOURCE_FILES(BULLET_FILES
 
-BUILD_UNIT BulletLinearMathBuildUnit.cpp
 	btAlignedAllocator.cpp
 	btConvexHull.cpp
@@ -8,5 +7,4 @@
 	btQuickprof.cpp
 	btSerializer.cpp
-END_BUILD_UNIT
 
 	# Headers
Index: code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt	(revision 8653)
@@ -23,9 +23,7 @@
   OgreCEGUITexture.h
 
-BUILD_UNIT OgreCEGUIRendererBuildUnit.cpp
   OgreCEGUIRenderer.cpp
   OgreCEGUIResourceProvider.cpp
   OgreCEGUITexture.cpp
-END_BUILD_UNIT
 )
 
Index: code/branches/unity_build/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/ois/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/ois/CMakeLists.txt	(revision 8653)
@@ -34,12 +34,5 @@
   OISObject.h
   OISPrereqs.h
-)
 
-# Put everything into one single build unit (doens't work on OS X though)
-IF(NOT APPLE)
-  ADD_SOURCE_FILES(OIS_FILES BUILD_UNIT OISBuildUnit.cpp)
-ENDIF()
-
-ADD_SOURCE_FILES(OIS_FILES
   OISEffect.cpp
   OISException.cpp
@@ -50,4 +43,5 @@
   OISObject.cpp
 )
+
 IF(WIN32)
   ADD_SUBDIRECTORY(win32)
@@ -58,12 +52,12 @@
 ENDIF()
 
-# Close build unit from above
-IF(NOT APPLE)
-  ADD_SOURCE_FILES(OIS_FILES END_BUILD_UNIT)
-ENDIF()
-
 # MinGW doesn't come with some required Windows headers
 IF(MINGW)
   INCLUDE_DIRECTORIES(${WMI_INCLUDE_DIR})
+ENDIF()
+
+# Apple has problems with OIS and build units
+IF(APPLE)
+  SET(USE_BUILD_UNITS NO_BUILD_UNITS)
 ENDIF()
 
@@ -82,4 +76,5 @@
   LINK_LIBS_LINUX
     X11
+  ${USE_BUILD_UNITS}
   SOURCE_FILES
     ${OIS_FILES}
Index: code/branches/unity_build/src/external/tinyxml/CMakeLists.txt
===================================================================
--- code/branches/unity_build/src/external/tinyxml/CMakeLists.txt	(revision 8652)
+++ code/branches/unity_build/src/external/tinyxml/CMakeLists.txt	(revision 8653)
@@ -24,5 +24,4 @@
   tinyxml.h
 
-BUILD_UNIT TicppBuildUnit.cpp
   ticpp.cpp
   tinystr.cpp
@@ -30,5 +29,4 @@
   tinyxmlerror.cpp
   tinyxmlparser.cpp
-END_BUILD_UNIT
 )
 
