1 files changed, 10 insertions, 6 deletions
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c
index beaebcd29..4db7c889d 100644
--- a/xorg-server/glx/single2.c
+++ b/xorg-server/glx/single2.c
@@ -30,6 +30,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include <string.h>
@@ -50,7 +54,7 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 {
     GLsizei size;
     GLenum type;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     int error;
 
     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -78,7 +82,7 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
 {
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLsizei size;
     int error;
 
@@ -108,7 +112,7 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
 {
     ClientPtr client;
     xGLXRenderModeReply reply;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLint nitems=0, retBytes=0, retval, newModeCheck;
     GLubyte *retBuffer = NULL;
     GLenum newMode;
@@ -204,7 +208,7 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
 {
-	__GLXcontext *cx;
+	struct glx_context *cx;
 	int error;
 
 	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
@@ -219,7 +223,7 @@ int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
 
 int __glXDisp_Finish(__GLXclientState *cl, GLbyte *pc)
 {
-    __GLXcontext *cx;
+    struct glx_context *cx;
     ClientPtr client;
     int error;
 
@@ -307,7 +311,7 @@ char *__glXcombine_strings(const char *cext_string, const char *sext_string)
 int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
 {
     ClientPtr client;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLenum name;
     const char *string;
     __GLX_DECLARE_SWAP_VARIABLES;