5 files changed, 8 insertions, 1 deletions
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index ef4992446..3a3b43027 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -57,6 +57,7 @@
 #include "glapi.h"
 #include "glthread.h"
 #include "dispatch.h"
+#include "indirect_dispatch.h"
 
 #ifndef GLX_TEXTURE_TARGET_EXT
 #define GLX_TEXTURE_TARGET_EXT              0x6001
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index ca708a9a7..ed1276f22 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -54,6 +54,7 @@
 #include "glapi.h"
 #include "glthread.h"
 #include "dispatch.h"
+#include "indirect_dispatch.h"
 
 static int __glXSwapGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
 static int __glXSwapCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc);
diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h
index 5c27aa0b8..d57745a25 100644
--- a/GL/glx/glxcontext.h
+++ b/GL/glx/glxcontext.h
@@ -177,4 +177,6 @@ struct __GLXcontext {
 #define	__GLX_PENDING_DESTROY	0x2
 #define __GLX_PENDING_SWAP	0x4
 
+void __glXContextDestroy(__GLXcontext *context);
+
 #endif /* !__GLX_context_h__ */
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 40f137864..0760290a1 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -227,7 +227,7 @@ __glXDRIcontextDestroy(__GLXcontext *baseContext)
     context->driContext.destroyContext(NULL,
 				       context->base.pScreen->myNum,
 				       context->driContext.private);
-    __glXContextDestroy(context);
+    __glXContextDestroy(&context->base);
     xfree(context);
 }
 
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
index 62e756551..a41720f54 100644
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@@ -101,6 +101,9 @@ extern __GLXscreen *__glXgetActiveScreen(int num);
 void GlxSetVisualConfigs(int nconfigs, 
                          __GLXvisualConfig *configs, void **privates);
 
+struct _glapi_table;
+void GlxSetRenderTables (struct _glapi_table *table);
+
 void __glXScreenInitVisuals(__GLXscreen *screen);
 
 /*