diff --git a/randr/randrstr_priv.h b/randr/randrstr_priv.h
index 7f802215f..4864f5272 100644
--- a/randr/randrstr_priv.h
+++ b/randr/randrstr_priv.h
@@ -136,8 +136,4 @@ int ProcRRCreateLease(ClientPtr client);
 
 int ProcRRFreeLease(ClientPtr client);
 
-int ProcRRQueryVersion(ClientPtr client);
-
-int ProcRRSelectInput(ClientPtr client);
-
 #endif /* _XSERVER_RANDRSTR_PRIV_H_ */
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index 4381f52ca..615e89312 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -36,7 +36,7 @@ RRClientKnowsRates(ClientPtr pClient)
                            1, 1) >= 0;
 }
 
-int
+static int
 ProcRRQueryVersion(ClientPtr client)
 {
     xRRQueryVersionReply rep = {
@@ -72,7 +72,7 @@ ProcRRQueryVersion(ClientPtr client)
     return Success;
 }
 
-int
+static int
 ProcRRSelectInput(ClientPtr client)
 {
     REQUEST(xRRSelectInputReq);
diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c
index 48f908fd1..6de8775b0 100644
--- a/randr/rrsdispatch.c
+++ b/randr/rrsdispatch.c
@@ -30,7 +30,7 @@ SProcRRQueryVersion(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRQueryVersionReq);
     swapl(&stuff->majorVersion);
     swapl(&stuff->minorVersion);
-    return ProcRRQueryVersion(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -40,7 +40,7 @@ SProcRRGetScreenInfo(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetScreenInfoReq);
     swapl(&stuff->window);
-    return ProcRRGetScreenInfo(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -60,7 +60,7 @@ SProcRRSetScreenConfig(ClientPtr client)
     swapl(&stuff->timestamp);
     swaps(&stuff->sizeID);
     swaps(&stuff->rotation);
-    return ProcRRSetScreenConfig(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -71,7 +71,7 @@ SProcRRSelectInput(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRSelectInputReq);
     swapl(&stuff->window);
     swaps(&stuff->enable);
-    return ProcRRSelectInput(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -81,7 +81,7 @@ SProcRRGetScreenSizeRange(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);
     swapl(&stuff->window);
-    return ProcRRGetScreenSizeRange(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -95,7 +95,7 @@ SProcRRSetScreenSize(ClientPtr client)
     swaps(&stuff->height);
     swapl(&stuff->widthInMillimeters);
     swapl(&stuff->heightInMillimeters);
-    return ProcRRSetScreenSize(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -105,7 +105,7 @@ SProcRRGetScreenResources(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetScreenResourcesReq);
     swapl(&stuff->window);
-    return ProcRRGetScreenResources(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -116,7 +116,7 @@ SProcRRGetScreenResourcesCurrent(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRGetScreenResourcesCurrentReq);
     swaps(&stuff->length);
     swapl(&stuff->window);
-    return ProcRRGetScreenResourcesCurrent(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -127,7 +127,7 @@ SProcRRGetOutputInfo(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRGetOutputInfoReq);
     swapl(&stuff->output);
     swapl(&stuff->configTimestamp);
-    return ProcRRGetScreenResources(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -137,7 +137,7 @@ SProcRRListOutputProperties(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRListOutputPropertiesReq);
     swapl(&stuff->output);
-    return ProcRRListOutputProperties(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -148,7 +148,7 @@ SProcRRQueryOutputProperty(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRQueryOutputPropertyReq);
     swapl(&stuff->output);
     swapl(&stuff->property);
-    return ProcRRQueryOutputProperty(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -160,7 +160,7 @@ SProcRRConfigureOutputProperty(ClientPtr client)
     swapl(&stuff->output);
     swapl(&stuff->property);
     SwapRestL(stuff);
-    return ProcRRConfigureOutputProperty(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -186,7 +186,7 @@ SProcRRChangeOutputProperty(ClientPtr client)
         client->errorValue = stuff->format;
         return BadValue;
     }
-    return ProcRRChangeOutputProperty(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -197,7 +197,7 @@ SProcRRDeleteOutputProperty(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRDeleteOutputPropertyReq);
     swapl(&stuff->output);
     swapl(&stuff->property);
-    return ProcRRDeleteOutputProperty(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -211,7 +211,7 @@ SProcRRGetOutputProperty(ClientPtr client)
     swapl(&stuff->type);
     swapl(&stuff->longOffset);
     swapl(&stuff->longLength);
-    return ProcRRGetOutputProperty(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -237,7 +237,7 @@ SProcRRCreateMode(ClientPtr client)
     swaps(&modeinfo->vTotal);
     swaps(&modeinfo->nameLength);
     swapl(&modeinfo->modeFlags);
-    return ProcRRCreateMode(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -247,7 +247,7 @@ SProcRRDestroyMode(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRDestroyModeReq);
     swapl(&stuff->mode);
-    return ProcRRDestroyMode(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -258,7 +258,7 @@ SProcRRAddOutputMode(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRAddOutputModeReq);
     swapl(&stuff->output);
     swapl(&stuff->mode);
-    return ProcRRAddOutputMode(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -269,7 +269,7 @@ SProcRRDeleteOutputMode(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);
     swapl(&stuff->output);
     swapl(&stuff->mode);
-    return ProcRRDeleteOutputMode(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -280,7 +280,7 @@ SProcRRGetCrtcInfo(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRGetCrtcInfoReq);
     swapl(&stuff->crtc);
     swapl(&stuff->configTimestamp);
-    return ProcRRGetCrtcInfo(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -297,7 +297,7 @@ SProcRRSetCrtcConfig(ClientPtr client)
     swapl(&stuff->mode);
     swaps(&stuff->rotation);
     SwapRestL(stuff);
-    return ProcRRSetCrtcConfig(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -307,7 +307,7 @@ SProcRRGetCrtcGammaSize(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetCrtcGammaSizeReq);
     swapl(&stuff->crtc);
-    return ProcRRGetCrtcGammaSize(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -317,7 +317,7 @@ SProcRRGetCrtcGamma(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetCrtcGammaReq);
     swapl(&stuff->crtc);
-    return ProcRRGetCrtcGamma(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -329,7 +329,7 @@ SProcRRSetCrtcGamma(ClientPtr client)
     swapl(&stuff->crtc);
     swaps(&stuff->size);
     SwapRestS(stuff);
-    return ProcRRSetCrtcGamma(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -353,7 +353,7 @@ SProcRRSetCrtcTransform(ClientPtr client)
         return BadLength;
 
     SwapLongs(params, nparams);
-    return ProcRRSetCrtcTransform(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -363,7 +363,7 @@ SProcRRGetCrtcTransform(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetCrtcTransformReq);
     swapl(&stuff->crtc);
-    return ProcRRGetCrtcTransform(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -373,7 +373,7 @@ SProcRRGetPanning(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetPanningReq);
     swapl(&stuff->crtc);
-    return ProcRRGetPanning(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -396,7 +396,7 @@ SProcRRSetPanning(ClientPtr client)
     swaps(&stuff->border_top);
     swaps(&stuff->border_right);
     swaps(&stuff->border_bottom);
-    return ProcRRSetPanning(client);
+    return (*ProcRandrVector[stuff->randrReqType]) (client);
 }
 
 static int _X_COLD
@@ -407,7 +407,7 @@ SProcRRSetOutputPrimary(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRSetOutputPrimaryReq);
     swapl(&stuff->window);
     swapl(&stuff->output);
-    return ProcRRSetOutputPrimary(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -417,7 +417,7 @@ SProcRRGetOutputPrimary(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetOutputPrimaryReq);
     swapl(&stuff->window);
-    return ProcRRGetOutputPrimary(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -427,7 +427,7 @@ SProcRRGetProviders(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRGetProvidersReq);
     swapl(&stuff->window);
-    return ProcRRGetProviders(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -438,7 +438,7 @@ SProcRRGetProviderInfo(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRGetProviderInfoReq);
     swapl(&stuff->provider);
     swapl(&stuff->configTimestamp);
-    return ProcRRGetProviderInfo(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -450,7 +450,7 @@ SProcRRSetProviderOffloadSink(ClientPtr client)
     swapl(&stuff->provider);
     swapl(&stuff->sink_provider);
     swapl(&stuff->configTimestamp);
-    return ProcRRSetProviderOffloadSink(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -462,7 +462,7 @@ SProcRRSetProviderOutputSource(ClientPtr client)
     swapl(&stuff->provider);
     swapl(&stuff->source_provider);
     swapl(&stuff->configTimestamp);
-    return ProcRRSetProviderOutputSource(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -472,7 +472,7 @@ SProcRRListProviderProperties(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRRListProviderPropertiesReq);
     swapl(&stuff->provider);
-    return ProcRRListProviderProperties(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -483,7 +483,7 @@ SProcRRQueryProviderProperty(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRQueryProviderPropertyReq);
     swapl(&stuff->provider);
     swapl(&stuff->property);
-    return ProcRRQueryProviderProperty(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -496,7 +496,7 @@ SProcRRConfigureProviderProperty(ClientPtr client)
     swapl(&stuff->property);
     /* TODO: no way to specify format? */
     SwapRestL(stuff);
-    return ProcRRConfigureProviderProperty(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -519,7 +519,7 @@ SProcRRChangeProviderProperty(ClientPtr client)
         SwapRestL(stuff);
         break;
     }
-    return ProcRRChangeProviderProperty(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -530,7 +530,7 @@ SProcRRDeleteProviderProperty(ClientPtr client)
     REQUEST_SIZE_MATCH(xRRDeleteProviderPropertyReq);
     swapl(&stuff->provider);
     swapl(&stuff->property);
-    return ProcRRDeleteProviderProperty(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -544,7 +544,7 @@ SProcRRGetProviderProperty(ClientPtr client)
     swapl(&stuff->type);
     swapl(&stuff->longOffset);
     swapl(&stuff->longLength);
-    return ProcRRGetProviderProperty(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -553,7 +553,7 @@ SProcRRGetMonitors(ClientPtr client) {
 
     REQUEST_SIZE_MATCH(xRRGetMonitorsReq);
     swapl(&stuff->window);
-    return ProcRRGetMonitors(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -569,7 +569,7 @@ SProcRRSetMonitor(ClientPtr client) {
     swaps(&stuff->monitor.width);
     swaps(&stuff->monitor.height);
     SwapRestL(stuff);
-    return ProcRRSetMonitor(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -579,7 +579,7 @@ SProcRRDeleteMonitor(ClientPtr client) {
     REQUEST_SIZE_MATCH(xRRDeleteMonitorReq);
     swapl(&stuff->window);
     swapl(&stuff->name);
-    return ProcRRDeleteMonitor(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -591,7 +591,7 @@ SProcRRCreateLease(ClientPtr client) {
     swaps(&stuff->nCrtcs);
     swaps(&stuff->nOutputs);
     SwapRestL(stuff);
-    return ProcRRCreateLease(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 static int _X_COLD
@@ -600,7 +600,7 @@ SProcRRFreeLease(ClientPtr client) {
 
     REQUEST_SIZE_MATCH(xRRFreeLeaseReq);
     swapl(&stuff->lid);
-    return ProcRRFreeLease(client);
+    return ProcRandrVector[stuff->randrReqType] (client);
 }
 
 int (*SProcRandrVector[RRNumberRequests]) (ClientPtr) = {