diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 0d3d3732c..c2f91ff2c 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -31,7 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XkbKeyTypesForCoreSymbols	SrvXkbKeyTypesForCoreSymbols
 #define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
-#define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
 #define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
 
 #include <X11/Xdefs.h>
@@ -230,12 +229,6 @@ extern _X_EXPORT void XkbFreeRMLVOSet(XkbRMLVOSet * /* rmlvo */ ,
                                       Bool      /* freeRMLVO */
     );
 
-extern _X_EXPORT Status XkbChangeKeycodeRange(XkbDescPtr /* xkb */ ,
-                                              int /* minKC */ ,
-                                              int /* maxKC */ ,
-                                              XkbChangesPtr     /* changes */
-    );
-
 extern _X_EXPORT void XkbFreeInfo(XkbSrvInfoPtr /* xkbi */
     );
 
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index c9fd63146..bff842a01 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -548,7 +548,7 @@ _ExtendRange(unsigned int old_flags,
     return old_flags;
 }
 
-Status
+int
 XkbChangeKeycodeRange(XkbDescPtr xkb,
                       int minKC, int maxKC, XkbChangesPtr changes)
 {
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 47f4bc937..30da82bf6 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -162,6 +162,7 @@ Bool XkbEnableDisableControls(XkbSrvInfoPtr xkbi, unsigned long change,
 void XkbDisableComputedAutoRepeats(DeviceIntPtr pXDev, unsigned int key);
 XkbGeometryPtr XkbLookupNamedGeometry(DeviceIntPtr dev, Atom name, Bool *shouldFree);
 void XkbConvertCase(KeySym sym, KeySym *lower, KeySym *upper);
+int XkbChangeKeycodeRange(XkbDescPtr xkb, int minKC, int maxKC, XkbChangesPtr changes);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;