diff --git a/msvc/6/libbulletmultithreaded.dsp b/msvc/6/libbulletmultithreaded.dsp
index 9b0802870..d195864b5 100644
--- a/msvc/6/libbulletmultithreaded.dsp
+++ b/msvc/6/libbulletmultithreaded.dsp
@@ -47,11 +47,11 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded" /i "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -76,11 +76,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded" /i "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -105,11 +105,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded" /i "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -134,11 +134,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded" /i "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -163,11 +163,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dll6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded" /i "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -192,11 +192,11 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /vmb /vms /W3 /Gm /G5 /D "WIN32" /FD /c
-# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /D "_LIB" /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\src\BulletMultiThreaded" /I "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libbulletmultithreaded\libbulletmultithreaded.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\src\BulletMultiThreaded" /i "..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -262,6 +262,10 @@ SOURCE=..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp
 # End Source File
 # Begin Source File
@@ -318,6 +322,14 @@ SOURCE=..\..\src\BulletMultiThreaded\Win32ThreadSupport.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\Box.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h
 # End Source File
 # Begin Source File
diff --git a/msvc/7/libbulletmultithreaded.vcproj b/msvc/7/libbulletmultithreaded.vcproj
index 02bcc890e..1d70d5258 100644
--- a/msvc/7/libbulletmultithreaded.vcproj
+++ b/msvc/7/libbulletmultithreaded.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release7\build\libbulletmultithreaded\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release_dll7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dll7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dll7\build\libbulletmultithreaded\"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -164,7 +164,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dbl7\build\libbulletmultithreaded\"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -230,7 +230,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug7\build\libbulletmultithreaded\"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -300,7 +300,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug_dll7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dll7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dll7\build\libbulletmultithreaded\"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -366,7 +366,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dbl7\build\libbulletmultithreaded\"
@@ -407,7 +407,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -449,6 +449,9 @@
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
 			</File>
@@ -492,6 +495,12 @@
 		<Filter
 			Name="Header Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\Box.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
 			</File>
diff --git a/msvc/71/libbulletmultithreaded.vcproj b/msvc/71/libbulletmultithreaded.vcproj
index c1c4a56a0..b5ac8fe70 100644
--- a/msvc/71/libbulletmultithreaded.vcproj
+++ b/msvc/71/libbulletmultithreaded.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release71\build\libbulletmultithreaded\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release_dll71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dll71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dll71\build\libbulletmultithreaded\"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -164,7 +164,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dbl71\build\libbulletmultithreaded\"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -230,7 +230,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug71\build\libbulletmultithreaded\"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -300,7 +300,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug_dll71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dll71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dll71\build\libbulletmultithreaded\"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -366,7 +366,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dbl71\build\libbulletmultithreaded\"
@@ -407,7 +407,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -449,6 +449,9 @@
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
 			</File>
@@ -492,6 +495,12 @@
 		<Filter
 			Name="Header Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\Box.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
 			</File>
diff --git a/msvc/8/libbulletmultithreaded.vcproj b/msvc/8/libbulletmultithreaded.vcproj
index 7a16c2614..36e5f3fb2 100644
--- a/msvc/8/libbulletmultithreaded.vcproj
+++ b/msvc/8/libbulletmultithreaded.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release8\build\libbulletmultithreaded\"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -103,7 +103,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release_dll8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dll8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dll8\build\libbulletmultithreaded\"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -164,7 +164,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\release_dbl8\build\libbulletmultithreaded\"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -230,7 +230,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug8\build\libbulletmultithreaded\"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -300,7 +300,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug_dll8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dll8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dll8\build\libbulletmultithreaded\"
@@ -341,7 +341,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -366,7 +366,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libbulletmultithreaded\libbulletmultithreaded.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\libbulletmultithreaded\"
 				ObjectFile="..\..\out\debug_dbl8\build\libbulletmultithreaded\"
@@ -407,7 +407,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\BulletMultiThreaded;..\..\src\BulletMultiThreaded\vectormath\scalar\cpp"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -449,6 +449,9 @@
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuLibspe2Support.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.cpp">
 			</File>
@@ -492,6 +495,12 @@
 		<Filter
 			Name="Header Files"
 			Filter="">
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\Box.h">
+			</File>
+			<File
+				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\boxBoxDistance.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletMultiThreaded\SpuNarrowPhaseCollisionTask\SpuCollisionShapes.h">
 			</File>