diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index 74a26e3b0..17d817d77 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -236,9 +236,11 @@
 #ifdef HAVE_APPLE_OPENGL_FRAMEWORK
 #include <OpenGL/GL.h>
 #include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
 #else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#include "gl/glext.h"
 #endif
 
 #ifdef _CRT_SECURE_NO_WARNINGS_DEFINED
diff --git a/aegisub/src/gl_wrap.cpp b/aegisub/src/gl_wrap.cpp
index 7c2889eb1..ee0faa939 100644
--- a/aegisub/src/gl_wrap.cpp
+++ b/aegisub/src/gl_wrap.cpp
@@ -35,25 +35,22 @@
 ///
 
 
-///////////
-// Headers
 #include "config.h"
 
+#include "gl_wrap.h"
+
 #ifndef AGI_PRE
 #include <wx/msgdlg.h>
-#endif
-
-#include "gl_wrap.h"
-#include "options.h"
 
 #ifdef __APPLE__
-#include <OpenGL/GL.h>
 #include <OpenGL/glext.h>
 #else
-#include <GL/gl.h>
 #include "gl/glext.h"
 #endif
 
+#endif
+
+#include "options.h"
 
 //////////////////////////
 // Extension get function