diff --git a/Xext/shape.c b/Xext/shape.c
index b3f697fb10..5e25bf620c 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1009,20 +1009,15 @@ ProcShapeGetRectangles(ClientPtr client)
         return BadAlloc;
 
     xShapeGetRectanglesReply rep = {
-        .type = X_Reply,
         .ordering = YXBanded,
-        .sequenceNumber = client->sequence,
-        .length = x_rpcbuf_wsize_units(&rpcbuf),
         .nrects = nrects
     };
 
     if (client->swapped) {
-        swaps(&rep.sequenceNumber);
-        swapl(&rep.length);
         swapl(&rep.nrects);
     }
-    WriteToClient(client, sizeof(rep), &rep);
-    WriteRpcbufToClient(client, &rpcbuf);
+
+    X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
     return Success;
 }