diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index fcc0d85fa..af1bcaa45 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -27,7 +27,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBSRV_H_
 #define	_XKBSRV_H_
 
-#define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
 
@@ -227,11 +226,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
                                       Bool      /* freeRMLVO */
     );
 
-extern _X_EXPORT Bool XkbApplyCompatMapToKey(XkbDescPtr /* xkb */ ,
-                                             KeyCode /* key */ ,
-                                             XkbChangesPtr      /* changes */
-    );
-
 extern _X_EXPORT Bool XkbApplyVirtualModChanges(XkbDescPtr /* xkb */ ,
                                                 unsigned int /* changed */ ,
                                                 XkbChangesPtr   /* changes */
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index ce0717ad6..21d869f44 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -169,6 +169,7 @@ int XkbChangeTypesOfKey(XkbDescPtr xkb, int key, int nGroups, unsigned int group
 int XkbKeyTypesForCoreSymbols(XkbDescPtr xkb, int map_width, KeySym *core_syms,
                               unsigned int protected, int *types_inout,
                               KeySym *xkb_syms_rtrn);
+Bool XkbApplyCompatMapToKey(XkbDescPtr xkb, KeyCode key, XkbChangesPtr changes);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;