diff --git a/Xi/exevents.c b/Xi/exevents.c
index 81bdf0a1f..b136e0149 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -77,7 +77,6 @@ SOFTWARE.
 #ifdef XKB
 #include <X11/extensions/XKBproto.h>
 #include "xkbsrv.h"
-extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies);
 #endif
 
 #define WID(w) ((w) ? ((w)->drawable.id) : 0)
diff --git a/dix/getevents.c b/dix/getevents.c
index 672ff7df2..44636d73b 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -44,7 +44,7 @@
 
 #ifdef XKB
 #include <X11/extensions/XKBproto.h>
-#include <xkbsrv.h>
+#include "xkbsrv.h"
 #endif
 
 #ifdef PANORAMIX
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index ac1d82236..ee04063fb 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -974,6 +974,11 @@ extern _X_EXPORT void XkbSendNewKeyboardNotify(
 	xkbNewKeyboardNotify *	/* pNKN */
 );
 
+extern Bool XkbCopyKeymap(
+        XkbDescPtr              /* dst */,
+        XkbDescPtr              /* src */,
+        Bool                    /* sendNotifies */);
+
 #include "xkbfile.h"
 #include <X11/extensions/XKMformat.h>
 #include "xkbrules.h"
diff --git a/xkb/xkb.h b/xkb/xkb.h
index bc6c6c954..45d9b3d7a 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -31,10 +31,4 @@ extern int ProcXkbSetDebuggingFlags(ClientPtr client);
 extern void XkbExtensionInit(void);
 
 extern Bool XkbFilterEvents(ClientPtr pClient, int nEvents, xEvent *xE);
-
-extern Bool XkbCopyKeymap(
-    XkbDescPtr              src,
-    XkbDescPtr              dst,
-    Bool                    sendNotifies);
-
 #endif