diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h
index 757ebab21..937fba39e 100644
--- a/src/Math/Matrix4.h
+++ b/src/Math/Matrix4.h
@@ -22,7 +22,7 @@
 #include "Matrix.h"
 #include "Point3D.h"
 
-#ifdef WIN32 /* I so HATE windows.h */
+#ifdef _WIN32 /* I so HATE windows.h */
 #undef near
 #undef far
 #endif
diff --git a/src/SceneGraph/Camera3D.h b/src/SceneGraph/Camera3D.h
index d10124ac2..70a7258fe 100644
--- a/src/SceneGraph/Camera3D.h
+++ b/src/SceneGraph/Camera3D.h
@@ -21,6 +21,11 @@
 
 #include "AbstractCamera.h"
 
+#ifdef _WIN32 /* I so HATE windows.h */
+#undef near
+#undef far
+#endif
+
 namespace Magnum { namespace SceneGraph {
 
 /**