diff --git a/external/chipmunk/include/chipmunk/chipmunk.h b/external/chipmunk/include/chipmunk/chipmunk.h
index 49023a343e..f0e4282f7e 100644
--- a/external/chipmunk/include/chipmunk/chipmunk.h
+++ b/external/chipmunk/include/chipmunk/chipmunk.h
@@ -23,7 +23,9 @@
 #define CHIPMUNK_HEADER
 
 #ifdef _MSC_VER
-    #define _USE_MATH_DEFINES
+	#ifndef _USE_MATH_DEFINES
+	#define _USE_MATH_DEFINES
+	#endif
 #endif
 
 #include <stdlib.h>
diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
index bbb5b046cf..da6a8674db 100644
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
+++ b/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
@@ -226,6 +226,12 @@
     <Filter Include="Classes\ConfigurationTest">
       <UniqueIdentifier>{81ec2355-7efd-49e0-b6cb-b1bba23fbbc8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Classes\ExtensionsTest\ArmatureTest">
+      <UniqueIdentifier>{f0a099b9-0cf3-4217-a311-8d2f84e503c9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Classes\ExtensionsTest\ComponentsTest">
+      <UniqueIdentifier>{285cdfb8-5749-4969-ae31-99ec25f15e6e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -516,6 +522,27 @@
     <ClCompile Include="..\Classes\BaseTest.cpp">
       <Filter>Classes</Filter>
     </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ArmatureTest\ArmatureScene.cpp">
+      <Filter>Classes\ExtensionsTest\ArmatureTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\ComponentsTestScene.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\EnemyController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\GameOverScene.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\PlayerController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\ProjectileController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Classes\ExtensionsTest\ComponentsTest\SceneController.cpp">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="main.h">
@@ -986,5 +1013,26 @@
     <ClInclude Include="..\Classes\BaseTest.h">
       <Filter>Classes</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ArmatureTest\ArmatureScene.h">
+      <Filter>Classes\ExtensionsTest\ArmatureTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\ComponentsTestScene.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\EnemyController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\GameOverScene.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\PlayerController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\ProjectileController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Classes\ExtensionsTest\ComponentsTest\SceneController.h">
+      <Filter>Classes\ExtensionsTest\ComponentsTest</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file