diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 7d2bc88d7..5bf5498a0 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -266,13 +266,11 @@ XF86BigfontResetProc(ExtensionEntry * extEntry)
 static int
 ProcXF86BigfontQueryVersion(ClientPtr client)
 {
-    xXF86BigfontQueryVersionReply reply;
-
     REQUEST_SIZE_MATCH(xXF86BigfontQueryVersionReq);
-    reply = (xXF86BigfontQueryVersionReply) {
+
+    xXF86BigfontQueryVersionReply reply = {
         .type = X_Reply,
         .sequenceNumber = client->sequence,
-        .length = 0,
         .majorVersion = SERVER_XF86BIGFONT_MAJOR_VERSION,
         .minorVersion = SERVER_XF86BIGFONT_MINOR_VERSION,
         .uid = geteuid(),
@@ -281,9 +279,6 @@ ProcXF86BigfontQueryVersion(ClientPtr client)
         .signature = signature,
         .capabilities = (client->local && !client->swapped)
                          ? XF86Bigfont_CAP_LocalShm : 0
-#else
-        .signature = 0,
-        .capabilities = 0
 #endif
     };
     if (client->swapped) {
@@ -568,7 +563,6 @@ ProcXF86BigfontQueryFont(ClientPtr client)
         reply->nCharInfos = nCharInfos;
         reply->nUniqCharInfos = nUniqCharInfos;
         reply->shmid = shmid;
-        reply->shmsegoffset = 0;
         if (client->swapped) {
             swaps(&reply->sequenceNumber);
             swapl(&reply->length);