diff --git a/Xext/shape.c b/Xext/shape.c
index 97d7d47ce8..0c5353e98b 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -964,7 +964,7 @@ ProcShapeGetRectangles(ClientPtr client)
         return BadValue;
     }
 
-    struct x_rpcbuf rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
+    x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
 
     if (!region) {
         xRectangle rect;
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 073a3a5e53..6ca7b7dac6 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -115,7 +115,7 @@ ProcXCMiscGetXIDList(ClientPtr client)
 
     size_t count = GetXIDList(client, stuff->count, pids);
 
-    struct x_rpcbuf rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
+    x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
 
     x_rpcbuf_write_CARD32s(&rpcbuf, pids, count);
     free(pids);