diff --git a/msvc/6/appGimpactTestDemo.dsp b/msvc/6/appGimpactTestDemo.dsp
index 00bf63242..2bf2df42b 100644
--- a/msvc/6/appGimpactTestDemo.dsp
+++ b/msvc/6/appGimpactTestDemo.dsp
@@ -45,11 +45,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 "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /Gy /GF /MD /Ob2 /Og /Oi /Ot /Oy /D "_MT" /D "_MBCS" /D "NDEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -76,11 +76,11 @@ SOURCE="$(InputPath)"
 # PROP Intermediate_Dir "..\..\out\release_dbl6\build\appGimpactTestDemo\"
 # 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 "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -108,11 +108,11 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 1
 # 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 "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c /GR /MDd /ZI /Od /D "_MT" /D "_MBCS" /D "_DEBUG" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -139,11 +139,11 @@ SOURCE="$(InputPath)"
 # PROP Intermediate_Dir "..\..\out\debug_dbl6\build\appGimpactTestDemo\"
 # 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 "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include"
+# ADD CPP /nologo /vmb /vms /W3 /Gm /G5 /FD /c  /D "_MT" /D "_MBCS" /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE" /D "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Glut" /I "..\..\Demos\OpenGL" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "BT_USE_DOUBLE_PRECISION" /D "_CONSOLE"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\appGimpactTestDemo\appGimpactTestDemo.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Glut" /i "..\..\Demos\OpenGL" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/libGIMPACT.dsp b/msvc/6/libGIMPACT.dsp
index 1804abf52..a50de9b14 100644
--- a/msvc/6/libGIMPACT.dsp
+++ b/msvc/6/libGIMPACT.dsp
@@ -176,6 +176,10 @@ SOURCE=..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp
 # End Source File
 # Begin Source File
diff --git a/msvc/6/libGIMPACTUtils.dsp b/msvc/6/libGIMPACTUtils.dsp
index 33ff5fc03..0b46452b7 100644
--- a/msvc/6/libGIMPACTUtils.dsp
+++ b/msvc/6/libGIMPACTUtils.dsp
@@ -45,11 +45,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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "NDEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -77,11 +77,11 @@ SOURCE="$(InputPath)"
 # 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
 # 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"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\release_dbl6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -109,11 +109,11 @@ SOURCE="$(InputPath)"
 # 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
 # ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /D "_DEBUG" /D "_LIB" /D "_WINDOWS"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -141,11 +141,11 @@ SOURCE="$(InputPath)"
 # 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils"
+# 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 "WIN32"  /I "." /I "..\.." /I "..\..\src" /I "..\..\Extras\GIMPACT\include" /I "..\..\Extras\GIMPACTUtils" /I "..\..\Extras\ConvexDecomposition"
 # 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"
 # ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils"
+# ADD RSC /l 0x409 /fo".\..\..\out\debug_dbl6\build\libGIMPACTUtils\libGIMPACTUtils.res" /i "." /i "..\.." /i "..\..\src" /i "..\..\Extras\GIMPACT\include" /i "..\..\Extras\GIMPACTUtils" /i "..\..\Extras\ConvexDecomposition"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/msvc/6/libbulletmath.dsp b/msvc/6/libbulletmath.dsp
index 1f3bb51fe..42569fc64 100644
--- a/msvc/6/libbulletmath.dsp
+++ b/msvc/6/libbulletmath.dsp
@@ -176,10 +176,6 @@ SOURCE=..\..\src\LinearMath\btAlignedAllocator.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\btGenericPoolAllocator.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\LinearMath\btGeometryUtil.cpp
 # End Source File
 # Begin Source File
@@ -208,10 +204,6 @@ SOURCE=..\..\src\LinearMath\btDefaultMotionState.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\LinearMath\btGenericPoolAllocator.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\LinearMath\btGeometryUtil.h
 # End Source File
 # Begin Source File
