diff --git a/chipmunk/proj.wophone/Makefile.ARM b/chipmunk/proj.wophone/Makefile.ARM
index 68ec5cf6d8..af1aa315c4 100644
--- a/chipmunk/proj.wophone/Makefile.ARM
+++ b/chipmunk/proj.wophone/Makefile.ARM
@@ -103,17 +103,17 @@ $(OBJECTS_DIR)/cpShape.o : ../src/cpShape.c
 $(OBJECTS_DIR)/cpSpace.o : ../src/cpSpace.c
 	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpace.o ../src/cpSpace.c
 
-$(OBJECTS_DIR)/cpSpace.o : ../src/cpSpaceComponent.c
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpace.o ../src/cpSpaceComponent.c
+$(OBJECTS_DIR)/cpSpaceComponent.o : ../src/cpSpaceComponent.c
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpaceComponent.o ../src/cpSpaceComponent.c
 
 $(OBJECTS_DIR)/cpSpaceHash.o : ../src/cpSpaceHash.c
 	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpaceHash.o ../src/cpSpaceHash.c
 
-$(OBJECTS_DIR)/cpSpace.o : ../src/cpSpaceQuery.c
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpace.o ../src/cpSpaceQuery.c
+$(OBJECTS_DIR)/cpSpaceQuery.o : ../src/cpSpaceQuery.c
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpaceQuery.o ../src/cpSpaceQuery.c
 
