diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp
index 9f6b372ec..6ae04f5ff 100644
--- a/Demos/OpenGL/DemoApplication.cpp
+++ b/Demos/OpenGL/DemoApplication.cpp
@@ -13,6 +13,7 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
+
 #include "DemoApplication.h"
 #include "LinearMath/btIDebugDraw.h"
 #include "BulletDynamics/Dynamics/btDynamicsWorld.h"
diff --git a/Extras/Jamfile b/Extras/Jamfile
index aad15335e..06ef45425 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -4,4 +4,4 @@ SubInclude TOP Extras PhysicsInterface ;
 SubInclude TOP Extras ConvexDecomposition ;
 SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras LibXML ;
-
+SubInclude TOP Extras GPUphysics ;
diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
index 808a81838..6e964184f 100644
--- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
+++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
@@ -31,11 +31,11 @@ class BP_Proxy;
 ///todo: fill all the empty CcdPhysicsController methods, hook them up to the btRigidBody class
 
 //'temporarily' global variables
-float	gDeactivationTime = 2.f;
-bool	gDisableDeactivation = false;
+extern float	gDeactivationTime;
+extern bool	gDisableDeactivation;
 
-float gLinearSleepingTreshold = 0.8f;
-float gAngularSleepingTreshold = 1.0f;
+extern float gLinearSleepingTreshold;
+extern float gAngularSleepingTreshold;
 
 #include "BulletDynamics/Dynamics/btMassProps.h"
 
diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
index 912325aaf..cd782a86f 100644
--- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
+++ b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
@@ -38,6 +38,7 @@ subject to the following restrictions:
 #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
 
 
+
 //profiling/timings
 #include "LinearMath/btQuickprof.h"
 
diff --git a/src/BulletDynamics/Dynamics/btRigidBody.cpp b/src/BulletDynamics/Dynamics/btRigidBody.cpp
index 75f1ee8be..83b9ae432 100644
--- a/src/BulletDynamics/Dynamics/btRigidBody.cpp
+++ b/src/BulletDynamics/Dynamics/btRigidBody.cpp
@@ -20,7 +20,12 @@ subject to the following restrictions:
 #include <LinearMath/btTransformUtil.h>
 
 float gLinearAirDamping = 1.f;
+//'temporarily' global variables
+float	gDeactivationTime = 2.f;
+bool	gDisableDeactivation = false;
 
+float gLinearSleepingTreshold = 0.8f;
+float gAngularSleepingTreshold = 1.0f;
 static int uniqueId = 0;
 
 btRigidBody::btRigidBody( const btMassProps& massProps,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution)
diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt
index 85d435f84..b95461675 100644
--- a/src/LinearMath/CMakeLists.txt
+++ b/src/LinearMath/CMakeLists.txt
@@ -4,6 +4,6 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src }
 )
 
 ADD_LIBRARY(LibLinearMath
-GenQuickprof.cpp
+btQuickprof.cpp
 )