diff --git a/dix/events.c b/dix/events.c
index a6a10758d..5aef03ea2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -134,9 +134,6 @@ of the copyright holder.
 
 #include <X11/extensions/XKBproto.h>
 #include "xkbsrv.h"
-/* XKB FIXME: why is this here? */
-extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
-
 #include "xace.h"
 
 #ifdef XSERVER_DTRACE
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 1c4378ab5..31467e99f 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -946,6 +946,11 @@ extern int XkbGetKeysym(
         DeviceIntPtr            /* dev */,
         DeviceEvent*            /* event*/);
 
+extern Bool XkbFilterEvents(
+        ClientPtr               /* pClient */,
+        int                     /* nEvents */,
+        xEvent*                 /* xE */);
+
 #include "xkbfile.h"
 #include "xkbrules.h"
 
diff --git a/xkb/xkb.h b/xkb/xkb.h
index 45d9b3d7a..a526356a9 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -29,6 +29,4 @@ extern int ProcXkbSetDeviceInfo(ClientPtr client);
 extern int ProcXkbSetDebuggingFlags(ClientPtr client);
 
 extern void XkbExtensionInit(void);
-
-extern Bool XkbFilterEvents(ClientPtr pClient, int nEvents, xEvent *xE);
 #endif