diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index 71b2c94d092..459d535e3bb 100644
--- a/src/glx/glxextensions.c
+++ b/src/glx/glxextensions.c
@@ -229,11 +229,6 @@ static const struct extension_info known_gl_extensions[] = {
    { GL(NV_texture_compression_vtc),      N, N },
    { GL(NV_texture_env_combine4),         N, N },
    { GL(NV_texture_rectangle),            N, N },
-   { GL(NV_vertex_program),               N, N },
-   { GL(NV_vertex_program1_1),            N, N },
-   { GL(NV_vertex_program2),              N, N },
-   { GL(NV_vertex_program2_option),       N, N },
-   { GL(NV_vertex_program3),              N, N },
    { GL(OES_read_format),                 N, N },
    { GL(OES_compressed_paletted_texture), N, N },
    { GL(SGI_color_matrix),                N, N },
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index 37f60f5cf85..861ad61919f 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -191,11 +191,6 @@ enum
    GL_NV_texgen_reflection_bit,
    GL_NV_texture_compression_vtc_bit,
    GL_NV_texture_env_combine4_bit,
-   GL_NV_vertex_program_bit,
-   GL_NV_vertex_program1_1_bit,
-   GL_NV_vertex_program2_bit,
-   GL_NV_vertex_program2_option_bit,
-   GL_NV_vertex_program3_bit,
    GL_OES_compressed_paletted_texture_bit,
    GL_OES_read_format_bit,
    GL_SGI_color_matrix_bit,
diff --git a/src/glx/indirect_vertex_array.c b/src/glx/indirect_vertex_array.c
index a14f8b4b91b..281d97afc86 100644
--- a/src/glx/indirect_vertex_array.c
+++ b/src/glx/indirect_vertex_array.c
@@ -1724,45 +1724,6 @@ __indirect_glVertexAttribPointer(GLuint index, GLint size,
 }
 
 
-/**
- * I don't have 100% confidence that this is correct.  The different rules
- * about whether or not generic vertex attributes alias "classic" vertex
- * attributes (i.e., attrib1 ?= primary color) between ARB_vertex_program,
- * ARB_vertex_shader, and NV_vertex_program are a bit confusing.  My
- * feeling is that the client-side doesn't have to worry about it.  The
- * client just sends all the data to the server and lets the server deal
- * with it.
- */
-void
-__indirect_glVertexAttribPointerNV(GLuint index, GLint size,
-                                   GLenum type, GLsizei stride,
-                                   const GLvoid * pointer)
-{
-   struct glx_context *gc = __glXGetCurrentContext();
-   GLboolean normalized = GL_FALSE;
-
-
-   switch (type) {
-   case GL_UNSIGNED_BYTE:
-      if (size != 4) {
-         __glXSetError(gc, GL_INVALID_VALUE);
-         return;
-      }
-      normalized = GL_TRUE;
-      FALLTHROUGH;
-   case GL_SHORT:
-   case GL_FLOAT:
-   case GL_DOUBLE:
-      __indirect_glVertexAttribPointer(index, size, type,
-                                          normalized, stride, pointer);
-      return;
-   default:
-      __glXSetError(gc, GL_INVALID_ENUM);
-      return;
-   }
-}
-
-
 void
 __indirect_glClientActiveTexture(GLenum texture)
 {
diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py
index c73a9aac335..f8ab85426a8 100644
--- a/src/mapi/glapi/gen/static_data.py
+++ b/src/mapi/glapi/gen/static_data.py
@@ -1111,8 +1111,6 @@ all_functions = [
     "DrawTexxvOES",
     "PointSizePointerOES",
     "QueryMatrixxOES",
-    "SampleMaskSGIS",
-    "SamplePatternSGIS",
     "ColorPointerEXT",
     "EdgeFlagPointerEXT",
     "IndexPointerEXT",
@@ -1198,7 +1196,6 @@ all_functions = [
     "MultiDrawElements",
     "FogCoordfEXT",
     "FogCoordfvEXT",
-    "ResizeBuffersMESA",
     "WindowPos4dMESA",
     "WindowPos4dvMESA",
     "WindowPos4fMESA",
@@ -1209,21 +1206,6 @@ all_functions = [
     "WindowPos4svMESA",
     "MultiModeDrawArraysIBM",
     "MultiModeDrawElementsIBM",
-    "AreProgramsResidentNV",
-    "ExecuteProgramNV",
-    "GetProgramParameterdvNV",
-    "GetProgramParameterfvNV",
-    "GetProgramStringNV",
-    "GetProgramivNV",
-    "GetTrackMatrixivNV",
-    "GetVertexAttribdvNV",
-    "GetVertexAttribfvNV",
-    "GetVertexAttribivNV",
-    "LoadProgramNV",
-    "ProgramParameters4dvNV",
-    "ProgramParameters4fvNV",
-    "RequestResidentProgramsNV",
-    "TrackMatrixNV",
     "VertexAttrib1dNV",
     "VertexAttrib1dvNV",
     "VertexAttrib1fNV",
@@ -1250,7 +1232,6 @@ all_functions = [
     "VertexAttrib4svNV",
     "VertexAttrib4ubNV",
     "VertexAttrib4ubvNV",
-    "VertexAttribPointerNV",
     "VertexAttribs1dvNV",
     "VertexAttribs1fvNV",
     "VertexAttribs1svNV",
@@ -1264,10 +1245,6 @@ all_functions = [
     "VertexAttribs4fvNV",
     "VertexAttribs4svNV",
     "VertexAttribs4ubvNV",
-    "GetTexBumpParameterfvATI",
-    "GetTexBumpParameterivATI",
-    "TexBumpParameterfvATI",
-    "TexBumpParameterivATI",
     "AlphaFragmentOp1ATI",
     "AlphaFragmentOp2ATI",
     "AlphaFragmentOp3ATI",
@@ -1285,12 +1262,6 @@ all_functions = [
     "DepthRangeArrayfvOES",
     "DepthRangeIndexedfOES",
     "ActiveStencilFaceEXT",
-    "GetProgramNamedParameterdvNV",
-    "GetProgramNamedParameterfvNV",
-    "ProgramNamedParameter4dNV",
-    "ProgramNamedParameter4dvNV",
-    "ProgramNamedParameter4fNV",
-    "ProgramNamedParameter4fvNV",
     "PrimitiveRestartNV",
     "GetTexGenxvOES",
     "TexGenxOES",
@@ -1299,8 +1270,6 @@ all_functions = [
     "BindFramebufferEXT",
     "BindRenderbufferEXT",
     "StringMarkerGREMEDY",
-    "BufferParameteriAPPLE",
-    "FlushMappedBufferRangeAPPLE",
     "VertexAttribI1iEXT",
     "VertexAttribI1uiEXT",
     "VertexAttribI2iEXT",
@@ -1329,12 +1298,6 @@ all_functions = [
     "GetPerfMonitorGroupStringAMD",
     "GetPerfMonitorGroupsAMD",
     "SelectPerfMonitorCountersAMD",
-    "GetObjectParameterivAPPLE",
-    "ObjectPurgeableAPPLE",
-    "ObjectUnpurgeableAPPLE",
-    "ActiveProgramEXT",
-    "CreateShaderProgramEXT",
-    "UseShaderProgramEXT",
     "TextureBarrierNV",
     "VDPAUFiniNV",
     "VDPAUGetSurfaceivNV",