diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 6ecad2f72..391ea3a59 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -46,8 +46,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbFreeCompatMap		SrvXkbFreeCompatMap
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define XkbFreeNames			SrvXkbFreeNames
-#define XkbLatchModifiers		SrvXkbLatchModifiers
-#define XkbLatchGroup			SrvXkbLatchGroup
 #define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
 #define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
 #define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
@@ -566,21 +564,6 @@ extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ ,
                                        int      /* onoff */
     );
 
-extern _X_EXPORT int XkbLatchModifiers(DeviceIntPtr /* pXDev */ ,
-                                       CARD8 /* mask */ ,
-                                       CARD8    /* latches */
-    );
-
-extern _X_EXPORT int XkbLatchGroup(DeviceIntPtr /* pXDev */ ,
-                                   int  /* group */
-    );
-
-extern _X_EXPORT void XkbClearAllLatchesAndLocks(DeviceIntPtr /* dev */ ,
-                                                 XkbSrvInfoPtr /* xkbi */ ,
-                                                 Bool /* genEv */ ,
-                                                 XkbEventCausePtr       /* cause */
-    );
-
 extern _X_EXPORT void XkbInitRules(XkbRMLVOSet * /* rmlvo   */,
                                    const char *  /* rules   */,
                                    const char *  /* model   */,
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 7814cd322..25c5ebc7c 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -142,4 +142,10 @@ XkbInterestPtr XkbFindClientResource(DevicePtr inDev, ClientPtr client);
 XkbInterestPtr XkbAddClientResource(DevicePtr inDev, ClientPtr client, XID id);
 int XkbRemoveResourceClient(DevicePtr inDev, XID id);
 
+/* key latching */
+int XkbLatchModifiers(DeviceIntPtr pXDev, CARD8 mask, CARD8 latches);
+int XkbLatchGroup(DeviceIntPtr pXDev, int group);
+void XkbClearAllLatchesAndLocks(DeviceIntPtr dev, XkbSrvInfoPtr xkbi,
+                                Bool genEv, XkbEventCausePtr cause);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */