diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 17a84d7aa..1e5770b28 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -27,12 +27,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBSRV_H_
 #define	_XKBSRV_H_
 
-#define XkbAllocClientMap		SrvXkbAllocClientMap
-#define XkbAllocServerMap		SrvXkbAllocServerMap
 #define XkbChangeTypesOfKey		SrvXkbChangeTypesOfKey
 #define XkbCopyKeyTypes			SrvXkbCopyKeyTypes
-#define XkbFreeClientMap		SrvXkbFreeClientMap
-#define XkbFreeServerMap		SrvXkbFreeServerMap
 #define	XkbKeyTypesForCoreSymbols	SrvXkbKeyTypesForCoreSymbols
 #define	XkbApplyCompatMapToKey		SrvXkbApplyCompatMapToKey
 #define XkbResizeKeyActions		SrvXkbResizeKeyActions
@@ -239,26 +235,6 @@ extern _X_EXPORT void XkbFreeNames(XkbDescPtr /* xkb */ ,
 extern _X_EXPORT XkbDescPtr XkbAllocKeyboard(void
     );
 
-extern _X_EXPORT Status XkbAllocClientMap(XkbDescPtr /* xkb */ ,
-                                          unsigned int /* which */ ,
-                                          unsigned int  /* nTypes */
-    );
-
-extern _X_EXPORT Status XkbAllocServerMap(XkbDescPtr /* xkb */ ,
-                                          unsigned int /* which */ ,
-                                          unsigned int  /* nNewActions */
-    );
-
-extern _X_EXPORT void XkbFreeClientMap(XkbDescPtr /* xkb */ ,
-                                       unsigned int /* what */ ,
-                                       Bool     /* freeMap */
-    );
-
-extern _X_EXPORT void XkbFreeServerMap(XkbDescPtr /* xkb */ ,
-                                       unsigned int /* what */ ,
-                                       Bool     /* freeMap */
-    );
-
 extern _X_EXPORT Status XkbAllocIndicatorMaps(XkbDescPtr        /* xkb */
     );
 
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index c8bf82d2f..af0bb3b52 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -36,6 +36,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <os.h>
 #include <string.h>
 
+#include "xkb/xkbsrv_priv.h"
+
 /***===================================================================***/
 
  /*ARGSUSED*/ Status
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index fa8f5527e..83cb9e2f2 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -29,14 +29,16 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/keysym.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/keysym.h>
-#include <xkbsrv.h>
 
 /***====================================================================***/
 
-Status
+int
 XkbAllocClientMap(XkbDescPtr xkb, unsigned which, unsigned nTotalTypes)
 {
     XkbClientMapPtr map;
@@ -119,7 +121,7 @@ XkbAllocClientMap(XkbDescPtr xkb, unsigned which, unsigned nTotalTypes)
     return Success;
 }
 
-Status
+int
 XkbAllocServerMap(XkbDescPtr xkb, unsigned which, unsigned nNewActions)
 {
     register int i;
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index fd180fad2..3f7cf1693 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -32,10 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 
 #include "xkb/xkbfmisc_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
-#include <xkbsrv.h>
 
 /***====================================================================***/
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 4ee020a5b..3ef680961 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -198,4 +198,12 @@ XkbDescPtr XkbCompileKeymap(DeviceIntPtr dev, XkbRMLVOSet *rmlvo);
 XkbDescPtr XkbCompileKeymapFromString(DeviceIntPtr dev, const char *keymap,
                                       int keymap_length);
 
+/* client map */
+int XkbAllocClientMap(XkbDescPtr xkb, unsigned int which, unsigned int nTypes);
+void XkbFreeClientMap(XkbDescPtr xkb, unsigned int what, Bool freeMap);
+
+/* server map */
+int XkbAllocServerMap(XkbDescPtr xkb, unsigned int which, unsigned int nNewActions);
+void XkbFreeServerMap(XkbDescPtr xkb, unsigned int what, Bool freeMap);
+
 #endif /* _XSERVER_XKBSRV_PRIV_H_ */