--- a/include/glx_extinit.h-orig	2018-11-18 01:34:09.000000000 +0100
+++ b/include/glx_extinit.h	2018-11-18 01:35:57.000000000 +0100
@@ -30,7 +30,9 @@
 /* XXX this comment no longer makes sense i think */
 #ifdef GLXEXT
 typedef struct __GLXprovider __GLXprovider;
+#ifndef _GLX_screens_h_
 typedef struct __GLXscreen __GLXscreen;
+#endif
 struct __GLXprovider {
     __GLXscreen *(*screenProbe) (ScreenPtr pScreen);
     const char *name;