-$(OBJECTS_DIR)/cpSpace.o : ../src/cpSpaceStep.c
-	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpace.o ../src/cpSpaceStep.c
+$(OBJECTS_DIR)/cpSpaceStep.o : ../src/cpSpaceStep.c
+	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpSpaceStep.o ../src/cpSpaceStep.c
 
 $(OBJECTS_DIR)/cpVect.o : ../src/cpVect.c
 	$(CC) -c $(CC_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/cpVect.o ../src/cpVect.c
diff --git a/chipmunk/proj.wophone/chipmunk.wophone.vcproj b/chipmunk/proj.wophone/chipmunk.wophone.vcproj
index 6cffed0dd9..fa2d84bcf8 100644
--- a/chipmunk/proj.wophone/chipmunk.wophone.vcproj
+++ b/chipmunk/proj.wophone/chipmunk.wophone.vcproj
@@ -207,10 +207,22 @@
 				RelativePath="..\src\cpSpace.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\cpSpaceComponent.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\cpSpaceHash.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\cpSpaceQuery.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cpSpaceStep.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\cpVect.c"
 				>
@@ -282,6 +294,10 @@
 					RelativePath="..\include\chipmunk\chipmunk_ffi.h"
 					>
 				</File>
+				<File
+					RelativePath="..\include\chipmunk\chipmunk_private.h"
+					>
+				</File>
 				<File
 					RelativePath="..\include\chipmunk\chipmunk_types.h"
 					>
diff --git a/tests/test.wophone/Makefile.ARM b/tests/test.wophone/Makefile.ARM
index c355becb7f..fe05a5e51f 100644
--- a/tests/test.wophone/Makefile.ARM
+++ b/tests/test.wophone/Makefile.ARM
@@ -51,7 +51,6 @@ OBJECTS = \
 	$(OBJECTS_DIR)/Test.o \
 	$(OBJECTS_DIR)/TestEntries.o \
 	$(OBJECTS_DIR)/Bounce.o \
-	$(OBJECTS_DIR)/CurlTest.o \
 	$(OBJECTS_DIR)/cocos2dChipmunkDemo.o \
 	$(OBJECTS_DIR)/drawSpace.o \
 	$(OBJECTS_DIR)/Joints.o \
@@ -68,12 +67,14 @@ OBJECTS = \
 	$(OBJECTS_DIR)/Sensors.o \
 	$(OBJECTS_DIR)/Simple.o \
 	$(OBJECTS_DIR)/Springies.o \
+	$(OBJECTS_DIR)/Tank.o \
 	$(OBJECTS_DIR)/TheoJansen.o \
 	$(OBJECTS_DIR)/Tumble.o \
 	$(OBJECTS_DIR)/UnsafeOps.o \
 	$(OBJECTS_DIR)/ClickAndMoveTest.o \
 	$(OBJECTS_DIR)/CocosDenshionTest.o \
 	$(OBJECTS_DIR)/CocosNodeTest.o \
+	$(OBJECTS_DIR)/CurlTest.o \
 	$(OBJECTS_DIR)/DrawPrimitivesTest.o \
 	$(OBJECTS_DIR)/EaseActionsTest.o \
 	$(OBJECTS_DIR)/EffectsAdvancedTest.o \
@@ -83,7 +84,6 @@ OBJECTS = \
 	$(OBJECTS_DIR)/KeypadTest.o \
 	$(OBJECTS_DIR)/LabelTest.o \
 	$(OBJECTS_DIR)/LayerTest.o \
-	$(OBJECTS_DIR)/TextInputTest.o \
 	$(OBJECTS_DIR)/MenuTest.o \
 	$(OBJECTS_DIR)/MotionStreakTest.o \
 	$(OBJECTS_DIR)/ParallaxTest.o \
@@ -100,13 +100,14 @@ OBJECTS = \
 	$(OBJECTS_DIR)/SceneTest.o \
 	$(OBJECTS_DIR)/SchedulerTest.o \
 	$(OBJECTS_DIR)/SpriteTest.o \
+	$(OBJECTS_DIR)/TextInputTest.o \
 	$(OBJECTS_DIR)/TileMapTest.o \
 	$(OBJECTS_DIR)/Ball.o \
 	$(OBJECTS_DIR)/Paddle.o \
 	$(OBJECTS_DIR)/TouchesTest.o \
 	$(OBJECTS_DIR)/TransitionsTest.o \
-	$(OBJECTS_DIR)/ZwoptexTest.o \
-	$(OBJECTS_DIR)/UserDefaultTest.o
+	$(OBJECTS_DIR)/UserDefaultTest.o \
+	$(OBJECTS_DIR)/ZwoptexTest.o
 
 ADD_OBJECTS += 
 
@@ -218,6 +219,9 @@ $(OBJECTS_DIR)/Simple.o : ../tests/ChipmunkTest/Simple.cpp
 $(OBJECTS_DIR)/Springies.o : ../tests/ChipmunkTest/Springies.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Springies.o ../tests/ChipmunkTest/Springies.cpp
 
+$(OBJECTS_DIR)/Tank.o : ../tests/ChipmunkTest/Tank.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Tank.o ../tests/ChipmunkTest/Tank.cpp
+
 $(OBJECTS_DIR)/TheoJansen.o : ../tests/ChipmunkTest/TheoJansen.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TheoJansen.o ../tests/ChipmunkTest/TheoJansen.cpp
 
@@ -236,6 +240,9 @@ $(OBJECTS_DIR)/CocosDenshionTest.o : ../tests/CocosDenshionTest/CocosDenshionTes
 $(OBJECTS_DIR)/CocosNodeTest.o : ../tests/CocosNodeTest/CocosNodeTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CocosNodeTest.o ../tests/CocosNodeTest/CocosNodeTest.cpp
 
+$(OBJECTS_DIR)/CurlTest.o : ../tests/CurlTest/CurlTest.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CurlTest.o ../tests/CurlTest/CurlTest.cpp
+
 $(OBJECTS_DIR)/DrawPrimitivesTest.o : ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/DrawPrimitivesTest.o ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 
@@ -260,9 +267,6 @@ $(OBJECTS_DIR)/KeypadTest.o : ../tests/KeypadTest/KeypadTest.cpp
 $(OBJECTS_DIR)/LabelTest.o : ../tests/LabelTest/LabelTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/LabelTest.o ../tests/LabelTest/LabelTest.cpp
 
-$(OBJECTS_DIR)/TextInputTest.o : ../tests/TextInputTest/TextInputTest.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TextInputTest.o ../tests/TextInputTest/TextInputTest.cpp
-
 $(OBJECTS_DIR)/LayerTest.o : ../tests/LayerTest/LayerTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/LayerTest.o ../tests/LayerTest/LayerTest.cpp
 
@@ -314,6 +318,9 @@ $(OBJECTS_DIR)/SchedulerTest.o : ../tests/SchedulerTest/SchedulerTest.cpp
 $(OBJECTS_DIR)/SpriteTest.o : ../tests/SpriteTest/SpriteTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/SpriteTest.o ../tests/SpriteTest/SpriteTest.cpp
 
+$(OBJECTS_DIR)/TextInputTest.o : ../tests/TextInputTest/TextInputTest.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TextInputTest.o ../tests/TextInputTest/TextInputTest.cpp
+
 $(OBJECTS_DIR)/TileMapTest.o : ../tests/TileMapTest/TileMapTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TileMapTest.o ../tests/TileMapTest/TileMapTest.cpp
 
@@ -329,12 +336,9 @@ $(OBJECTS_DIR)/TouchesTest.o : ../tests/TouchesTest/TouchesTest.cpp
 $(OBJECTS_DIR)/TransitionsTest.o : ../tests/TransitionsTest/TransitionsTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TransitionsTest.o ../tests/TransitionsTest/TransitionsTest.cpp
 
-$(OBJECTS_DIR)/ZwoptexTest.o : ../tests/ZwoptexTest/ZwoptexTest.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ZwoptexTest.o ../tests/ZwoptexTest/ZwoptexTest.cpp
-	
-$(OBJECTS_DIR)/CurlTest.o : ../tests/CurlTest/CurlTest.cpp
-	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CurlTest.o ../tests/CurlTest/CurlTest.cpp
-	
 $(OBJECTS_DIR)/UserDefaultTest.o : ../tests/UserDefaultTest/UserDefaultTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/UserDefaultTest.o ../tests/UserDefaultTest/UserDefaultTest.cpp
 
+$(OBJECTS_DIR)/ZwoptexTest.o : ../tests/ZwoptexTest/ZwoptexTest.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ZwoptexTest.o ../tests/ZwoptexTest/ZwoptexTest.cpp
+
diff --git a/tests/test.wophone/test.wophone.vcproj b/tests/test.wophone/test.wophone.vcproj
index 8b5cee5706..3ac251b90a 100644
--- a/tests/test.wophone/test.wophone.vcproj
+++ b/tests/test.wophone/test.wophone.vcproj
@@ -597,6 +597,10 @@
 						RelativePath="..\tests\ChipmunkTest\Springies.cpp"
 						>
 					</File>
+					<File
+						RelativePath="..\tests\ChipmunkTest\Tank.cpp"
+						>
+					</File>
 					<File
 						RelativePath="..\tests\ChipmunkTest\TheoJansen.cpp"
 						>
diff --git a/tests/tests/ChipmunkTest/drawSpace.cpp b/tests/tests/ChipmunkTest/drawSpace.cpp
index 765956b80e..cf0735a5b3 100644
--- a/tests/tests/ChipmunkTest/drawSpace.cpp
+++ b/tests/tests/ChipmunkTest/drawSpace.cpp
@@ -293,7 +293,8 @@ drawObject(cpShape *shape, cpSpace *space)
 			drawPolyShape(body, (cpPolyShape *)shape, space);
 			break;
 		default:
-			printf("Bad enumeration in drawObject().\n");
+			CCLOG("Bad enumeration in drawObject().\n");
+            break;
 	}
 }