diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 6c5247995..282ea49cd 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -36,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbResizeKeyType		SrvXkbResizeKeyType
 #define XkbAllocCompatMap		SrvXkbAllocCompatMap
 #define XkbAllocControls		SrvXkbAllocControls
-#define XkbAllocIndicatorMaps		SrvXkbAllocIndicatorMaps
 #define XkbAllocNames			SrvXkbAllocNames
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
@@ -206,9 +205,6 @@ typedef struct {
 
 #define	Status		int
 
-extern _X_EXPORT Status XkbAllocIndicatorMaps(XkbDescPtr        /* xkb */
-    );
-
 extern _X_EXPORT Status XkbAllocCompatMap(XkbDescPtr /* xkb */ ,
                                           unsigned int /* which */ ,
                                           unsigned int  /* nInterpret */
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 691441a7f..18502d661 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -279,7 +279,7 @@ XkbFreeControls(XkbDescPtr xkb, unsigned which, Bool freeMap)
 
 /***===================================================================***/
 
-Status
+int
 XkbAllocIndicatorMaps(XkbDescPtr xkb)
 {
     if (xkb == NULL)
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index e0d6d3222..0102b26df 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -118,6 +118,7 @@ void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
 void XkbFreeCompatMap(XkbDescPtr xkb, unsigned int which, Bool freeMap);
 void XkbFreeNames(XkbDescPtr xkb, unsigned int which, Bool freeMap);
 XkbDescPtr XkbAllocKeyboard(void);
+int XkbAllocIndicatorMaps(XkbDescPtr xkb);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;