diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 6cae0c268e..e7b7373284 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -31,10 +31,11 @@
  * Silicon Graphics, Inc.
  */
 
+#include "include/glx_extinit.h"
+
 #include "extension_string.h"
 #include "glxvndabi.h"
 
-typedef struct __GLXconfig __GLXconfig;
 struct __GLXconfig {
     /* Management */
     __GLXconfig *next;
@@ -110,7 +111,6 @@ GLint glxConvertToXVisualType(int visualType);
 ** and DDX layers of the GLX server extension.  The methods provide an
 ** interface for context management on a screen.
 */
-typedef struct __GLXscreen __GLXscreen;
 struct __GLXscreen {
     void (*destroy) (__GLXscreen * screen);
 
diff --git a/include/glx_extinit.h b/include/glx_extinit.h
index 07f3cc8558..14c3efd102 100644
--- a/include/glx_extinit.h
+++ b/include/glx_extinit.h
@@ -29,8 +29,11 @@
 /* this is separate due to sdksyms pulling in extinit.h */
 /* XXX this comment no longer makes sense i think */
 #ifdef GLXEXT
+
 typedef struct __GLXprovider __GLXprovider;
 typedef struct __GLXscreen __GLXscreen;
+typedef struct __GLXconfig __GLXconfig;
+
 struct __GLXprovider {
     __GLXscreen *(*screenProbe) (ScreenPtr pScreen);
     const char *name;