diff --git a/Extras/CMakeLists.txt b/Extras/CMakeLists.txt
index cac9bb394..9ccdb3c47 100644
--- a/Extras/CMakeLists.txt
+++ b/Extras/CMakeLists.txt
@@ -1 +1 @@
-SUBDIRS( glui ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils )
+SUBDIRS( glui iff ConvexDecomposition BulletColladaConverter LibXML COLLADA_DOM GIMPACTUtils )
diff --git a/Extras/Jamfile b/Extras/Jamfile
index 2060ae88d..873d27963 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -5,6 +5,7 @@ SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras glui ;
 SubInclude TOP Extras LibXML ;
 SubInclude TOP Extras BulletColladaConverter ;
+SubInclude TOP Extras iff ;
 #SubInclude TOP Extras EPA ;
 #SubInclude TOP Extras ExtraSolid35 ;
 SubInclude TOP Extras GIMPACTUtils ;
diff --git a/Extras/iff/CMakeLists.txt b/Extras/iff/CMakeLists.txt
new file mode 100644
index 000000000..907becda0
--- /dev/null
+++ b/Extras/iff/CMakeLists.txt
@@ -0,0 +1,9 @@
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/iff
+)
+
+ADD_LIBRARY(LibIff
+iff.h 
+iffr.cpp
+iffw.cpp
+)
diff --git a/Extras/iff/Jamfile b/Extras/iff/Jamfile
new file mode 100644
index 000000000..227c363bd
--- /dev/null
+++ b/Extras/iff/Jamfile
@@ -0,0 +1,12 @@
+SubInclude TOP Extras iff iffCheck ;
+
+SubDir TOP Extras iff ;
+
+Library iff : [ Wildcard .  : */.h *.cpp ] : noinstall ;
+CFlags iff : [ FIncludes $(TOP)/Extras/iff ] ;
+LibDepends iff : ;
+
+   MsvcIncDirs iff : 
+	"../../Extras/iff" ;
+
+InstallHeader [ Wildcard *.h ] : iff ;
diff --git a/Extras/iff/iffCheck/iffcheck.cpp b/Extras/iff/iffCheck/iffcheck.cpp
index 973c55edf..b9f604fe0 100644
--- a/Extras/iff/iffCheck/iffcheck.cpp
+++ b/Extras/iff/iffCheck/iffcheck.cpp
@@ -77,13 +77,14 @@ void IFFCheck(char *name)
 	printf("%s\n", IFFPMessages[-iffp]);
 }
 
-void main(int argc,  char **argv)
+int  main(int argc,  char **argv)
 {
 	if (argc != 1+1) {
 		printf("Usage: 'iffcheck filename'\n");
 		exit(0);
 	}
 	IFFCheck(argv[1]);
+	return 0;
 }
 
 /* ---------- Put... ---------------------------------------------------*/
diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
index ee7a005c2..8dbb82a74 100644
--- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
+++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
@@ -27,7 +27,7 @@
 #include "SpuGjkPairDetector.h"
 #include "SpuVoronoiSimplexSolver.h"
 #include "boxBoxDistance.h"
-#include "Util/Vectormath2Bullet.h"
+#include "BulletMultiThreaded/vectormath2bullet.h"
 #include "SpuCollisionShapes.h" //definition of SpuConvexPolyhedronVertexData
 
 #ifdef __SPU__