diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index f5c19818c..b438c0b2c 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -228,9 +228,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
 extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */,
 					  DeviceIntPtr /* src */);
 
-extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ ,
-                                           XkbDescPtr /* src */ );
-
 extern _X_EXPORT void XkbCopyControls(XkbDescPtr /* dst */ ,
                                       XkbDescPtr /* src */ );
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 02e10cde0..4766a8994 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -171,6 +171,7 @@ int SrvXkbKeyTypesForCoreSymbols(XkbDescPtr xkb, int map_width, KeySym *core_sym
 Bool SrvXkbApplyCompatMapToKey(XkbDescPtr xkb, KeyCode key, XkbChangesPtr changes);
 Bool SrvXkbApplyVirtualModChanges(XkbDescPtr xkb, unsigned int changed,
                                   XkbChangesPtr changes);
+Bool XkbDeviceApplyKeymap(DeviceIntPtr dst, XkbDescPtr src);
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;