diff --git a/glx/glxext.c b/glx/glxext.c
index e083c6cf8..db767f753 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -50,7 +50,6 @@
 ** from the server's perspective.
 */
 __GLXcontext *__glXLastContext;
-__GLXcontext *__glXContextList;
 
 /*
 ** X resources.
@@ -66,11 +65,6 @@ xGLXSingleReply __glXReply;
 static DevPrivateKeyRec glxClientPrivateKeyRec;
 #define glxClientPrivateKey (&glxClientPrivateKeyRec)
 
-/*
-** Client that called into GLX dispatch.
-*/
-ClientPtr __pGlxClient;
-
 /*
 ** Forward declarations.
 */
@@ -547,8 +541,6 @@ static int __glXDispatch(ClientPtr client)
 	GLboolean rendering = opcode <= X_GLXRenderLarge;
 	__glXleaveServer(rendering);
 
-	__pGlxClient = client;
-
 	retval = (*proc)(cl, (GLbyte *) stuff);
 
 	__glXenterServer(rendering);
diff --git a/glx/glxserver.h b/glx/glxserver.h
index e95112606..891315b74 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -96,8 +96,6 @@ void __glXScreenInitVisuals(__GLXscreen *screen);
 extern __GLXcontext *__glXLastContext;
 extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*);
 
-extern ClientPtr __pGlxClient;
-
 int __glXError(int error);
 
 /************************************************************************/