diff --git a/gfx/gl.c b/gfx/gl.c
index 43331205d1..348eed8538 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -1309,3 +1309,4 @@ const video_driver_t video_gl = {
 
    gl_set_rotation,
 };
+
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index ad052cd28c..616cea7c32 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -107,6 +107,9 @@ struct gl_fbo_scale
    bool valid;
 };
 
+// DOS creeps into Win32, yay.
+#undef near
+#undef far
 struct gl_ortho
 {
    GLfloat left;