1 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/glx/swap_interval.c b/xorg-server/glx/swap_interval.c
index 0bae3247e..f55af319b 100644
--- a/xorg-server/glx/swap_interval.c
+++ b/xorg-server/glx/swap_interval.c
@@ -24,6 +24,10 @@
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#else
+
+#include "glheader.h"
+
 #endif
 
 #include "glxserver.h"
@@ -37,7 +41,6 @@
 #include "glapi.h"
 #include "glthread.h"
 #include "dispatch.h"
-#include "glapioffsets.h"
 #include "glxbyteorder.h"
 
 static int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap);
@@ -47,7 +50,7 @@ int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap)
     xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
     ClientPtr client = cl->client;
     const GLXContextTag tag = req->contextTag;
-    __GLXcontext *cx;
+    struct glx_context *cx;
     GLint interval;