diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 2d8985350..6babae19d 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -31,6 +31,7 @@ SOFTWARE.
 #include <X11/extensions/Xvproto.h>
 
 #include "dix/dix_priv.h"
+#include "dix/request_priv.h"
 #include "Xext/xvdix_priv.h"
 #include "Xext/panoramiX.h"
 #include "Xext/panoramiXsrv.h"
@@ -57,6 +58,8 @@ unsigned long XvXRTPort;
 static int
 ProcXvQueryExtension(ClientPtr client)
 {
+    REQUEST_HEAD_STRUCT(xvQueryExtensionReq);
+
     xvQueryExtensionReply rep = {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
@@ -65,9 +68,6 @@ ProcXvQueryExtension(ClientPtr client)
         .revision = XvRevision
     };
 
-    /* REQUEST(xvQueryExtensionReq); */
-    REQUEST_SIZE_MATCH(xvQueryExtensionReq);
-
     if (client->swapped) {
         swaps(&rep.sequenceNumber);
         swapl(&rep.length);
@@ -90,8 +90,8 @@ ProcXvQueryAdaptors(ClientPtr client)
     ScreenPtr pScreen;
     XvScreenPtr pxvs;
 
-    REQUEST(xvQueryAdaptorsReq);
-    REQUEST_SIZE_MATCH(xvQueryAdaptorsReq);
+    REQUEST_HEAD_STRUCT(xvQueryAdaptorsReq);
+    REQUEST_FIELD_CARD32(window);
 
     rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
@@ -189,8 +189,8 @@ ProcXvQueryEncodings(ClientPtr client)
     int ne;
     XvEncodingPtr pe;
 
-    REQUEST(xvQueryEncodingsReq);
-    REQUEST_SIZE_MATCH(xvQueryEncodingsReq);
+    REQUEST_HEAD_STRUCT(xvQueryEncodingsReq);
+    REQUEST_FIELD_CARD32(port);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -265,8 +265,7 @@ SingleXvPutVideo(ClientPtr client)
     GCPtr pGC;
     int status;
 
-    REQUEST(xvPutVideoReq);
-    REQUEST_SIZE_MATCH(xvPutVideoReq);
+    REQUEST_HEAD_STRUCT(xvPutVideoReq);
 
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
@@ -292,6 +291,19 @@ static int XineramaXvPutVideo(ClientPtr client);
 static int
 ProcXvPutVideo(ClientPtr client)
 {
+    REQUEST_HEAD_STRUCT(xvPutVideoReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
+    REQUEST_FIELD_CARD32(gc);
+    REQUEST_FIELD_CARD16(vid_x);
+    REQUEST_FIELD_CARD16(vid_y);
+    REQUEST_FIELD_CARD16(vid_w);
+    REQUEST_FIELD_CARD16(vid_h);
+    REQUEST_FIELD_CARD16(drw_x);
+    REQUEST_FIELD_CARD16(drw_y);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
+
 #ifdef XINERAMA
     if (xvUseXinerama)
         return XineramaXvPutVideo(client);
@@ -307,8 +319,7 @@ SingleXvPutStill(ClientPtr client)
     GCPtr pGC;
     int status;
 
-    REQUEST(xvPutStillReq);
-    REQUEST_SIZE_MATCH(xvPutStillReq);
+    REQUEST_HEAD_STRUCT(xvPutStillReq);
 
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
@@ -334,6 +345,19 @@ static int XineramaXvPutStill(ClientPtr client);
 static int
 ProcXvPutStill(ClientPtr client)
 {
+    REQUEST_HEAD_STRUCT(xvPutStillReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
+    REQUEST_FIELD_CARD32(gc);
+    REQUEST_FIELD_CARD16(vid_x);
+    REQUEST_FIELD_CARD16(vid_y);
+    REQUEST_FIELD_CARD16(vid_w);
+    REQUEST_FIELD_CARD16(vid_h);
+    REQUEST_FIELD_CARD16(drw_x);
+    REQUEST_FIELD_CARD16(drw_y);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
+
 #ifdef XINERAMA
     if (xvUseXinerama)
         return XineramaXvPutStill(client);
@@ -349,8 +373,18 @@ ProcXvGetVideo(ClientPtr client)
     GCPtr pGC;
     int status;
 
-    REQUEST(xvGetVideoReq);
-    REQUEST_SIZE_MATCH(xvGetVideoReq);
+    REQUEST_HEAD_STRUCT(xvGetVideoReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
+    REQUEST_FIELD_CARD32(gc);
+    REQUEST_FIELD_CARD16(vid_x);
+    REQUEST_FIELD_CARD16(vid_y);
+    REQUEST_FIELD_CARD16(vid_w);
+    REQUEST_FIELD_CARD16(vid_h);
+    REQUEST_FIELD_CARD16(drw_x);
+    REQUEST_FIELD_CARD16(drw_y);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
 
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixReadAccess);
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
@@ -379,8 +413,18 @@ ProcXvGetStill(ClientPtr client)
     GCPtr pGC;
     int status;
 
-    REQUEST(xvGetStillReq);
-    REQUEST_SIZE_MATCH(xvGetStillReq);
+    REQUEST_HEAD_STRUCT(xvGetStillReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
+    REQUEST_FIELD_CARD32(gc);
+    REQUEST_FIELD_CARD16(vid_x);
+    REQUEST_FIELD_CARD16(vid_y);
+    REQUEST_FIELD_CARD16(vid_w);
+    REQUEST_FIELD_CARD16(vid_h);
+    REQUEST_FIELD_CARD16(drw_x);
+    REQUEST_FIELD_CARD16(drw_y);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
 
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixReadAccess);
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
@@ -407,8 +451,8 @@ ProcXvSelectVideoNotify(ClientPtr client)
     DrawablePtr pDraw;
     int rc;
 
-    REQUEST(xvSelectVideoNotifyReq);
-    REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq);
+    REQUEST_HEAD_STRUCT(xvSelectVideoNotifyReq);
+    REQUEST_FIELD_CARD32(drawable);
 
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
                            DixReceiveAccess);
@@ -423,8 +467,8 @@ ProcXvSelectPortNotify(ClientPtr client)
 {
     XvPortPtr pPort;
 
-    REQUEST(xvSelectPortNotifyReq);
-    REQUEST_SIZE_MATCH(xvSelectPortNotifyReq);
+    REQUEST_HEAD_STRUCT(xvSelectPortNotifyReq);
+    REQUEST_FIELD_CARD32(port);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -437,8 +481,9 @@ ProcXvGrabPort(ClientPtr client)
     int result, status;
     XvPortPtr pPort;
 
-    REQUEST(xvGrabPortReq);
-    REQUEST_SIZE_MATCH(xvGrabPortReq);
+    REQUEST_HEAD_STRUCT(xvGrabPortReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(time);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -467,8 +512,9 @@ ProcXvUngrabPort(ClientPtr client)
 {
     XvPortPtr pPort;
 
-    REQUEST(xvGrabPortReq);
-    REQUEST_SIZE_MATCH(xvGrabPortReq);
+    REQUEST_HEAD_STRUCT(xvGrabPortReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(time);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -482,8 +528,9 @@ SingleXvStopVideo(ClientPtr client)
     DrawablePtr pDraw;
     XvPortPtr pPort;
 
-    REQUEST(xvStopVideoReq);
-    REQUEST_SIZE_MATCH(xvStopVideoReq);
+    REQUEST_HEAD_STRUCT(xvStopVideoReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -512,8 +559,10 @@ SingleXvSetPortAttribute(ClientPtr client)
     int status;
     XvPortPtr pPort;
 
-    REQUEST(xvSetPortAttributeReq);
-    REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
+    REQUEST_HEAD_STRUCT(xvSetPortAttributeReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(attribute);
+    REQUEST_FIELD_CARD32(value);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixSetAttrAccess);
 
@@ -552,8 +601,9 @@ ProcXvGetPortAttribute(ClientPtr client)
     int status;
     XvPortPtr pPort;
 
-    REQUEST(xvGetPortAttributeReq);
-    REQUEST_SIZE_MATCH(xvGetPortAttributeReq);
+    REQUEST_HEAD_STRUCT(xvGetPortAttributeReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(attribute);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixGetAttrAccess);
 
@@ -590,8 +640,12 @@ ProcXvQueryBestSize(ClientPtr client)
     unsigned int actual_width, actual_height;
     XvPortPtr pPort;
 
-    REQUEST(xvQueryBestSizeReq);
-    REQUEST_SIZE_MATCH(xvQueryBestSizeReq);
+    REQUEST_HEAD_STRUCT(xvQueryBestSizeReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD16(vid_w);
+    REQUEST_FIELD_CARD16(vid_h);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -625,8 +679,8 @@ ProcXvQueryPortAttributes(ClientPtr client)
     XvPortPtr pPort;
     XvAttributePtr pAtt;
 
-    REQUEST(xvQueryPortAttributesReq);
-    REQUEST_SIZE_MATCH(xvQueryPortAttributesReq);
+    REQUEST_HEAD_STRUCT(xvQueryPortAttributesReq);
+    REQUEST_FIELD_CARD32(port);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixGetAttrAccess);
 
@@ -697,8 +751,7 @@ SingleXvPutImage(ClientPtr client)
     int status, i, size;
     CARD16 width, height;
 
-    REQUEST(xvPutImageReq);
-    REQUEST_AT_LEAST_SIZE(xvPutImageReq);
+    REQUEST_HEAD_AT_LEAST(xvPutImageReq);
 
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
@@ -750,6 +803,22 @@ XineramaXvPutImage(ClientPtr client);
 static int
 ProcXvPutImage(ClientPtr client)
 {
+    REQUEST_HEAD_AT_LEAST(xvPutImageReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
+    REQUEST_FIELD_CARD32(gc);
+    REQUEST_FIELD_CARD32(id);
+    REQUEST_FIELD_CARD16(src_x);
+    REQUEST_FIELD_CARD16(src_y);
+    REQUEST_FIELD_CARD16(src_w);
+    REQUEST_FIELD_CARD16(src_h);
+    REQUEST_FIELD_CARD16(drw_x);
+    REQUEST_FIELD_CARD16(drw_y);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
+    REQUEST_FIELD_CARD16(width);
+    REQUEST_FIELD_CARD16(height);
+
 #ifdef XINERAMA
     if (xvUseXinerama)
         return XineramaXvPutImage(client);
@@ -770,8 +839,7 @@ SingleXvShmPutImage(ClientPtr client)
     int status, size_needed, i;
     CARD16 width, height;
 
-    REQUEST(xvShmPutImageReq);
-    REQUEST_SIZE_MATCH(xvShmPutImageReq);
+    REQUEST_HEAD_STRUCT(xvShmPutImageReq);
 
     VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
@@ -835,13 +903,30 @@ SingleXvShmPutImage(ClientPtr client)
 }
 
 static int XineramaXvShmPutImage(ClientPtr client);
-
 #endif /* MITSHM */
 
 static int
 ProcXvShmPutImage(ClientPtr client)
 {
 #ifdef MITSHM
+    REQUEST_HEAD_STRUCT(xvShmPutImageReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(drawable);
+    REQUEST_FIELD_CARD32(gc);
+    REQUEST_FIELD_CARD32(shmseg);
+    REQUEST_FIELD_CARD32(id);
+    REQUEST_FIELD_CARD32(offset);
+    REQUEST_FIELD_CARD16(src_x);
+    REQUEST_FIELD_CARD16(src_y);
+    REQUEST_FIELD_CARD16(src_w);
+    REQUEST_FIELD_CARD16(src_h);
+    REQUEST_FIELD_CARD16(drw_x);
+    REQUEST_FIELD_CARD16(drw_y);
+    REQUEST_FIELD_CARD16(drw_w);
+    REQUEST_FIELD_CARD16(drw_h);
+    REQUEST_FIELD_CARD16(width);
+    REQUEST_FIELD_CARD16(height);
+
 #ifdef XINERAMA
     if (xvUseXinerama)
         return XineramaXvShmPutImage(client);
@@ -867,9 +952,11 @@ ProcXvQueryImageAttributes(ClientPtr client)
     int32_t *offsets;
     int32_t *pitches;
 
-    REQUEST(xvQueryImageAttributesReq);
-
-    REQUEST_SIZE_MATCH(xvQueryImageAttributesReq);
+    REQUEST_HEAD_STRUCT(xvQueryImageAttributesReq);
+    REQUEST_FIELD_CARD32(port);
+    REQUEST_FIELD_CARD32(id);
+    REQUEST_FIELD_CARD16(width);
+    REQUEST_FIELD_CARD16(height);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -936,9 +1023,8 @@ ProcXvListImageFormats(ClientPtr client)
     XvImagePtr pImage;
     int i;
 
-    REQUEST(xvListImageFormatsReq);
-
-    REQUEST_SIZE_MATCH(xvListImageFormatsReq);
+    REQUEST_HEAD_STRUCT(xvListImageFormatsReq);
+    REQUEST_FIELD_CARD32(port);
 
     VALIDATE_XV_PORT(stuff->port, pPort, DixReadAccess);
 
@@ -1064,317 +1150,6 @@ ProcXvDispatch(ClientPtr client)
     }
 }
 
-/* Swapped Procs */
-
-static int _X_COLD
-SProcXvQueryAdaptors(ClientPtr client)
-{
-    REQUEST(xvQueryAdaptorsReq);
-    REQUEST_SIZE_MATCH(xvQueryAdaptorsReq);
-    swapl(&stuff->window);
-    return ProcXvQueryAdaptors(client);
-}
-
-static int _X_COLD
-SProcXvQueryEncodings(ClientPtr client)
-{
-    REQUEST(xvQueryEncodingsReq);
-    REQUEST_SIZE_MATCH(xvQueryEncodingsReq);
-    swapl(&stuff->port);
-    return ProcXvQueryEncodings(client);
-}
-
-static int _X_COLD
-SProcXvGrabPort(ClientPtr client)
-{
-    REQUEST(xvGrabPortReq);
-    REQUEST_SIZE_MATCH(xvGrabPortReq);
-    swapl(&stuff->port);
-    swapl(&stuff->time);
-    return ProcXvGrabPort(client);
-}
-
-static int _X_COLD
-SProcXvUngrabPort(ClientPtr client)
-{
-    REQUEST(xvUngrabPortReq);
-    REQUEST_SIZE_MATCH(xvUngrabPortReq);
-    swapl(&stuff->port);
-    swapl(&stuff->time);
-    return ProcXvUngrabPort(client);
-}
-
-static int _X_COLD
-SProcXvPutVideo(ClientPtr client)
-{
-    REQUEST(xvPutVideoReq);
-    REQUEST_SIZE_MATCH(xvPutVideoReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swaps(&stuff->vid_x);
-    swaps(&stuff->vid_y);
-    swaps(&stuff->vid_w);
-    swaps(&stuff->vid_h);
-    swaps(&stuff->drw_x);
-    swaps(&stuff->drw_y);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    return ProcXvPutVideo(client);
-}
-
-static int _X_COLD
-SProcXvPutStill(ClientPtr client)
-{
-    REQUEST(xvPutStillReq);
-    REQUEST_SIZE_MATCH(xvPutStillReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swaps(&stuff->vid_x);
-    swaps(&stuff->vid_y);
-    swaps(&stuff->vid_w);
-    swaps(&stuff->vid_h);
-    swaps(&stuff->drw_x);
-    swaps(&stuff->drw_y);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    return ProcXvPutStill(client);
-}
-
-static int _X_COLD
-SProcXvGetVideo(ClientPtr client)
-{
-    REQUEST(xvGetVideoReq);
-    REQUEST_SIZE_MATCH(xvGetVideoReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swaps(&stuff->vid_x);
-    swaps(&stuff->vid_y);
-    swaps(&stuff->vid_w);
-    swaps(&stuff->vid_h);
-    swaps(&stuff->drw_x);
-    swaps(&stuff->drw_y);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    return ProcXvGetVideo(client);
-}
-
-static int _X_COLD
-SProcXvGetStill(ClientPtr client)
-{
-    REQUEST(xvGetStillReq);
-    REQUEST_SIZE_MATCH(xvGetStillReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swaps(&stuff->vid_x);
-    swaps(&stuff->vid_y);
-    swaps(&stuff->vid_w);
-    swaps(&stuff->vid_h);
-    swaps(&stuff->drw_x);
-    swaps(&stuff->drw_y);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    return ProcXvGetStill(client);
-}
-
-static int _X_COLD
-SProcXvPutImage(ClientPtr client)
-{
-    REQUEST(xvPutImageReq);
-    REQUEST_AT_LEAST_SIZE(xvPutImageReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swapl(&stuff->id);
-    swaps(&stuff->src_x);
-    swaps(&stuff->src_y);
-    swaps(&stuff->src_w);
-    swaps(&stuff->src_h);
-    swaps(&stuff->drw_x);
-    swaps(&stuff->drw_y);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    swaps(&stuff->width);
-    swaps(&stuff->height);
-    return ProcXvPutImage(client);
-}
-
-#ifdef MITSHM
-static int _X_COLD
-SProcXvShmPutImage(ClientPtr client)
-{
-    REQUEST(xvShmPutImageReq);
-    REQUEST_SIZE_MATCH(xvShmPutImageReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    swapl(&stuff->gc);
-    swapl(&stuff->shmseg);
-    swapl(&stuff->id);
-    swapl(&stuff->offset);
-    swaps(&stuff->src_x);
-    swaps(&stuff->src_y);
-    swaps(&stuff->src_w);
-    swaps(&stuff->src_h);
-    swaps(&stuff->drw_x);
-    swaps(&stuff->drw_y);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    swaps(&stuff->width);
-    swaps(&stuff->height);
-    return ProcXvShmPutImage(client);
-}
-#else                           /* MITSHM */
-#define SProcXvShmPutImage ProcXvShmPutImage
-#endif
-
-static int _X_COLD
-SProcXvSelectVideoNotify(ClientPtr client)
-{
-    REQUEST(xvSelectVideoNotifyReq);
-    REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq);
-    swapl(&stuff->drawable);
-    return ProcXvSelectVideoNotify(client);
-}
-
-static int _X_COLD
-SProcXvSelectPortNotify(ClientPtr client)
-{
-    REQUEST(xvSelectPortNotifyReq);
-    REQUEST_SIZE_MATCH(xvSelectPortNotifyReq);
-    swapl(&stuff->port);
-    return ProcXvSelectPortNotify(client);
-}
-
-static int _X_COLD
-SProcXvStopVideo(ClientPtr client)
-{
-    REQUEST(xvStopVideoReq);
-    REQUEST_SIZE_MATCH(xvStopVideoReq);
-    swapl(&stuff->port);
-    swapl(&stuff->drawable);
-    return ProcXvStopVideo(client);
-}
-
-static int _X_COLD
-SProcXvSetPortAttribute(ClientPtr client)
-{
-    REQUEST(xvSetPortAttributeReq);
-    REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
-    swapl(&stuff->port);
-    swapl(&stuff->attribute);
-    swapl(&stuff->value);
-    return ProcXvSetPortAttribute(client);
-}
-
-static int _X_COLD
-SProcXvGetPortAttribute(ClientPtr client)
-{
-    REQUEST(xvGetPortAttributeReq);
-    REQUEST_SIZE_MATCH(xvGetPortAttributeReq);
-    swapl(&stuff->port);
-    swapl(&stuff->attribute);
-    return ProcXvGetPortAttribute(client);
-}
-
-static int _X_COLD
-SProcXvQueryBestSize(ClientPtr client)
-{
-    REQUEST(xvQueryBestSizeReq);
-    REQUEST_SIZE_MATCH(xvQueryBestSizeReq);
-    swapl(&stuff->port);
-    swaps(&stuff->vid_w);
-    swaps(&stuff->vid_h);
-    swaps(&stuff->drw_w);
-    swaps(&stuff->drw_h);
-    return ProcXvQueryBestSize(client);
-}
-
-static int _X_COLD
-SProcXvQueryPortAttributes(ClientPtr client)
-{
-    REQUEST(xvQueryPortAttributesReq);
-    REQUEST_SIZE_MATCH(xvQueryPortAttributesReq);
-    swapl(&stuff->port);
-    return ProcXvQueryPortAttributes(client);
-}
-
-static int _X_COLD
-SProcXvQueryImageAttributes(ClientPtr client)
-{
-    REQUEST(xvQueryImageAttributesReq);
-    REQUEST_SIZE_MATCH(xvQueryImageAttributesReq);
-    swapl(&stuff->port);
-    swapl(&stuff->id);
-    swaps(&stuff->width);
-    swaps(&stuff->height);
-    return ProcXvQueryImageAttributes(client);
-}
-
-static int _X_COLD
-SProcXvListImageFormats(ClientPtr client)
-{
-    REQUEST(xvListImageFormatsReq);
-    REQUEST_SIZE_MATCH(xvListImageFormatsReq);
-    swapl(&stuff->port);
-    return ProcXvListImageFormats(client);
-}
-
-int _X_COLD
-SProcXvDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    UpdateCurrentTime();
-
-    switch (stuff->data) {
-        case xv_QueryExtension:
-            return ProcXvQueryExtension(client);
-        case xv_QueryAdaptors:
-            return SProcXvQueryAdaptors(client);
-        case xv_QueryEncodings:
-            return SProcXvQueryEncodings(client);
-        case xv_GrabPort:
-            return SProcXvGrabPort(client);
-        case xv_UngrabPort:
-            return SProcXvUngrabPort(client);
-        case xv_PutVideo:
-            return SProcXvPutVideo(client);
-        case xv_PutStill:
-            return SProcXvPutStill(client);
-        case xv_GetVideo:
-            return SProcXvGetVideo(client);
-        case xv_GetStill:
-            return SProcXvGetStill(client);
-        case xv_StopVideo:
-            return SProcXvStopVideo(client);
-        case xv_SelectVideoNotify:
-            return SProcXvSelectVideoNotify(client);
-        case xv_SelectPortNotify:
-            return SProcXvSelectPortNotify(client);
-        case xv_QueryBestSize:
-            return SProcXvQueryBestSize(client);
-        case xv_SetPortAttribute:
-            return SProcXvSetPortAttribute(client);
-        case xv_GetPortAttribute:
-            return SProcXvGetPortAttribute(client);
-        case xv_QueryPortAttributes:
-            return SProcXvQueryPortAttributes(client);
-        case xv_ListImageFormats:
-            return SProcXvListImageFormats(client);
-        case xv_QueryImageAttributes:
-            return SProcXvQueryImageAttributes(client);
-        case xv_PutImage:
-            return SProcXvPutImage(client);
-        case xv_ShmPutImage:
-            return SProcXvShmPutImage(client);
-        default:
-            return BadRequest;
-    }
-}
-
 #ifdef XINERAMA
 static int
 XineramaXvStopVideo(ClientPtr client)
@@ -1481,9 +1256,7 @@ XineramaXvShmPutImage(ClientPtr client)
     }
     return result;
 }
-#else
-#define XineramaXvShmPutImage ProcXvShmPutImage
-#endif /* MITSHM */
+#endif
 
 static int
 XineramaXvPutImage(ClientPtr client)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index c200f82ff..007983099 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -183,7 +183,7 @@ XvExtensionInit(void)
         XvExtensionGeneration = serverGeneration;
 
         extEntry = AddExtension(XvName, XvNumEvents, XvNumErrors,
-                                ProcXvDispatch, SProcXvDispatch,
+                                ProcXvDispatch, ProcXvDispatch,
                                 XvResetProc, StandardMinorOpcode);
         if (!extEntry) {
             FatalError("XvExtensionInit: AddExtensions failed\n");