diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 14bcc0266..ef09f9900 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -39,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbAllocIndicatorMaps		SrvXkbAllocIndicatorMaps
 #define XkbAllocKeyboard		SrvXkbAllocKeyboard
 #define XkbAllocNames			SrvXkbAllocNames
-#define XkbFreeCompatMap		SrvXkbFreeCompatMap
 #define XkbFreeKeyboard			SrvXkbFreeKeyboard
 #define XkbFreeNames			SrvXkbFreeNames
 #define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
@@ -209,11 +208,6 @@ typedef struct {
 
 #define	Status		int
 
-extern _X_EXPORT void XkbFreeCompatMap(XkbDescPtr /* xkb */ ,
-                                       unsigned int /* which */ ,
-                                       Bool     /* freeMap */
-    );
-
 extern _X_EXPORT void XkbFreeNames(XkbDescPtr /* xkb */ ,
                                    unsigned int /* which */ ,
                                    Bool /* freeMap */
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index af0bb3b52..691441a7f 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -29,12 +29,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <string.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
-#include <xkbsrv.h>
 #include "xkbgeom.h"
 #include <os.h>
-#include <string.h>
 
 #include "xkb/xkbsrv_priv.h"
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 945b26a0c..968870e1d 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -115,6 +115,7 @@ void XkbUseMsg(void);
 int XkbProcessArguments(int argc, char **argv, int i);
 Bool XkbInitPrivates(void);
 void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
+void XkbFreeCompatMap(XkbDescPtr xkb, unsigned int which, Bool freeMap);
 
 
 extern DevPrivateKeyRec xkbDevicePrivateKeyRec;