diff --git a/MANIFEST.in b/MANIFEST.in
index 7d35121..db6643e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,4 +5,5 @@ include punyverse/world.json
 graft punyverse/assets
 include punyverse/shaders/*.glsl
 include punyverse/*.c
+include punyverse/*.h
 exclude punyverse/*.pyx
diff --git a/punyverse/_cyopengl.pxi b/punyverse/_cyopengl.pxi
index 50d775d..1e0ac7a 100644
--- a/punyverse/_cyopengl.pxi
+++ b/punyverse/_cyopengl.pxi
@@ -1,15 +1,4 @@
-IF UNAME_SYSNAME == "Windows":
-    cdef extern from "windows.h":
-        pass
-
-IF UNAME_SYSNAME == "Darwin":
-    cdef extern from "OpenGL/gl.h":
-        pass
-ELSE:
-    cdef extern from "GL/gl.h":
-        pass
-
-cdef extern from *:
+cdef extern from "glwrapper.h":
     ctypedef unsigned int   GLenum
     ctypedef unsigned char  GLboolean
     ctypedef unsigned int   GLbitfield
diff --git a/punyverse/glwrapper.h b/punyverse/glwrapper.h
new file mode 100644
index 0000000..92f5ccf
--- /dev/null
+++ b/punyverse/glwrapper.h
@@ -0,0 +1,9 @@
+#ifdef _MSC_VER
+#   include <windows.h>
+#endif
+
+#ifdef __APPLE__
+#   include <OpenGL/gl.h>
+#else
+#   include <GL/gl.h>
+#endif
diff --git a/setup.py b/setup.py
index 47534de..c5eeb71 100644
--- a/setup.py
+++ b/setup.py
@@ -112,7 +112,7 @@ else:
 
 setup(
     name='punyverse',
-    version='1.1',
+    version='1.2',
     packages=['punyverse'],
     package_data={
         'punyverse': [