diff --git a/count-lines-of-code b/count-lines-of-code
index 736b9ff92..0c6800a0f 100755
--- a/count-lines-of-code
+++ b/count-lines-of-code
@@ -1,2 +1,2 @@
 #!/bin/bash
-cloc --exclude-list-file <(echo -e 'kitty/wcwidth9.h\nkitty/unicode-data.h\nkitty/gl.h\nkitty/glfw.c\nkitty/glfw.h\nkitty/charsets.c\nkitty/key_encoding.py\nkitty/rgb.py') kitty
+cloc --exclude-list-file <(echo -e 'kitty/wcwidth9.h\nkitty/unicode-data.h\nkitty/gl.c\nkitty/glfw.c\nkitty/glfw.h\nkitty/charsets.c\nkitty/key_encoding.py\nkitty/rgb.py') kitty
diff --git a/kitty/data-types.c b/kitty/data-types.c
index 012dd2d49..9400673ab 100644
--- a/kitty/data-types.c
+++ b/kitty/data-types.c
@@ -7,7 +7,6 @@
 
 #include "data-types.h"
 #include "glfw.h"
-#include "gl.h"
 #include "modes.h"
 #include "sprites.h"
 #include <stddef.h>
@@ -66,7 +65,6 @@ stop_profiler(PyObject UNUSED *self) {
 #endif
 
 static PyMethodDef module_methods[] = {
-    GL_METHODS
     {"set_iutf8", (PyCFunction)pyset_iutf8, METH_VARARGS, ""},
     {"thread_write", (PyCFunction)cm_thread_write, METH_VARARGS, ""},
     {"parse_bytes", (PyCFunction)parse_bytes, METH_VARARGS, ""},
@@ -99,6 +97,8 @@ static struct PyModuleDef module = {
 
 #include <termios.h>
 
+extern bool add_module_gl_constants(PyObject*);
+
 EXPORTED PyMODINIT_FUNC
 PyInit_fast_data_types(void) {
     PyObject *m;
diff --git a/kitty/gl.h b/kitty/gl.c
similarity index 91%
rename from kitty/gl.h
rename to kitty/gl.c
index f68f891b0..809f6bbcb 100644
--- a/kitty/gl.h
+++ b/kitty/gl.c
@@ -804,8 +804,83 @@ check_for_extensions(PyObject UNUSED *self) {
     Py_RETURN_NONE;
 }
 
-int add_module_gl_constants(PyObject *module) {
-#define GLC(x) if (PyModule_AddIntConstant(module, #x, x) != 0) { PyErr_NoMemory(); return 0; }
+static PyMethodDef module_methods[] = {
+    {"enable_automatic_opengl_error_checking", (PyCFunction)enable_automatic_error_checking, METH_O, NULL}, 
+    {"copy_image_sub_data", (PyCFunction)copy_image_sub_data, METH_VARARGS, NULL}, 
+    {"replace_or_create_buffer", (PyCFunction)replace_or_create_buffer, METH_VARARGS, NULL}, 
+    {"glewInit", (PyCFunction)_glewInit, METH_NOARGS, NULL}, 
+    {"check_for_extensions", (PyCFunction)check_for_extensions, METH_NOARGS, NULL}, 
+    {"get_uniform_block_size", (PyCFunction)get_uniform_block_size, METH_VARARGS, NULL}, 
+    {"get_uniform_block_offsets", (PyCFunction)get_uniform_block_offsets, METH_VARARGS, NULL}, 
+    METH(Viewport, METH_VARARGS) 
+    METH(CheckError, METH_NOARGS) 
+    METH(ClearColor, METH_VARARGS) 
+    METH(GetProgramiv, METH_VARARGS) 
+    METH(GetShaderiv, METH_VARARGS) 
+    METH(Uniform2ui, METH_VARARGS) 
+    METH(Uniform4ui, METH_VARARGS) 
+    METH(Uniform1uiv, METH_VARARGS) 
+    METH(Uniform2i, METH_VARARGS) 
+    METH(Uniform1i, METH_VARARGS) 
+    METH(Uniform2f, METH_VARARGS) 
+    METH(Uniform4f, METH_VARARGS) 
+    METH(Uniform3fv, METH_VARARGS) 
+    METH(GetUniformLocation, METH_VARARGS) 
+    METH(GetUniformBlockIndex, METH_VARARGS) 
+    METH(GetAttribLocation, METH_VARARGS) 
+    METH(ShaderSource, METH_VARARGS) 
+    METH(CompileShader, METH_O) 
+    METH(DeleteTexture, METH_O) 
+    METH(DeleteBuffer, METH_O) 
+    METH(DeleteVertexArray, METH_O) 
+    METH(GetString, METH_O) 
+    METH(GetIntegerv, METH_O) 
+    METH(Clear, METH_O) 
+    METH(CreateShader, METH_O) 
+    METH(GenVertexArrays, METH_O) 
+    METH(GenTextures, METH_O) 
+    METH(GenBuffers, METH_O) 
+    METH(LinkProgram, METH_O) 
+    METH(UseProgram, METH_O) 
+    METH(BindVertexArray, METH_O) 
+    METH(DeleteProgram, METH_O) 
+    METH(DeleteShader, METH_O) 
+    METH(Enable, METH_O) 
+    METH(Disable, METH_O) 
+    METH(EnableVertexAttribArray, METH_O) 
+    METH(VertexAttribPointer, METH_VARARGS) 
+    METH(VertexAttribDivisor, METH_VARARGS) 
+    METH(GetProgramInfoLog, METH_O) 
+    METH(GetShaderInfoLog, METH_O) 
+    METH(ActiveTexture, METH_O) 
+    METH(DrawArraysInstanced, METH_VARARGS) 
+    METH(DrawArrays, METH_VARARGS) 
+    METH(MultiDrawArrays, METH_VARARGS) 
+    METH(CreateProgram, METH_NOARGS) 
+    METH(AttachShader, METH_VARARGS) 
+    METH(BindTexture, METH_VARARGS) 
+    METH(TexParameteri, METH_VARARGS) 
+    METH(MapBuffer, METH_VARARGS) 
+    METH(UnmapBuffer, METH_VARARGS) 
+    METH(PixelStorei, METH_VARARGS) 
+    METH(BindBuffer, METH_VARARGS) 
+    METH(BindBufferBase, METH_VARARGS) 
+    METH(TexBuffer, METH_VARARGS) 
+    METH(TexStorage3D, METH_VARARGS) 
+    METH(CopyImageSubData, METH_VARARGS) 
+    METH(TexSubImage3D, METH_VARARGS) 
+    METH(GetTexImage, METH_VARARGS) 
+    METH(GetBufferSubData, METH_VARARGS) 
+    METH(BlendFunc, METH_VARARGS) 
+    METH(Finish, METH_NOARGS) 
+    METH(Flush, METH_NOARGS) 
+
+    {NULL, NULL, 0, NULL}        /* Sentinel */
+};
+
+bool
+add_module_gl_constants(PyObject *module) {
+#define GLC(x) if (PyModule_AddIntConstant(module, #x, x) != 0) { PyErr_NoMemory(); return false; }
     GLC(GL_VERSION);
     GLC(GL_VENDOR);
     GLC(GL_SHADING_LANGUAGE_VERSION);
@@ -831,78 +906,9 @@ int add_module_gl_constants(PyObject *module) {
     GLC(GL_SRC_ALPHA); GLC(GL_ONE_MINUS_SRC_ALPHA); 
     GLC(GL_WRITE_ONLY); GLC(GL_READ_ONLY); GLC(GL_READ_WRITE);
     GLC(GL_BLEND); GLC(GL_FLOAT); GLC(GL_UNSIGNED_INT); GLC(GL_ARRAY_BUFFER); GLC(GL_UNIFORM_BUFFER);
-    return 1;
+    if (PyModule_AddFunctions(module, module_methods) != 0) return false;
+    return true;
 }
 
 
-#define GL_METHODS \
-    {"enable_automatic_opengl_error_checking", (PyCFunction)enable_automatic_error_checking, METH_O, NULL}, \
-    {"copy_image_sub_data", (PyCFunction)copy_image_sub_data, METH_VARARGS, NULL}, \
-    {"replace_or_create_buffer", (PyCFunction)replace_or_create_buffer, METH_VARARGS, NULL}, \
-    {"glewInit", (PyCFunction)_glewInit, METH_NOARGS, NULL}, \
-    {"check_for_extensions", (PyCFunction)check_for_extensions, METH_NOARGS, NULL}, \
-    {"get_uniform_block_size", (PyCFunction)get_uniform_block_size, METH_VARARGS, NULL}, \
-    {"get_uniform_block_offsets", (PyCFunction)get_uniform_block_offsets, METH_VARARGS, NULL}, \
-    METH(Viewport, METH_VARARGS) \
-    METH(CheckError, METH_NOARGS) \
-    METH(ClearColor, METH_VARARGS) \
-    METH(GetProgramiv, METH_VARARGS) \
-    METH(GetShaderiv, METH_VARARGS) \
-    METH(Uniform2ui, METH_VARARGS) \
-    METH(Uniform4ui, METH_VARARGS) \
-    METH(Uniform1uiv, METH_VARARGS) \
-    METH(Uniform2i, METH_VARARGS) \
-    METH(Uniform1i, METH_VARARGS) \
-    METH(Uniform2f, METH_VARARGS) \
-    METH(Uniform4f, METH_VARARGS) \
-    METH(Uniform3fv, METH_VARARGS) \
-    METH(GetUniformLocation, METH_VARARGS) \
-    METH(GetUniformBlockIndex, METH_VARARGS) \
-    METH(GetAttribLocation, METH_VARARGS) \
-    METH(ShaderSource, METH_VARARGS) \
-    METH(CompileShader, METH_O) \
-    METH(DeleteTexture, METH_O) \
-    METH(DeleteBuffer, METH_O) \
-    METH(DeleteVertexArray, METH_O) \
-    METH(GetString, METH_O) \
-    METH(GetIntegerv, METH_O) \
-    METH(Clear, METH_O) \
-    METH(CreateShader, METH_O) \
-    METH(GenVertexArrays, METH_O) \
-    METH(GenTextures, METH_O) \
-    METH(GenBuffers, METH_O) \
-    METH(LinkProgram, METH_O) \
-    METH(UseProgram, METH_O) \
-    METH(BindVertexArray, METH_O) \
-    METH(DeleteProgram, METH_O) \
-    METH(DeleteShader, METH_O) \
-    METH(Enable, METH_O) \
-    METH(Disable, METH_O) \
-    METH(EnableVertexAttribArray, METH_O) \
-    METH(VertexAttribPointer, METH_VARARGS) \
-    METH(VertexAttribDivisor, METH_VARARGS) \
-    METH(GetProgramInfoLog, METH_O) \
-    METH(GetShaderInfoLog, METH_O) \
-    METH(ActiveTexture, METH_O) \
-    METH(DrawArraysInstanced, METH_VARARGS) \
-    METH(DrawArrays, METH_VARARGS) \
-    METH(MultiDrawArrays, METH_VARARGS) \
-    METH(CreateProgram, METH_NOARGS) \
-    METH(AttachShader, METH_VARARGS) \
-    METH(BindTexture, METH_VARARGS) \
-    METH(TexParameteri, METH_VARARGS) \
-    METH(MapBuffer, METH_VARARGS) \
-    METH(UnmapBuffer, METH_VARARGS) \
-    METH(PixelStorei, METH_VARARGS) \
-    METH(BindBuffer, METH_VARARGS) \
-    METH(BindBufferBase, METH_VARARGS) \
-    METH(TexBuffer, METH_VARARGS) \
-    METH(TexStorage3D, METH_VARARGS) \
-    METH(CopyImageSubData, METH_VARARGS) \
-    METH(TexSubImage3D, METH_VARARGS) \
-    METH(GetTexImage, METH_VARARGS) \
-    METH(GetBufferSubData, METH_VARARGS) \
-    METH(BlendFunc, METH_VARARGS) \
-    METH(Finish, METH_NOARGS) \
-    METH(Flush, METH_NOARGS) \