diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index 94b4cef91..05b434122 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -47,12 +47,6 @@ Equipment Corporation.
 #include "globals.h"
 #include "panoramiXh.h"
 
-static int _X_COLD
-SProcPanoramiXQueryVersion(ClientPtr client)
-{
-    return ProcPanoramiXQueryVersion(client);
-}
-
 static int _X_COLD
 SProcPanoramiXGetState(ClientPtr client)
 {
@@ -81,25 +75,13 @@ SProcPanoramiXGetScreenSize(ClientPtr client)
     return ProcPanoramiXGetScreenSize(client);
 }
 
-static int _X_COLD
-SProcXineramaIsActive(ClientPtr client)
-{
-    return ProcXineramaIsActive(client);
-}
-
-static int _X_COLD
-SProcXineramaQueryScreens(ClientPtr client)
-{
-    return ProcXineramaQueryScreens(client);
-}
-
 int _X_COLD
 SProcPanoramiXDispatch(ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data) {
     case X_PanoramiXQueryVersion:
-        return SProcPanoramiXQueryVersion(client);
+        return ProcPanoramiXQueryVersion(client);
     case X_PanoramiXGetState:
         return SProcPanoramiXGetState(client);
     case X_PanoramiXGetScreenCount:
@@ -107,9 +89,9 @@ SProcPanoramiXDispatch(ClientPtr client)
     case X_PanoramiXGetScreenSize:
         return SProcPanoramiXGetScreenSize(client);
     case X_XineramaIsActive:
-        return SProcXineramaIsActive(client);
+        return ProcXineramaIsActive(client);
     case X_XineramaQueryScreens:
-        return SProcXineramaQueryScreens(client);
+        return ProcXineramaQueryScreens(client);
     }
     return BadRequest;
 }