diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index bd747856b..45564e2f4 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -104,12 +104,6 @@ typedef struct _XkbEventCause {
 #define	XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
 #define	XkbSetCauseUnknown(c)	   XkbSetCauseKey(c,0,0)
 
-#define	_OFF_TIMER		0
-#define	_KRG_WARN_TIMER		1
-#define	_KRG_TIMER		2
-#define	_SK_TIMEOUT_TIMER	3
-#define	_ALL_TIMEOUT_TIMER	4
-
 #define	_BEEP_NONE		0
 #define	_BEEP_FEATURE_ON	1
 #define	_BEEP_FEATURE_OFF	2
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index f80057747..4f1fee280 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -46,6 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 int XkbDfltRepeatDelay = 660;
 int XkbDfltRepeatInterval = 40;
 
+#define _OFF_TIMER              0
+#define _KRG_WARN_TIMER         1
+#define _KRG_TIMER              2
+#define _SK_TIMEOUT_TIMER       3
+#define _ALL_TIMEOUT_TIMER      4
+
 #define	DFLT_TIMEOUT_CTRLS (XkbAX_KRGMask|XkbStickyKeysMask|XkbMouseKeysMask)
 #define	DFLT_TIMEOUT_OPTS  (XkbAX_IndicatorFBMask)