diff --git a/Extras/iff/CMakeLists.txt b/Extras/iff/CMakeLists.txt
index 16bdd165a..ddc476a93 100644
--- a/Extras/iff/CMakeLists.txt
+++ b/Extras/iff/CMakeLists.txt
@@ -7,3 +7,5 @@ iff.h
 iffr.cpp
 iffw.cpp
 )
+
+SUBDIRS( BulletIffConverter )
diff --git a/Extras/iff/Jamfile b/Extras/iff/Jamfile
index f8db795b3..1157e4970 100644
--- a/Extras/iff/Jamfile
+++ b/Extras/iff/Jamfile
@@ -4,6 +4,8 @@ rule ConsoleIffApp
     Application $(<) : $(>) : noinstall console nomanifest ;
     LinkWith $(<) : iff ;
    LibDepends iffCheck : iff ;
+	LibDepends iffCreateTest : iff ;
+
     CFlags $(<) :
           [ FIncludes $(TOP)/Extras/iff ]
            ;
@@ -26,4 +28,5 @@ LibDepends iff : ;
 InstallHeader [ Wildcard *.h ] : iff ;
 
 SubInclude TOP Extras iff iffCheck ;
-
+SubInclude TOP Extras iff iffCreateTest ;
+SubInclude TOP Extras iff BulletIffConverter ;
diff --git a/Extras/iff/iffCreateTest/main.cpp b/Extras/iff/iffCreateTest/main.cpp
index 8d368df27..99c2ddb14 100644
--- a/Extras/iff/iffCreateTest/main.cpp
+++ b/Extras/iff/iffCreateTest/main.cpp
@@ -23,10 +23,7 @@ subject to the following restrictions:
 
 #include <stdio.h>
 
-extern "C"
-{
 #include "iff.h"
-}
 
 IFFP MyReadICat(GroupContext *parent) 
 {
@@ -236,4 +233,4 @@ int main(int argc, char* argv[])
 
 
 	return 0;
-}
\ No newline at end of file
+}