diff --git a/pyopencl/compyte b/pyopencl/compyte
index 2293b43ecfadfd4ea2adc9266c8ec18f2ae0ce11..5d54e1b2b7f28d3e779029ac0b4aa5f957829f23 160000
--- a/pyopencl/compyte
+++ b/pyopencl/compyte
@@ -1 +1 @@
-Subproject commit 2293b43ecfadfd4ea2adc9266c8ec18f2ae0ce11
+Subproject commit 5d54e1b2b7f28d3e779029ac0b4aa5f957829f23
diff --git a/src/c_wrapper/gl_obj.cpp b/src/c_wrapper/gl_obj.cpp
index af80c3f964ced30c309d66037bbf7319470b69de..036ebdc717265549ca292b91e3ab196867420545 100644
--- a/src/c_wrapper/gl_obj.cpp
+++ b/src/c_wrapper/gl_obj.cpp
@@ -123,6 +123,16 @@ enqueue_release_gl_objects(clobj_t *evt, clobj_t queue,
         });
 }
 
+error*
+get_gl_object_info(clobj_t mem, cl_gl_object_type *otype, GLuint *gl_name)
+{
+    auto globj = static_cast<memory_object*>(mem);
+    return c_handle_error([&] {
+            pyopencl_call_guarded(clGetGLObjectInfo, globj, buf_arg(*otype),
+                                  buf_arg(*gl_name));
+        });
+}
+
 #endif
 
 int
@@ -145,13 +155,3 @@ get_apple_cgl_share_group()
     return (cl_context_properties)kCGLShareGroup;
 }
 #endif /* __APPLE__ */
-
-error*
-get_gl_object_info(clobj_t mem, cl_gl_object_type *otype, GLuint *gl_name)
-{
-    auto globj = static_cast<memory_object*>(mem);
-    return c_handle_error([&] {
-            pyopencl_call_guarded(clGetGLObjectInfo, globj, buf_arg(*otype),
-                                  buf_arg(*gl_name));
-        });
-}
diff --git a/src/c_wrapper/gl_obj.h b/src/c_wrapper/gl_obj.h
index c82aa9b176816cacae0f4cdf1aa294f4f4629b8a..17c3d73b1156812bb4dd27abec716c5bf8b5f9ee 100644
--- a/src/c_wrapper/gl_obj.h
+++ b/src/c_wrapper/gl_obj.h
@@ -3,10 +3,10 @@
 #ifndef __PYOPENCL_GL_OBJ_H
 #define __PYOPENCL_GL_OBJ_H
 
-#ifdef HAVE_GL
-
 namespace pyopencl {
 
+#ifdef HAVE_GL
+
 // {{{ gl interop
 
 class gl_buffer : public memory_object {