diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 527acc77e..c0e9580d2 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbResizeKeyActions		SrvXkbResizeKeyActions
 #define XkbResizeKeySyms		SrvXkbResizeKeySyms
 #define XkbResizeKeyType		SrvXkbResizeKeyType
-#define XkbAllocControls		SrvXkbAllocControls
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
 #define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
@@ -203,10 +202,6 @@ typedef struct {
 
 #define	Status		int
 
-extern _X_EXPORT Status XkbAllocControls(XkbDescPtr /* xkb */ ,
-                                         unsigned int   /* which */
-    );
-
 extern _X_EXPORT Status XkbCopyKeyTypes(XkbKeyTypePtr /* from */ ,
                                         XkbKeyTypePtr /* into */ ,
                                         int     /* num_types */
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 9a6926f50..b83a5fc92 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -253,7 +253,7 @@ XkbFreeNames(XkbDescPtr xkb, unsigned which, Bool freeMap)
 
 /***===================================================================***/
 
- /*ARGSUSED*/ Status
+ /*ARGSUSED*/ int
 XkbAllocControls(XkbDescPtr xkb, unsigned which)
 {
     if (xkb == NULL)
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 9cb1871e4..407e43170 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -122,6 +122,7 @@ int XkbAllocIndicatorMaps(XkbDescPtr xkb);
 int XkbAllocCompatMap(XkbDescPtr xkb, unsigned int which, unsigned int nInterpret);
 int XkbAllocNames(XkbDescPtr xkb, unsigned int which, int nTotalRG,
                   int nTotalAliases);
+int XkbAllocControls(XkbDescPtr xkb, unsigned int which);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;