This shouldn't have been here.

collision/collision.cpp

@@ -1,7 +1,7 @@
 #include "base/logging.h"
 #include "math/lin/vec3.h"
-#include "math/ray_intersections.h"
-#include "collision/collision.h"
+#include "ray_intersections.h"
+#include "collision.h"
 
 #include <string>
 

native.vcxproj

@@ -98,7 +98,6 @@
     <ClInclude Include="base\stats.h" />
     <ClInclude Include="base\stringutil.h" />
     <ClInclude Include="base\timeutil.h" />
-    <ClInclude Include="collision\collision.h" />
     <ClInclude Include="ext\etcpack\etcdec.h" />
     <ClInclude Include="ext\etcpack\etcpack.h" />
     <ClInclude Include="ext\sha1\sha1.h" />
@@ -131,7 +130,6 @@
     <ClInclude Include="math\lin\quat.h" />
     <ClInclude Include="math\lin\vec3.h" />
     <ClInclude Include="math\math_util.h" />
-    <ClInclude Include="math\ray_intersections.h" />
     <ClInclude Include="profiler\profiler.h" />
   </ItemGroup>
   <ItemGroup>
@@ -141,7 +139,6 @@
     <ClCompile Include="base\error_context.cpp" />
     <ClCompile Include="base\LAMEString.cpp" />
     <ClCompile Include="base\timeutil.cpp" />
-    <ClCompile Include="collision\collision.cpp" />
     <ClCompile Include="ext\etcpack\etcdec.cpp" />
     <ClCompile Include="ext\etcpack\etcpack.cpp" />
     <ClCompile Include="ext\sha1\sha1.cpp" />
@@ -174,7 +171,6 @@
     <ClCompile Include="math\lin\quat.cpp" />
     <ClCompile Include="math\lin\vec3.cpp" />
     <ClCompile Include="math\math_util.cc" />
-    <ClCompile Include="math\ray_intersections.cpp" />
     <ClCompile Include="profiler\profiler.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

native.vcxproj.filters

@@ -69,9 +69,6 @@
     <ClInclude Include="file\zip_read.h">
       <Filter>file</Filter>
     </ClInclude>
-    <ClInclude Include="collision\collision.h">
-      <Filter>collision</Filter>
-    </ClInclude>
     <ClInclude Include="base\basictypes.h">
       <Filter>base</Filter>
     </ClInclude>
@@ -93,9 +90,6 @@
     <ClInclude Include="math\math_util.h">
       <Filter>math</Filter>
     </ClInclude>
-    <ClInclude Include="math\ray_intersections.h">
-      <Filter>math</Filter>
-    </ClInclude>
     <ClInclude Include="ext\etcpack\etcpack.h">
       <Filter>ext</Filter>
     </ClInclude>
@@ -197,9 +191,6 @@
     <ClCompile Include="file\zip_read.cpp">
       <Filter>file</Filter>
     </ClCompile>
-    <ClCompile Include="collision\collision.cpp">
-      <Filter>collision</Filter>
-    </ClCompile>
     <ClCompile Include="base\LAMEString.cpp">
       <Filter>base</Filter>
     </ClCompile>
@@ -212,9 +203,6 @@
     <ClCompile Include="math\math_util.cc">
       <Filter>math</Filter>
     </ClCompile>
-    <ClCompile Include="math\ray_intersections.cpp">
-      <Filter>math</Filter>
-    </ClCompile>
     <ClCompile Include="ext\etcpack\etcpack.cpp">
       <Filter>ext</Filter>
     </ClCompile>