diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 82b8d45b4a..dc4da17d6f 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -56,7 +56,8 @@
 #include <assert.h>
 #include <pthread.h>
 
-#include "xkbsrv.h"
+#include "xkb/xkbsrv_priv.h"
+
 #include "exevents.h"
 #include "X11/keysym.h"
 #include "keysym2ucs.h"
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 5cf229805f..b8cbdef503 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -215,11 +215,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 c3319cddba..5fd9c5e412 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -161,6 +161,7 @@ Bool XkbEnableDisableControls(XkbSrvInfoPtr xkbi, unsigned long change,
                               unsigned long newValues, XkbChangesPtr changes,
                               XkbEventCausePtr cause);
 void XkbDisableComputedAutoRepeats(DeviceIntPtr pXDev, unsigned int key);
+void XkbSetRepeatKeys(DeviceIntPtr pXDev, int key, int onoff);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;