diff --git a/src/lol/math/half.h b/src/lol/math/half.h
index 531295bf..172c4f13 100644
--- a/src/lol/math/half.h
+++ b/src/lol/math/half.h
@@ -22,6 +22,10 @@
 namespace lol
 {
 
+/* This is OUR namespace. Don't let Windows headers fuck with it. */
+#undef min
+#undef max
+
 class half
 {
 public:
diff --git a/src/lol/math/real.h b/src/lol/math/real.h
index 5546b6d0..339db257 100644
--- a/src/lol/math/real.h
+++ b/src/lol/math/real.h
@@ -18,12 +18,16 @@
 
 #include <stdint.h>
 
-/* Avoid issues with NaCl headers */
-#undef log2
-
 namespace lol
 {
 
+/* This is OUR namespace. Don't let Windows headers fuck with it. */
+#undef min
+#undef max
+
+/* Avoid issues with NaCl headers */
+#undef log2
+
 /*
  * The base class for reals. The only real reason for making this a template
  * class is so we can have implicit constructors ("real x = 1" works) but
diff --git a/src/lol/math/vector.h b/src/lol/math/vector.h
index 1bf5be72..9df2077a 100644
--- a/src/lol/math/vector.h
+++ b/src/lol/math/vector.h
@@ -28,6 +28,10 @@
 namespace lol
 {
 
+/* This is OUR namespace. Don't let Windows headers fuck with it. */
+#undef min
+#undef max
+
 /* Some compilers do not support const members in anonymous unions. So
  * far, GCC (>= 4.6), CLang (3.0) and Visual Studio (>= 2010) appear to
  * work properly. */
diff --git a/win32/lolcore.vcxproj.filters b/win32/lolcore.vcxproj.filters
index 9a62fa89..5acb9d74 100644
--- a/win32/lolcore.vcxproj.filters
+++ b/win32/lolcore.vcxproj.filters
@@ -363,12 +363,14 @@
     <ClInclude Include="..\src\platform\xbox\xboxapp.h">
       <Filter>src\platform\xbox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\debug.h" />
     <ClInclude Include="..\src\gpu\indexbuffer.h">
       <Filter>src\gpu</Filter>
     </ClInclude>
     <ClInclude Include="..\src\array.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\lol\debug.h">
+      <Filter>src\lol</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file