diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 4ea23bd20..96ba07c58 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -540,19 +540,6 @@ extern _X_EXPORT Bool XkbEnableDisableControls(XkbSrvInfoPtr /* xkbi */ ,
                                                XkbEventCausePtr /* cause */
     );
 
-extern _X_EXPORT XkbInterestPtr XkbFindClientResource(DevicePtr /* inDev */ ,
-                                                      ClientPtr /* client */
-    );
-
-extern _X_EXPORT XkbInterestPtr XkbAddClientResource(DevicePtr /* inDev */ ,
-                                                     ClientPtr /* client */ ,
-                                                     XID        /* id */
-    );
-
-extern _X_EXPORT int XkbRemoveResourceClient(DevicePtr /* inDev */ ,
-                                             XID        /* id */
-    );
-
 extern _X_EXPORT int XkbDDXUsesSoftRepeat(DeviceIntPtr  /* dev */
     );
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 701d287b5..408a62c7c 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -132,4 +132,9 @@ void AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi, KeyCode key);
 void AccessXComputeCurveFactor(XkbSrvInfoPtr xkbi, XkbControlsPtr ctrls);
 int XkbDDXAccessXBeep(DeviceIntPtr dev, unsigned int what, unsigned int which);
 
+/* client resources */
+XkbInterestPtr XkbFindClientResource(DevicePtr inDev, ClientPtr client);
+XkbInterestPtr XkbAddClientResource(DevicePtr inDev, ClientPtr client, XID id);
+int XkbRemoveResourceClient(DevicePtr inDev, XID id);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */