diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 3cc614711d..04d8cbeafd 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -59,6 +59,7 @@ SOFTWARE.
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "Xi/handlers.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "inputstr.h"           /* DeviceIntPtr      */
 #include "swaprep.h"
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 82b8d45b4a..a26ea19c59 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -44,6 +44,10 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <assert.h>
+#include <pthread.h>
+
+#include "xkb/xkbsrv_priv.h"
 
 #include "quartz.h"
 #include "darwin.h"
@@ -53,9 +57,6 @@
 
 #include "X11Application.h"
 
-#include <assert.h>
-#include <pthread.h>
-
 #include "xkbsrv.h"
 #include "exevents.h"
 #include "X11/keysym.h"
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index b06f57beff..3604c86afd 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -197,9 +197,6 @@ extern _X_EXPORT void XkbFreeKeyboard(XkbDescPtr /* xkb */ ,
                                       Bool      /* freeDesc */
     );
 
-extern _X_EXPORT KeySymsPtr XkbGetCoreMap(DeviceIntPtr  /* keybd */
-    );
-
 extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
                                             KeySymsPtr /* map */ ,
                                             KeyCode /* firstKey */ ,
@@ -213,11 +210,6 @@ extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
                                            XkbControlsPtr       /* new */
     );
 
-extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ ,
-                                       int /* key */ ,
-                                       int      /* onoff */
-    );
-
 extern _X_EXPORT void XkbGetRulesDflts(XkbRMLVOSet *    /* rmlvo */
     );
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 894f27eb28..1b348471f5 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -303,4 +303,8 @@ int XkbDDXUsesSoftRepeat(DeviceIntPtr dev);
 void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl);
 void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli,
                                   CARD32 newState);
+
+KeySymsPtr XkbGetCoreMap(DeviceIntPtr keybd);
+void XkbSetRepeatKeys(DeviceIntPtr pXDev, int key, int onoff);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */