diff --git a/Demos/BspDemo/Jamfile b/Demos/BspDemo/Jamfile
index 10a6d3b06..f97d788c4 100644
--- a/Demos/BspDemo/Jamfile
+++ b/Demos/BspDemo/Jamfile
@@ -1,3 +1,3 @@
 SubDir TOP Demos BspDemo ;
 
-ExtraDemo BspDemo : [ Wildcard *.h *.cpp  ] ;
+BulletDemo BspDemo : [ Wildcard *.h *.cpp  ] ;
diff --git a/Demos/BulletDinoDemo/Jamfile b/Demos/BulletDinoDemo/Jamfile
index 04ace5617..7c39b2c96 100644
--- a/Demos/BulletDinoDemo/Jamfile
+++ b/Demos/BulletDinoDemo/Jamfile
@@ -1,3 +1,3 @@
 SubDir TOP Demos BulletDinoDemo ;
 
-ExtraDemo BulletDino : [ Wildcard *.h *.c  ] ;
+BulletDemo BulletDino : [ Wildcard *.h *.c  ] ;
diff --git a/Demos/ColladaDemo/Jamfile b/Demos/ColladaDemo/Jamfile
index b8d1c3cf2..323e46079 100644
--- a/Demos/ColladaDemo/Jamfile
+++ b/Demos/ColladaDemo/Jamfile
@@ -1,4 +1,30 @@
 SubDir TOP Demos ColladaDemo ;
 
-ExtraDemo ColladaDemo : [ Wildcard *.h *.cpp  ] ;
+#some demos need extra functionality, Collada / ConvexDecomposition etc.
+
+  rule ExtraDemo3
+
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :   colladadom libxml bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Demos/OpenGL ]
+                                [ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
+                                [ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
+                                [ FIncludes $(TOP)/Extras/LibXML ]
+
+          [ FIncludes $(TOP)/Extras/LibXML/include ]
+
+    ;
+
+    MsvcIncDirs $(<) :
+        "../../Demos/OpenGL"
+        "../../Extras/COLLADA_DOM/include"
+        "../../Extras/COLLADA_DOM/include/1.4"
+        "../../Extras/LibXML"
+        "../../Extras/LibXML/include"   ;
+  }
+
+ExtraDemo3 ColladaDemo : [ Wildcard *.h *.cpp  ] ;
+
 MsvcIncDirs ColladaDemo : "../../Extras/FCollada" ;
diff --git a/Demos/ConvexDecompositionDemo/Jamfile b/Demos/ConvexDecompositionDemo/Jamfile
index 66ef90ba8..c1900c1e2 100644
--- a/Demos/ConvexDecompositionDemo/Jamfile
+++ b/Demos/ConvexDecompositionDemo/Jamfile
@@ -1,3 +1,20 @@
 SubDir TOP Demos ConvexDecompositionDemo ;
 
-ExtraDemo ConvexDecompositionDemo : [ Wildcard *.h *.cpp  ] ;
+#some demos need extra functionality, Collada / ConvexDecomposition etc.
+
+  rule ExtraDemo2
+
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :    bulletopenglsupport convexdecomposition bulletdynamics bulletcollision  bulletmath ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Demos/OpenGL ]
+                                [ FIncludes $(TOP)/Extras/ConvexDecomposition ]
+    ;
+
+    MsvcIncDirs $(<) :
+        "../../Demos/OpenGL"
+        "../../Extras/ConvexDecomposition" ;
+  }
+
+ExtraDemo2 ConvexDecompositionDemo : [ Wildcard *.h *.cpp  ] ;
diff --git a/Demos/EPAPenDepthDemo/Jamfile b/Demos/EPAPenDepthDemo/Jamfile
index 56d574e4d..b341af439 100644
--- a/Demos/EPAPenDepthDemo/Jamfile
+++ b/Demos/EPAPenDepthDemo/Jamfile
@@ -1,3 +1,23 @@
 SubDir TOP Demos EPAPenDepthDemo ;
 
