diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 6a178d7de..00fd04d38 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -43,8 +43,6 @@ static int _X_COLD
 SProcXkbUseExtension(ClientPtr client)
 {
     REQUEST(xkbUseExtensionReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbUseExtensionReq);
     swaps(&stuff->wantedMajor);
     swaps(&stuff->wantedMinor);
@@ -55,8 +53,6 @@ static int _X_COLD
 SProcXkbSelectEvents(ClientPtr client)
 {
     REQUEST(xkbSelectEventsReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSelectEventsReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->affectWhich);
@@ -133,8 +129,6 @@ static int _X_COLD
 SProcXkbBell(ClientPtr client)
 {
     REQUEST(xkbBellReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbBellReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->bellClass);
@@ -150,8 +144,6 @@ static int _X_COLD
 SProcXkbGetState(ClientPtr client)
 {
     REQUEST(xkbGetStateReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetStateReq);
     swaps(&stuff->deviceSpec);
     return ProcXkbGetState(client);
@@ -161,8 +153,6 @@ static int _X_COLD
 SProcXkbLatchLockState(ClientPtr client)
 {
     REQUEST(xkbLatchLockStateReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbLatchLockStateReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->groupLatch);
@@ -173,8 +163,6 @@ static int _X_COLD
 SProcXkbGetControls(ClientPtr client)
 {
     REQUEST(xkbGetControlsReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetControlsReq);
     swaps(&stuff->deviceSpec);
     return ProcXkbGetControls(client);
@@ -184,8 +172,6 @@ static int _X_COLD
 SProcXkbSetControls(ClientPtr client)
 {
     REQUEST(xkbSetControlsReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbSetControlsReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->affectInternalVMods);
@@ -217,8 +203,6 @@ static int _X_COLD
 SProcXkbGetMap(ClientPtr client)
 {
     REQUEST(xkbGetMapReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetMapReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->full);
@@ -231,8 +215,6 @@ static int _X_COLD
 SProcXkbSetMap(ClientPtr client)
 {
     REQUEST(xkbSetMapReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetMapReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->present);
@@ -247,8 +229,6 @@ static int _X_COLD
 SProcXkbGetCompatMap(ClientPtr client)
 {
     REQUEST(xkbGetCompatMapReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetCompatMapReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->firstSI);
@@ -260,8 +240,6 @@ static int _X_COLD
 SProcXkbSetCompatMap(ClientPtr client)
 {
     REQUEST(xkbSetCompatMapReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->firstSI);
@@ -273,8 +251,6 @@ static int _X_COLD
 SProcXkbGetIndicatorState(ClientPtr client)
 {
     REQUEST(xkbGetIndicatorStateReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetIndicatorStateReq);
     swaps(&stuff->deviceSpec);
     return ProcXkbGetIndicatorState(client);
@@ -284,8 +260,6 @@ static int _X_COLD
 SProcXkbGetIndicatorMap(ClientPtr client)
 {
     REQUEST(xkbGetIndicatorMapReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetIndicatorMapReq);
     swaps(&stuff->deviceSpec);
     swapl(&stuff->which);
@@ -296,8 +270,6 @@ static int _X_COLD
 SProcXkbSetIndicatorMap(ClientPtr client)
 {
     REQUEST(xkbSetIndicatorMapReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetIndicatorMapReq);
     swaps(&stuff->deviceSpec);
     swapl(&stuff->which);
@@ -308,8 +280,6 @@ static int _X_COLD
 SProcXkbGetNamedIndicator(ClientPtr client)
 {
     REQUEST(xkbGetNamedIndicatorReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetNamedIndicatorReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->ledClass);
@@ -322,8 +292,6 @@ static int _X_COLD
 SProcXkbSetNamedIndicator(ClientPtr client)
 {
     REQUEST(xkbSetNamedIndicatorReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbSetNamedIndicatorReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->ledClass);
@@ -338,8 +306,6 @@ static int _X_COLD
 SProcXkbGetNames(ClientPtr client)
 {
     REQUEST(xkbGetNamesReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetNamesReq);
     swaps(&stuff->deviceSpec);
     swapl(&stuff->which);
@@ -350,8 +316,6 @@ static int _X_COLD
 SProcXkbSetNames(ClientPtr client)
 {
     REQUEST(xkbSetNamesReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetNamesReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->virtualMods);
@@ -365,8 +329,6 @@ static int _X_COLD
 SProcXkbGetGeometry(ClientPtr client)
 {
     REQUEST(xkbGetGeometryReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetGeometryReq);
     swaps(&stuff->deviceSpec);
     swapl(&stuff->name);
@@ -377,8 +339,6 @@ static int _X_COLD
 SProcXkbSetGeometry(ClientPtr client)
 {
     REQUEST(xkbSetGeometryReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetGeometryReq);
     swaps(&stuff->deviceSpec);
     swapl(&stuff->name);
@@ -395,8 +355,6 @@ static int _X_COLD
 SProcXkbPerClientFlags(ClientPtr client)
 {
     REQUEST(xkbPerClientFlagsReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbPerClientFlagsReq);
     swaps(&stuff->deviceSpec);
     swapl(&stuff->change);
@@ -411,8 +369,6 @@ static int _X_COLD
 SProcXkbListComponents(ClientPtr client)
 {
     REQUEST(xkbListComponentsReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbListComponentsReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->maxNames);
@@ -423,8 +379,6 @@ static int _X_COLD
 SProcXkbGetKbdByName(ClientPtr client)
 {
     REQUEST(xkbGetKbdByNameReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->want);
@@ -436,8 +390,6 @@ static int _X_COLD
 SProcXkbGetDeviceInfo(ClientPtr client)
 {
     REQUEST(xkbGetDeviceInfoReq);
-
-    swaps(&stuff->length);
     REQUEST_SIZE_MATCH(xkbGetDeviceInfoReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->wanted);
@@ -450,8 +402,6 @@ static int _X_COLD
 SProcXkbSetDeviceInfo(ClientPtr client)
 {
     REQUEST(xkbSetDeviceInfoReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetDeviceInfoReq);
     swaps(&stuff->deviceSpec);
     swaps(&stuff->change);
@@ -463,8 +413,6 @@ static int _X_COLD
 SProcXkbSetDebuggingFlags(ClientPtr client)
 {
     REQUEST(xkbSetDebuggingFlagsReq);
-
-    swaps(&stuff->length);
     REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq);
     swapl(&stuff->affectFlags);
     swapl(&stuff->flags);