diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mapi/glapi/gen/gl_XML.py
index 17b9d660266..ba04bca0b19 100644
--- a/src/mapi/glapi/gen/gl_XML.py
+++ b/src/mapi/glapi/gen/gl_XML.py
@@ -619,7 +619,7 @@ class gl_function( gl_item ):
         assert not alias or not element.get('marshal_call_after')
         assert not alias or not element.get('deprecated')
 
-        if name in static_data.functions:
+        if name in static_data.libgl_public_functions:
             self.static_entry_points.append(name)
 
         self.entry_points.append( name )
diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py
index 60a8a648fb8..638d43a13e5 100644
--- a/src/mapi/glapi/gen/static_data.py
+++ b/src/mapi/glapi/gen/static_data.py
@@ -1707,7 +1707,8 @@ offsets = {
     "FramebufferTextureMultisampleMultiviewOVR": 1677,
 }
 
-functions = [
+# Exported from libGL.so and libGLX_mesa.so (libEGL_mesa.so doesn't export any)
+libgl_public_functions = [
     "Accum",
     "ActiveShaderProgram",
     "ActiveTexture",