-ExtraDemo EPAPenDepthDemo : [ Wildcard *.h *.cpp ../../Extras/ExtraSolid35/*.cpp ../../Extras/EPA/*.cpp  ] ;
+#some demos need extra functionality, Collada / ConvexDecomposition etc.
+
+  rule ExtraDemo4
+
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :   GIMPACTBullet GIMPACT  bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Demos/OpenGL ]
+          [ FIncludes $(TOP)/Extras/GIMPACT/include ]
+          [ FIncludes $(TOP)/Extras/GIMPACTBullet ]
+
+    ;
+
+    MsvcIncDirs $(<) :
+        "../../Demos/OpenGL"
+        "../../Extras/GIMPACT/include"
+        "../../Extras/GIMPACTBullet"   ;
+  }
+
+ExtraDemo4 EPAPenDepthDemo : [ Wildcard *.h *.cpp  ] ;
diff --git a/Demos/Jamfile b/Demos/Jamfile
index c1d78c78b..cd48db070 100644
--- a/Demos/Jamfile
+++ b/Demos/Jamfile
@@ -17,39 +17,10 @@ if $(GLUT.AVAILABLE) = "yes"
 	"../../src" ;
   }
 
-  #some demos need extra functionality, Collada / ConvexDecomposition etc.
-  rule ExtraDemo
-  {
-    Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :   GIMPACTBullet GIMPACT  colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision  bulletmath ;
-    CFlags $(<) :
-          [ FIncludes $(TOP)/Demos/OpenGL ]
-       	  			[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
- 	  			[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
- 	  			[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
-	  			[ FIncludes $(TOP)/Extras/LibXML ]
-          [ FIncludes $(TOP)/Extras/LibXML/include ]
 
 
 
-    ;
-    MsvcIncDirs $(<) :
-        "../../Demos/OpenGL"
-      	"../../Extras/ConvexDecomposition" 
-	"../../Extras/COLLADA_DOM/include"
- 	"../../Extras/COLLADA_DOM/include/1.4"
-	"../../Extras/LibXML"
-        "../../Extras/LibXML/include"	;
-  }
 
-
-
-}
-else
-{
-  rule BulletDemo
-  {
-  }
 }
 
  rule BulletBasicDemo
diff --git a/Demos/MovingConcaveDemo/Jamfile b/Demos/MovingConcaveDemo/Jamfile
index d59ce99a7..1eba954c7 100644
--- a/Demos/MovingConcaveDemo/Jamfile
+++ b/Demos/MovingConcaveDemo/Jamfile
@@ -1,3 +1,23 @@
 SubDir TOP Demos MovingConcaveDemo ;
 
-ExtraDemo MovingConcaveDemo : [ Wildcard *.h *.cpp  ] ;
+  #some demos need extra functionality, Collada / ConvexDecomposition etc.
+
+  rule ExtraDemo1
+
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :   GIMPACTBullet GIMPACT  bulletopenglsupport bulletdynamics bulletcollision  bulletmath ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Demos/OpenGL ]
+       	  [ FIncludes $(TOP)/Extras/GIMPACT/include ]
+ 	  [ FIncludes $(TOP)/Extras/GIMPACTBullet ]
+ 	  		
+    ;
+
+    MsvcIncDirs $(<) :
+        "../../Demos/OpenGL"
+      	"../../Extras/GIMPACT/include" 
+	"../../Extras/GIMPACTBullet"      ;
+  }
+
+ExtraDemo1 MovingConcaveDemo : [ Wildcard *.h *.cpp  ] ;
diff --git a/Extras/COLLADA_DOM/Jamfile b/Extras/COLLADA_DOM/Jamfile
index e3baf1ef6..9676e84cc 100644
--- a/Extras/COLLADA_DOM/Jamfile
+++ b/Extras/COLLADA_DOM/Jamfile
@@ -1,8 +1,9 @@
 SubDir TOP Extras COLLADA_DOM ;
 
-IncludeDir  Extras/COLLADA_DOM/include ;
-IncludeDir Extras/COLLADA_DOM/include/1.4 ;
-IncludeDir Extras/LibXML/include ; 
+
+#IncludeDir  Extras/COLLADA_DOM/include ;
+#IncludeDir Extras/COLLADA_DOM/include/1.4 ;
+#IncludeDir Extras/LibXML/include ; 
 
 Library colladadom : 
 	[ Wildcard src/dae : *.h *.cpp ]
diff --git a/Extras/ConvexDecomposition/Jamfile b/Extras/ConvexDecomposition/Jamfile
index 8ec441bde..38e426f8e 100644
--- a/Extras/ConvexDecomposition/Jamfile
+++ b/Extras/ConvexDecomposition/Jamfile
@@ -1,10 +1,13 @@
 SubDir TOP Extras ConvexDecomposition ;
 
-IncludeDir Extras/ConvexDecomposition ;
 
 Library convexdecomposition : [ Wildcard *.h *.cpp ] ;
+
 CFlags convexdecomposition : [ FIncludes $(TOP)/Extras/Decomposition ] ;
+
 LibDepends convexdecomposition :  ;
 
+MsvcGenConfig ConvexDecomposition.INCDIRS : $(TOP)/Extras/ConvexDecomposition ;
+
 
 InstallHeader [ Wildcard *.h ] : ConvexDecomposition ;
diff --git a/Extras/GPUphysics/GPU_physics.h b/Extras/GPUphysics/GPU_physics.h
index 02c2439fa..55be86342 100644
--- a/Extras/GPUphysics/GPU_physics.h
+++ b/Extras/GPUphysics/GPU_physics.h
@@ -88,15 +88,16 @@
 #include <float.h>
 #include <errno.h>
 
-#include <GL/glew.h>
 
 #if defined(GPUP_MAC_OSX) && !defined (VMDMESA)
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #include <GLUT/glut.h>
+#include <OpenGL/glext.h>
 #else
 #include <GL/glut.h>
 #include <GL/gl.h>
+#include <GL/glew.h>
 #endif
 
 #ifdef DISABLE_GL_ERROR_CHECKS
diff --git a/Extras/GPUphysics/GPU_physics_demo.cpp b/Extras/GPUphysics/GPU_physics_demo.cpp
index 74218f69b..526d9cc98 100644
--- a/Extras/GPUphysics/GPU_physics_demo.cpp
+++ b/Extras/GPUphysics/GPU_physics_demo.cpp
@@ -164,7 +164,10 @@ void initGLcontext ( int argc, char **argv,
   glutKeyboardFunc    ( keybd    ) ;
   glutReshapeFunc     ( reshape  ) ;
 
+#if defined(GPUP_MAC_OSX) && !defined (VMDMESA)
+#else
   glewInit () ;
+#endif
 
   checkVertexTextureSupport ( disableVertexTextureSupport ) ;
 }
diff --git a/Extras/GPUphysics/Jamfile b/Extras/GPUphysics/Jamfile
index 8720a4721..f351be8e0 100644
--- a/Extras/GPUphysics/Jamfile
+++ b/Extras/GPUphysics/Jamfile
@@ -6,18 +6,16 @@ if $(GLUT.AVAILABLE) = "yes"
   rule GPUDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  GLUT ;
+ #   LinkWith $(<) :  GLUT ;
     CFlags $(<) : 
 	  [ FIncludes $(TOP)/Demos/OpenGL ] 
-	  [ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] 
-	  [ FIncludes $(TOP)/Extras/PhysicsInterface/Common ] 
     ;
     MsvcIncDirs $(<) : 
 	"../../Demos/OpenGL" 
 	"../../Extras/PhysicsInterface/CcdPhysics" 
 	"../../Extras/PhysicsInterface/Common" ;
-	ExternalLibs $(<) : GLUT GLEW ;
-
+    
+	ExternalLibs GPUphysics : GLUT ;
   }
 }
 
diff --git a/Extras/GPUphysics/Makefile.Mac b/Extras/GPUphysics/Makefile.Mac
index ead9845eb..6bb068080 100644
--- a/Extras/GPUphysics/Makefile.Mac
+++ b/Extras/GPUphysics/Makefile.Mac
@@ -3,7 +3,7 @@ HDRS  = fboSupport.h shaderSupport.h
 OBJS  = GPU_physics_demo.o fboSupport.o shaderSupport.o clock.o
 
 all: ${OBJS}
-	g++ -framework GLUT -framework OpenGL -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGL -lGLU -o GPU_physics_demo ${OBJS} -L"/System/Library/Frameworks/OpenGL.framework/Libraries"  -lGLU -lGLEW -lGL -lGLU -lobjc
+	g++ -framework GLUT -framework OpenGL -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGL -lGLU -o GPU_physics_demo ${OBJS} -L"/System/Library/Frameworks/OpenGL.framework/Libraries"  -lGLU  -lGL -lGLU -lobjc
 
 shaderSupport.o : shaderSupport.cpp ${HDRS}
 	g++ -c shaderSupport.cpp
diff --git a/Extras/Jamfile b/Extras/Jamfile
index fd275916f..4a17893e0 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -11,4 +11,4 @@ SubInclude TOP Extras GIMPACT ;
 SubInclude TOP Extras GIMPACTBullet ;
 
 #GPUphysics needs 'make', not jam compatible build yet:
-#SubInclude TOP Extras GPUphysics ;
+SubInclude TOP Extras GPUphysics ;
diff --git a/Extras/quickstep/Jamfile b/Extras/quickstep/Jamfile
index 96022ea7a..f073840f4 100644
--- a/Extras/quickstep/Jamfile
+++ b/Extras/quickstep/Jamfile
@@ -1,10 +1,20 @@
 SubDir TOP Extras quickstep ;
 
-IncludeDir Extras/quickstep ;
+#this is a bad global
+#IncludeDir Extras/quickstep ;
 
 Library quickstep : [ Wildcard *.h *.cpp ] ;
+#internal header path to compile quickstep
 CFlags quickstep : [ FIncludes $(TOP)/Extras/quickstep ] ;
-LibDepends quickstep :  ;
+
+#expose header include path for apps that depend on quickstep
+#QUICKSTEP.CFLAGS = [ FIncludes $(TOP)/Extras/quickstep ] ;
+
+#same for msvcgen
+MsvcGenConfig QUICKSTEP.INCDIRS : $(TOP)/Extras/quickstep ;
+
+#for the include paths
+LibDepends quickstep : BulletDynamics ;
 
 
 InstallHeader [ Wildcard *.h ] : quickstep ;