diff --git a/glx/glxext.c b/glx/glxext.c
index db767f753..3f3dd798f 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -385,7 +385,7 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag,
     ** See if the context tag is legal; it is managed by the extension,
     ** so if it's invalid, we have an implementation error.
     */
-    cx = (__GLXcontext *) __glXLookupContextByTag(cl, tag);
+    cx = __glXLookupContextByTag(cl, tag);
     if (!cx) {
 	cl->client->errorValue = tag;
 	*error = __glXError(GLXBadContextTag);
@@ -534,9 +534,8 @@ static int __glXDispatch(ClientPtr client)
     /*
     ** Use the opcode to index into the procedure table.
     */
-    proc = (__GLXdispatchSingleProcPtr) __glXGetProtocolDecodeFunction(& Single_dispatch_info,
-								       opcode,
-								       client->swapped);
+    proc = __glXGetProtocolDecodeFunction(& Single_dispatch_info, opcode,
+                                          client->swapped);
     if (proc != NULL) {
 	GLboolean rendering = opcode <= X_GLXRenderLarge;
 	__glXleaveServer(rendering);