diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index bad87ef63..a1d546fd0 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -272,6 +272,9 @@ int CorePointerProc(DeviceIntPtr dev, int what);
 
 int CoreKeyboardProc(DeviceIntPtr dev, int what);
 
+typedef struct _xQueryFontReply *xQueryFontReplyPtr;
+void QueryFont(FontPtr pFont, xQueryFontReplyPtr pReply, int nProtoCCIStructs);
+
 extern Bool whiteRoot;
 
 extern volatile char isItTimeToYield;
diff --git a/include/dixfont.h b/include/dixfont.h
index 50f2ca0ae..24a414a0f 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -43,12 +43,6 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
 extern _X_EXPORT int CloseFont(void *pfont,
                                XID fid);
 
-typedef struct _xQueryFontReply *xQueryFontReplyPtr;
-
-extern _X_EXPORT void QueryFont(FontPtr /*pFont */ ,
-                                xQueryFontReplyPtr /*pReply */ ,
-                                int /*nProtoCCIStructs */ );
-
 extern _X_EXPORT int ListFonts(ClientPtr /*client */ ,
                                unsigned char * /*pattern */ ,
                                unsigned int /*length */ ,