diff --git a/src/BulletMultiThreaded/Makefile.original b/src/BulletMultiThreaded/Makefile.original
index e62bda04f..cff0cb336 100644
--- a/src/BulletMultiThreaded/Makefile.original
+++ b/src/BulletMultiThreaded/Makefile.original
@@ -29,7 +29,7 @@ else
   SPU_DEFFLAGS= -DUSE_LIBSPE2 -D__SPU__
 endif
 SPU_GCC=$(USE_CCACHE) /usr/bin/spu-gcc
-SPU_INCLUDEDIR= -I. -I$(CELL_SYSROOT)/usr/spu/include -I../../src -I$(NARROWPHASEDIR)
+SPU_INCLUDEDIR= -Ivectormath/scalar/cpp -I. -I$(CELL_SYSROOT)/usr/spu/include -I../../src -I$(NARROWPHASEDIR)
 #SPU_CFLAGS= $(DEBUGFLAG) -W -Wall -Winline -Os -c -include spu_intrinsics.h -include stdbool.h
 SPU_CFLAGS= $(DEBUGFLAG) -W -Wall -Winline -O3 -mbranch-hints -fomit-frame-pointer -ftree-vectorize -finline-functions -ftree-vect-loop-version -ftree-loop-optimize -ffast-math -fno-rtti -fno-exceptions -c -include spu_intrinsics.h -include stdbool.h
 
@@ -60,6 +60,9 @@ MakeOut :
 SpuTaskFile : MakeOut
 	$(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/SpuTaskFile.o $(SPU_TASKFILE).cpp
 
+boxBoxDistance : MakeOut
+	$(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp
+
 SpuFakeDma : MakeOut
 	$(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp
 
@@ -131,13 +134,14 @@ SpuSampleTaskProcess : MakeOut
 	
 
 
-spu : SpuFakeDma SpuContactManifoldCollisionAlgorithm_spu SpuContactResult SpuTaskFile \
+spu : boxBoxDistance SpuFakeDma SpuContactManifoldCollisionAlgorithm_spu SpuContactResult SpuTaskFile \
       SpuGjkPairDetector SpuMinkowskiPenetrationDepthSolver SpuVoronoiSimplexSolver SpuCollisionShapes \
       btPersistentManifold btOptimizedBvh btCollisionObject btTriangleCallback btTriangleIndexVertexArray \
       btStridingMeshInterface btAlignedAllocator
 	$(SPU_GCC) -o $(OUTDIR)/spuCollision.elf \
                             $(OUTDIR)/SpuTaskFile.o \
                             $(OUTDIR)/SpuFakeDma.o \
+			    $(OUTDIR)/boxBoxDistance.o \
                             $(OUTDIR)/SpuContactManifoldCollisionAlgorithm_spu.o \
                             $(OUTDIR)/SpuContactResult.o \
                             $(OUTDIR)/SpuCollisionShapes.o \
diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
index 001a26663..513a4c3ba 100644
--- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
+++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
@@ -90,8 +90,10 @@ bool gUseEpa = false;
 #include <LibSN_SPU.h>
 #endif //USE_SN_TUNER
 
-#if defined (__SPU__) || defined (USE_LIBSPE2)
+#if defined (__SPU__) && !defined (USE_LIBSPE2)
 #include <spu_printf.h>
+#elif defined (USE_LIBSPE2)
+#define spu_printf(a)
 #else
 #define IGNORE_ALIGNMENT 1
 #include <stdio.h>