Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in	(revision 40151)
+++ config/gen/makefiles/root.in	(working copy)
@@ -277,7 +277,6 @@
     $(LIBRARY_DIR)/NCI/call_toolkit_init.pbc \
     $(LIBRARY_DIR)/ncurses.pbc \
 #IF(has_opengl):    $(LIBRARY_DIR)/OpenGL.pbc \
-#IF(has_opengl):    $(LIBRARY_DIR)/OpenGL_funcs.pbc \
 #IF(has_opengl):    $(LIBRARY_DIR)/OpenGL/Math.pbc \
     $(LIBRARY_DIR)/P6object.pbc \
     $(LIBRARY_DIR)/parrotlib.pbc \
Index: MANIFEST.generated
===================================================================
--- MANIFEST.generated	(revision 40151)
+++ MANIFEST.generated	(working copy)
@@ -153,8 +153,6 @@
 runtime/parrot/library/MIME/Base64.pbc            [main]
 runtime/parrot/library/NCI/call_toolkit_init.pbc  [main]
 runtime/parrot/library/ncurses.pbc                [main]
-runtime/parrot/library/OpenGL_funcs.pir           [main]
-runtime/parrot/library/OpenGL_funcs.pbc           [main]
 runtime/parrot/library/OpenGL.pbc                 [main]
 runtime/parrot/library/P6object.pbc               [main]
 runtime/parrot/library/Parrot/Capture_PIR.pbc     [main]
Index: runtime/parrot/library/OpenGL.pir
===================================================================
--- runtime/parrot/library/OpenGL.pir	(revision 40151)
+++ runtime/parrot/library/OpenGL.pir	(working copy)
@@ -80,6 +80,8 @@
 
 .namespace ['OpenGL']
 
+.include 'runtime/parrot/library/OpenGL_funcs.pir'
+
 =item _opengl_init()
 
 At module load time, calls the other initialization routines in the proper
@@ -88,7 +90,6 @@
 =cut
 
 .sub _opengl_init :load
-    load_bytecode 'OpenGL_funcs.pbc'
     _load_opengl_libs()
     _wrap_opengl_entry_points()
     _export_opengl_functions()