3 files changed, 20 insertions, 16 deletions
diff --git a/make/stub_includes/x11/X11/X.h b/make/stub_includes/x11/X11/X.h
index 239836ee4..2deb46597 100644
--- a/make/stub_includes/x11/X11/X.h
+++ b/make/stub_includes/x11/X11/X.h
@@ -17,12 +17,10 @@ typedef XID           Pixmap;
 typedef XID           Window;
 
 typedef struct __GLXcontextRec *GLXContext;
-//typedef void *GLXContext;
 typedef XID GLXPixmap;
 typedef XID GLXDrawable;
 /* GLX 1.3 and later */
 typedef struct __GLXFBConfigRec *GLXFBConfig;
-//typedef void *GLXFBConfig;
 typedef XID GLXFBConfigID;
 typedef XID GLXContextID;
 typedef XID GLXWindow;
diff --git a/make/stub_includes/x11/glxext.c b/make/stub_includes/x11/glxext.c
index 67906a088..e781b6e88 100644
--- a/make/stub_includes/x11/glxext.c
+++ b/make/stub_includes/x11/glxext.c
@@ -1,14 +1,17 @@
-#define GLAPI
+// Routines needed from Xlib.h and Xutil.h (placed here to avoid having
+// XVisualInfo generated multiple times)
+#ifndef _Xconst
+#define _Xconst const
+#endif /* _Xconst */
 
-// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-// "glext.h" are parsed.
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glx.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
-#include <GL/gl.h>
-
 // Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
 // "glxext.h" are parsed.
 #define GLX_GLXEXT_PROTOTYPES
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <GL/glxext.h>
+#include <GL/glx.h>
+// GL/glxext.h included by GL/glx.h
diff --git a/make/stub_includes/x11/window-system1.c b/make/stub_includes/x11/window-system1.c
index a06f39dae..e781b6e88 100644
--- a/make/stub_includes/x11/window-system1.c
+++ b/make/stub_includes/x11/window-system1.c
@@ -1,14 +1,17 @@
-// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-// "glext.h" are parsed.
-#define GL_GLEXT_PROTOTYPES
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <GL/glx.h>
-
 // Routines needed from Xlib.h and Xutil.h (placed here to avoid having
 // XVisualInfo generated multiple times)
 #ifndef _Xconst
 #define _Xconst const
 #endif /* _Xconst */
 
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glx.h" are parsed.
+#define GL_GLEXT_PROTOTYPES
+
+// Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glxext.h" are parsed.
+#define GLX_GLXEXT_PROTOTYPES
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <GL/glx.h>
+// GL/glxext.h included by GL/glx.h