diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 391ea3a59..fff854baf 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -564,14 +564,6 @@ extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ ,
                                        int      /* onoff */
     );
 
-extern _X_EXPORT void XkbInitRules(XkbRMLVOSet * /* rmlvo   */,
-                                   const char *  /* rules   */,
-                                   const char *  /* model   */,
-                                   const char *  /* layout  */,
-                                   const char *  /* variant */,
-                                   const char *  /* options */
-    ) ;
-
 extern _X_EXPORT void XkbGetRulesDflts(XkbRMLVOSet *    /* rmlvo */
     );
 
@@ -579,15 +571,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
                                       Bool      /* freeRMLVO */
     );
 
-extern _X_EXPORT void XkbSetRulesDflts(XkbRMLVOSet *    /* rmlvo */
-    );
-
-extern _X_EXPORT void XkbDeleteRulesDflts(void
-    );
-
-extern _X_EXPORT void XkbDeleteRulesUsed(void
-    );
-
 extern _X_EXPORT XkbGeometryPtr XkbLookupNamedGeometry(DeviceIntPtr /* dev */ ,
                                                        Atom /* name */ ,
                                                        Bool *   /* shouldFree */
diff --git a/test/test_xkb.c b/test/test_xkb.c
index 19f6b2fb1..6eb5dedce 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -37,11 +37,13 @@
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include "opaque.h"
 #include "property.h"
-#include <xkbsrv.h>
 #include "../xkb/xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
 #include <assert.h>
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 25c5ebc7c..9edf86da6 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -148,4 +148,12 @@ int XkbLatchGroup(DeviceIntPtr pXDev, int group);
 void XkbClearAllLatchesAndLocks(DeviceIntPtr dev, XkbSrvInfoPtr xkbi,
                                 Bool genEv, XkbEventCausePtr cause);
 
+/* xkb rules */
+void XkbInitRules(XkbRMLVOSet *rmlvo, const char *rules,
+                  const char *model, const char *layout,
+                  const char *variant, const char *options);
+void XkbSetRulesDflts(XkbRMLVOSet *rmlvo);
+void XkbDeleteRulesDflts(void);
+void XkbDeleteRulesUsed(void);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */