diff --git a/msvc/6/appBox2dDemo.dsp b/msvc/6/appBox2dDemo.dsp
index 27832b054..87ab3339a 100644
--- a/msvc/6/appBox2dDemo.dsp
+++ b/msvc/6/appBox2dDemo.dsp
@@ -222,14 +222,6 @@ SOURCE=..\..\Demos\Box2dDemo\Box2dDemo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\Box2dDemo\btBox2dShape.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Demos\Box2dDemo\main.cpp
 # End Source File
 # End Group
@@ -240,14 +232,6 @@ SOURCE=..\..\Demos\Box2dDemo\main.cpp
 
 SOURCE=..\..\Demos\Box2dDemo\Box2dDemo.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Demos\Box2dDemo\btBox2dShape.h
-# End Source File
 # End Group
 # Begin Group "Resource Files"
 
diff --git a/msvc/6/libbulletcollision.dsp b/msvc/6/libbulletcollision.dsp
index 449622a4f..dd088bd21 100644
--- a/msvc/6/libbulletcollision.dsp
+++ b/msvc/6/libbulletcollision.dsp
@@ -266,6 +266,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorith
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp
 # End Source File
 # Begin Source File
@@ -290,6 +294,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp
 # End Source File
 # Begin Source File
@@ -342,6 +350,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionShapes\btBox2dShape.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp
 # End Source File
 # Begin Source File
@@ -370,6 +382,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btConeShape.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp
 # End Source File
 # Begin Source File
@@ -618,6 +634,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorith
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h
 # End Source File
 # Begin Source File
@@ -650,6 +670,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.h
 # End Source File
 # Begin Source File
@@ -702,6 +726,10 @@ SOURCE=..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionShapes\btBox2dShape.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionShapes\btBoxShape.h
 # End Source File
 # Begin Source File
@@ -734,6 +762,10 @@ SOURCE=..\..\src\BulletCollision\CollisionShapes\btConeShape.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h
 # End Source File
 # Begin Source File
diff --git a/msvc/7/appBox2dDemo.vcproj b/msvc/7/appBox2dDemo.vcproj
index 17943e058..2bc12e33a 100644
--- a/msvc/7/appBox2dDemo.vcproj
+++ b/msvc/7/appBox2dDemo.vcproj
@@ -449,12 +449,6 @@
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\Box2dDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dShape.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\main.cpp">
 			</File>
@@ -465,12 +459,6 @@
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\Box2dDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dShape.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/msvc/7/libbulletcollision.vcproj b/msvc/7/libbulletcollision.vcproj
index f9c99f04a..d372c71eb 100644
--- a/msvc/7/libbulletcollision.vcproj
+++ b/msvc/7/libbulletcollision.vcproj
@@ -462,6 +462,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
 			</File>
@@ -480,6 +483,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp">
 			</File>
@@ -519,6 +525,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBox2dShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp">
 			</File>
@@ -540,6 +549,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConeShape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp">
 			</File>
@@ -727,6 +739,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h">
 			</File>
@@ -751,6 +766,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.h">
 			</File>
@@ -790,6 +808,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBox2dShape.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBoxShape.h">
 			</File>
@@ -814,6 +835,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConeShape.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h">
 			</File>
diff --git a/msvc/71/appBox2dDemo.vcproj b/msvc/71/appBox2dDemo.vcproj
index 1015e7897..1e90b2947 100644
--- a/msvc/71/appBox2dDemo.vcproj
+++ b/msvc/71/appBox2dDemo.vcproj
@@ -449,12 +449,6 @@
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\Box2dDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dShape.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\main.cpp">
 			</File>
@@ -465,12 +459,6 @@
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\Box2dDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dShape.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/msvc/71/libbulletcollision.vcproj b/msvc/71/libbulletcollision.vcproj
index 861db48fd..4713c6f3e 100644
--- a/msvc/71/libbulletcollision.vcproj
+++ b/msvc/71/libbulletcollision.vcproj
@@ -462,6 +462,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
 			</File>
@@ -480,6 +483,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp">
 			</File>
@@ -519,6 +525,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBox2dShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp">
 			</File>
@@ -540,6 +549,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConeShape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp">
 			</File>
@@ -727,6 +739,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h">
 			</File>
@@ -751,6 +766,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.h">
 			</File>
@@ -790,6 +808,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBox2dShape.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBoxShape.h">
 			</File>
@@ -814,6 +835,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConeShape.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h">
 			</File>
diff --git a/msvc/8/appBox2dDemo.vcproj b/msvc/8/appBox2dDemo.vcproj
index 2de9bc707..fc2758fbd 100644
--- a/msvc/8/appBox2dDemo.vcproj
+++ b/msvc/8/appBox2dDemo.vcproj
@@ -449,12 +449,6 @@
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\Box2dDemo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.cpp">
-			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dShape.cpp">
-			</File>
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\main.cpp">
 			</File>
@@ -465,12 +459,6 @@
 			<File
 				RelativePath="..\..\Demos\Box2dDemo\Box2dDemo.h">
 			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dBox2dCollisionAlgorithm.h">
-			</File>
-			<File
-				RelativePath="..\..\Demos\Box2dDemo\btBox2dShape.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/msvc/8/libbulletcollision.vcproj b/msvc/8/libbulletcollision.vcproj
index 208a2845c..ec0b3df09 100644
--- a/msvc/8/libbulletcollision.vcproj
+++ b/msvc/8/libbulletcollision.vcproj
@@ -462,6 +462,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.cpp">
 			</File>
@@ -480,6 +483,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.cpp">
 			</File>
@@ -519,6 +525,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBox2dShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBoxShape.cpp">
 			</File>
@@ -540,6 +549,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConeShape.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.cpp">
 			</File>
@@ -727,6 +739,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btActivatingCollisionAlgorithm.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBox2dBox2dCollisionAlgorithm.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btBoxBoxCollisionAlgorithm.h">
 			</File>
@@ -751,6 +766,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btCompoundCollisionAlgorithm.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvex2dConvex2dAlgorithm.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\btConvexConcaveCollisionAlgorithm.h">
 			</File>
@@ -790,6 +808,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionDispatch\SphereTriangleDetector.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBox2dShape.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btBoxShape.h">
 			</File>
@@ -814,6 +835,9 @@
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConeShape.h">
 			</File>
+			<File
+				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvex2dShape.h">
+			</File>
 			<File
 				RelativePath="..\..\src\BulletCollision\CollisionShapes\btConvexHullShape.h">
 			</File>