diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 24b1daf87..527acc77e 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -35,7 +35,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbResizeKeySyms		SrvXkbResizeKeySyms
 #define XkbResizeKeyType		SrvXkbResizeKeyType
 #define XkbAllocControls		SrvXkbAllocControls
-#define XkbAllocNames			SrvXkbAllocNames
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
 #define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
@@ -204,12 +203,6 @@ typedef struct {
 
 #define	Status		int
 
-extern _X_EXPORT Status XkbAllocNames(XkbDescPtr /* xkb */ ,
-                                      unsigned int /* which */ ,
-                                      int /* nTotalRG */ ,
-                                      int       /* nTotalAliases */
-    );
-
 extern _X_EXPORT Status XkbAllocControls(XkbDescPtr /* xkb */ ,
                                          unsigned int   /* which */
     );
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 293c3a0eb..9a6926f50 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -118,7 +118,7 @@ XkbFreeCompatMap(XkbDescPtr xkb, unsigned which, Bool freeMap)
 
 /***===================================================================***/
 
-Status
+int
 XkbAllocNames(XkbDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases)
 {
     XkbNamesPtr names;
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 5d90bf7c6..9cb1871e4 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -120,6 +120,8 @@ void XkbFreeNames(XkbDescPtr xkb, unsigned int which, Bool freeMap);
 XkbDescPtr XkbAllocKeyboard(void);
 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);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;