diff --git a/dix/events.c b/dix/events.c
index 361a1c298..2d07bf406 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -146,6 +146,9 @@ Equipment Corporation.
 #include "enterleave.h"
 #include "mi.h"
 
+#define _XkbWantsDetectableAutoRepeat(c) \
+        ((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)
+
 /* Extension events type numbering starts at EXTENSION_EVENT_BASE.  */
 #define NoSuchEvent 0x80000000  /* so doesn't match NoEventMask */
 #define StructureAndSubMask ( StructureNotifyMask | SubstructureNotifyMask )
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index c182b5330..2f291886b 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -232,9 +232,6 @@ typedef struct _XkbSrvLedInfo {
 #define _XkbClientInitialized           (1<<7)
 #define _XkbClientIsAncient             (1<<6)
 
-#define	_XkbWantsDetectableAutoRepeat(c)\
-	((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)
-
 /*
  * Settings for flags field
  */