diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 968fca3d0..930b3e37c 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	XkbKeyTypesForCoreSymbols	SrvXkbKeyTypesForCoreSymbols
 #define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
@@ -220,14 +219,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
                                       Bool      /* freeRMLVO */
     );
 
-extern _X_EXPORT int XkbKeyTypesForCoreSymbols(XkbDescPtr /* xkb */ ,
-                                               int /* map_width */ ,
-                                               KeySym * /* core_syms */ ,
-                                               unsigned int /* protected */ ,
-                                               int * /* types_inout */ ,
-                                               KeySym * /* xkb_syms_rtrn */
-    );
-
 extern _X_EXPORT Bool XkbApplyCompatMapToKey(XkbDescPtr /* xkb */ ,
                                              KeyCode /* key */ ,
                                              XkbChangesPtr      /* changes */
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index eeb86ca37..9a5a42c84 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -168,6 +168,9 @@ int XkbChangeKeycodeRange(XkbDescPtr xkb, int minKC, int maxKC, XkbChangesPtr ch
 void XkbFreeInfo(XkbSrvInfoPtr xkbi);
 int XkbChangeTypesOfKey(XkbDescPtr xkb, int key, int nGroups, unsigned int groups,
                         int *newTypesIn, XkbMapChangesPtr changes);
+int XkbKeyTypesForCoreSymbols(XkbDescPtr xkb, int map_width, KeySym *core_syms,
+                              unsigned int protected, int *types_inout,
+                              KeySym *xkb_syms_rtrn);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;