diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index 2b12049fb..3fff26866 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -225,7 +225,7 @@ glxGetScreen(ScreenPtr pScreen)
 }
 
 _X_EXPORT void GlxSetVisualConfigs(int nconfigs,
-                         __GLXvisualConfig *configs, void **privates)
+                         void *configs, void **privates)
 {
     /* We keep this stub around for the DDX drivers that still
      * call it. */
diff --git a/glx/glxserver.h b/glx/glxserver.h
index a5ca0a20b..3e44b71fb 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -55,7 +55,6 @@
 #define GL_GLEXT_PROTOTYPES /* we want prototypes */
 #include <GL/gl.h>
 #include <GL/glxproto.h>
-#include <GL/glxint.h>
 
 /* For glxscreens.h */
 typedef struct __GLXdrawable __GLXdrawable;
@@ -93,7 +92,7 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient);
 void GlxExtensionInit(void);
 
 void GlxSetVisualConfigs(int nconfigs, 
-                         __GLXvisualConfig *configs, void **privates);
+                         void *configs, void **privates);
 
 struct _glapi_table;
 void GlxSetRenderTables (struct _glapi_table *table);