diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index d5e4d22c1..317b35af2 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -57,6 +57,10 @@
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/xf86bigfproto.h>
+#include <X11/fonts/fontstruct.h> // libxfont2.h missed to include that
+#include <X11/fonts/libxfont2.h>
+
+#include "include/extinit_priv.h"
 
 #include "misc.h"
 #include "os.h"
@@ -538,8 +542,8 @@ ProcXF86BigfontQueryFont(ClientPtr client)
                : 0);
 
         xXF86BigfontQueryFontReply rep = {
-            .type = X_Reply;
-            .length = bytes_to_int32(buflength),
+            .type = X_Reply,
+            .length = bytes_to_int32(rlength + sizeof(xXF86BigfontQueryFontReply) - sizeof(xGenericReply)),
             .sequenceNumber = client->sequence,
             .minBounds = pFont->info.ink_minbounds,
             .maxBounds = pFont->info.ink_maxbounds,
@@ -649,13 +653,6 @@ ProcXF86BigfontDispatch(ClientPtr client)
     }
 }
 
-static int _X_COLD
-SProcXF86BigfontQueryVersion(ClientPtr client)
-{
-    REQUEST(xXF86BigfontQueryVersionReq);
-    return ProcXF86BigfontQueryVersion(client);
-}
-
 static int _X_COLD
 SProcXF86BigfontQueryFont(ClientPtr client)
 {
@@ -672,7 +669,7 @@ SProcXF86BigfontDispatch(ClientPtr client)
 
     switch (stuff->data) {
     case X_XF86BigfontQueryVersion:
-        return SProcXF86BigfontQueryVersion(client);
+        return ProcXF86BigfontQueryVersion(client);
     case X_XF86BigfontQueryFont:
         return SProcXF86BigfontQueryFont(client);
     default:
diff --git a/os/utils.c b/os/utils.c
index 8fc3dd47c..f42953d45 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -112,6 +112,7 @@ __stdcall unsigned long GetTickCount(void);
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
 #include "os/serverlock.h"
+#include "Xext/xf86bigfontsrv.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "dixstruct.h"