diff --git a/msvc/7/appGimpactTestDemo.vcproj b/msvc/7/appGimpactTestDemo.vcproj
index 3e68f8a2f..b3bdc6f75 100644
--- a/msvc/7/appGimpactTestDemo.vcproj
+++ b/msvc/7/appGimpactTestDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release7\build\appGimpactTestDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dbl7\build\appGimpactTestDemo\"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -172,7 +172,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug7\build\appGimpactTestDemo\"
@@ -219,7 +219,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -245,7 +245,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dbl7\build\appGimpactTestDemo\"
@@ -289,7 +289,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/libGIMPACT.vcproj b/msvc/7/libGIMPACT.vcproj
index d6450189b..5243844d4 100644
--- a/msvc/7/libGIMPACT.vcproj
+++ b/msvc/7/libGIMPACT.vcproj
@@ -297,6 +297,9 @@
 			<File
 				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp">
 			</File>
diff --git a/msvc/7/libGIMPACTUtils.vcproj b/msvc/7/libGIMPACTUtils.vcproj
index a9d2e2e05..ead0b83b4 100644
--- a/msvc/7/libGIMPACTUtils.vcproj
+++ b/msvc/7/libGIMPACTUtils.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release7\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\release7\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\release7\build\libGIMPACTUtils\"
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -99,7 +99,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release_dbl7\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\release_dbl7\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\release_dbl7\build\libGIMPACTUtils\"
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -167,7 +167,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug7\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\debug7\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\debug7\build\libGIMPACTUtils\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -239,7 +239,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug_dbl7\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl7\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\debug_dbl7\build\libGIMPACTUtils\"
@@ -282,7 +282,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=7"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/7/libbulletmath.vcproj b/msvc/7/libbulletmath.vcproj
index 2d85c1b5f..9f5fc42e6 100644
--- a/msvc/7/libbulletmath.vcproj
+++ b/msvc/7/libbulletmath.vcproj
@@ -297,9 +297,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btAlignedAllocator.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btGenericPoolAllocator.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.cpp">
 			</File>
@@ -322,9 +319,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btDefaultMotionState.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btGenericPoolAllocator.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
 			</File>
diff --git a/msvc/71/appGimpactTestDemo.vcproj b/msvc/71/appGimpactTestDemo.vcproj
index a7904e63b..ba15d3449 100644
--- a/msvc/71/appGimpactTestDemo.vcproj
+++ b/msvc/71/appGimpactTestDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release71\build\appGimpactTestDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dbl71\build\appGimpactTestDemo\"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -172,7 +172,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug71\build\appGimpactTestDemo\"
@@ -219,7 +219,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -245,7 +245,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dbl71\build\appGimpactTestDemo\"
@@ -289,7 +289,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/libGIMPACT.vcproj b/msvc/71/libGIMPACT.vcproj
index b197a3b3b..f3aef12fd 100644
--- a/msvc/71/libGIMPACT.vcproj
+++ b/msvc/71/libGIMPACT.vcproj
@@ -297,6 +297,9 @@
 			<File
 				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp">
 			</File>
diff --git a/msvc/71/libGIMPACTUtils.vcproj b/msvc/71/libGIMPACTUtils.vcproj
index be9d182a9..a501556a9 100644
--- a/msvc/71/libGIMPACTUtils.vcproj
+++ b/msvc/71/libGIMPACTUtils.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release71\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\release71\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\release71\build\libGIMPACTUtils\"
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -99,7 +99,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release_dbl71\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\release_dbl71\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\release_dbl71\build\libGIMPACTUtils\"
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -167,7 +167,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug71\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\debug71\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\debug71\build\libGIMPACTUtils\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -239,7 +239,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug_dbl71\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl71\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\debug_dbl71\build\libGIMPACTUtils\"
@@ -282,7 +282,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=71"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/71/libbulletmath.vcproj b/msvc/71/libbulletmath.vcproj
index 1e9cb2f0f..e3f72e177 100644
--- a/msvc/71/libbulletmath.vcproj
+++ b/msvc/71/libbulletmath.vcproj
@@ -297,9 +297,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btAlignedAllocator.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btGenericPoolAllocator.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.cpp">
 			</File>
