diff --git a/Demos/Jamfile b/Demos/Jamfile
index 93f165630..05174bb3f 100644
--- a/Demos/Jamfile
+++ b/Demos/Jamfile
@@ -8,7 +8,7 @@ if $(GLUT.AVAILABLE) = "yes"
   rule BulletDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  bulletdynamics bulletcollision bulletopenglsupport bulletmath ;
+    LinkWith $(<) :  bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
     CFlags $(<) : 
 	  [ FIncludes $(TOP)/Demos/OpenGL ] 
     ;
@@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes"
   rule ExtraDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   colladadom libxml convexdecomposition bulletdynamics bulletcollision  bulletopenglsupport  bulletmath ;
+    LinkWith $(<) :   colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision  bulletmath ;
     CFlags $(<) :
           [ FIncludes $(TOP)/Demos/OpenGL ]
        	  			[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
diff --git a/Demos/OpenGL/Jamfile b/Demos/OpenGL/Jamfile
index 83ff90a17..c1189a7e4 100644
--- a/Demos/OpenGL/Jamfile
+++ b/Demos/OpenGL/Jamfile
@@ -10,9 +10,13 @@ IncludeDir  Extras/PhysicsInterface/CcdPhysics ;
   Library bulletopenglsupport : 
   [ Wildcard *.h *.cpp ] : noinstall 
 ;
-CFlags bulletopenglsupport :
-[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
-[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
+
+CFlags bulletopenglsupport :
+[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
+[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
 ;
+
+LibDepends bulletopenglsupport : bulletdynamics   ;
+
   ExternalLibs bulletopenglsupport : GLUT ;
 }
diff --git a/Extras/Jamfile b/Extras/Jamfile
index 69cbdd2f2..80c828043 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -3,4 +3,4 @@ SubDir TOP Extras ;
 SubInclude TOP Extras ConvexDecomposition ;
 SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras LibXML ;
-SubInclude TOP Extras GPUphysics ;
+#SubInclude TOP Extras GPUphysics ;
diff --git a/src/BulletCollision/Jamfile b/src/BulletCollision/Jamfile
index 53c325396..0bd322f58 100644
--- a/src/BulletCollision/Jamfile
+++ b/src/BulletCollision/Jamfile
@@ -8,4 +8,6 @@ Library bulletcollision :
   [ Wildcard CollisionShapes : *.h *.cpp ] 
   [ Wildcard NarrowPhaseCollision : *.h *.cpp ] 
 ;
+LibDepends bulletcollision : bulletmath  ;
+
 Recurse InstallHeader : .h  ;
diff --git a/src/BulletDynamics/Jamfile b/src/BulletDynamics/Jamfile
index cce52b671..77632ec1c 100644
--- a/src/BulletDynamics/Jamfile
+++ b/src/BulletDynamics/Jamfile
@@ -6,4 +6,7 @@ Library bulletdynamics :
   [ Wildcard Dynamics : *.h *.cpp ] 
   [ Wildcard Vehicle : *.h *.cpp ] 
 ;
+
+LibDepends bulletdynamics : bulletcollision  ;
+
 Recurse InstallHeader : .h  ;