@@ -322,9 +319,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btDefaultMotionState.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btGenericPoolAllocator.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
 			</File>
diff --git a/msvc/8/appGimpactTestDemo.vcproj b/msvc/8/appGimpactTestDemo.vcproj
index 582fe1b5f..6b925badf 100644
--- a/msvc/8/appGimpactTestDemo.vcproj
+++ b/msvc/8/appGimpactTestDemo.vcproj
@@ -32,7 +32,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release8\build\appGimpactTestDemo\"
@@ -81,7 +81,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -102,7 +102,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\release_dbl8\build\appGimpactTestDemo\"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -172,7 +172,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug8\build\appGimpactTestDemo\"
@@ -219,7 +219,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -245,7 +245,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\appGimpactTestDemo\appGimpactTestDemo.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\appGimpactTestDemo\"
 				ObjectFile="..\..\out\debug_dbl8\build\appGimpactTestDemo\"
@@ -289,7 +289,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_CONSOLE;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Glut;..\..\Demos\OpenGL;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/libGIMPACT.vcproj b/msvc/8/libGIMPACT.vcproj
index 9565c592b..7907049e6 100644
--- a/msvc/8/libGIMPACT.vcproj
+++ b/msvc/8/libGIMPACT.vcproj
@@ -297,6 +297,9 @@
 			<File
 				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btContactProcessing.cpp">
 			</File>
+			<File
+				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGenericPoolAllocator.cpp">
+			</File>
 			<File
 				RelativePath="..\..\Extras\GIMPACT\src\Bullet\btGImpactBvh.cpp">
 			</File>
diff --git a/msvc/8/libGIMPACTUtils.vcproj b/msvc/8/libGIMPACTUtils.vcproj
index 377c09e73..60b984328 100644
--- a/msvc/8/libGIMPACTUtils.vcproj
+++ b/msvc/8/libGIMPACTUtils.vcproj
@@ -30,7 +30,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release8\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\release8\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\release8\build\libGIMPACTUtils\"
@@ -79,7 +79,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -99,7 +99,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\release_dbl8\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\release_dbl8\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\release_dbl8\build\libGIMPACTUtils\"
@@ -142,7 +142,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -167,7 +167,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug8\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\debug8\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\debug8\build\libGIMPACTUtils\"
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -239,7 +239,7 @@
 				OptimizeForProcessor="1"
 				ExceptionHandling="0"
 				AdditionalOptions=" "
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				PrecompiledHeaderFile="..\..\out\debug_dbl8\build\libGIMPACTUtils\libGIMPACTUtils.pch"
 				AssemblerListingLocation="..\..\out\debug_dbl8\build\libGIMPACTUtils\"
 				ObjectFile="..\..\out\debug_dbl8\build\libGIMPACTUtils\"
@@ -282,7 +282,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG;BT_USE_DOUBLE_PRECISION;_LIB;_WINDOWS;PROJECTGEN_VERSION=8"
-				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils"
+				AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\Extras\GIMPACT\include;..\..\Extras\GIMPACTUtils;..\..\Extras\ConvexDecomposition"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
diff --git a/msvc/8/libbulletmath.vcproj b/msvc/8/libbulletmath.vcproj
index 2121670a9..4188e09ac 100644
--- a/msvc/8/libbulletmath.vcproj
+++ b/msvc/8/libbulletmath.vcproj
@@ -297,9 +297,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btAlignedAllocator.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btGenericPoolAllocator.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.cpp">
 			</File>
@@ -322,9 +319,6 @@
 			<File
 				RelativePath="..\..\src\LinearMath\btDefaultMotionState.h">
 			</File>
-			<File
-				RelativePath="..\..\src\LinearMath\btGenericPoolAllocator.h">
-			</File>
 			<File
 				RelativePath="..\..\src\LinearMath\btGeometryUtil.h">
 			</File>