diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index ab3a40743..75d58157c 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -52,7 +52,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
 #define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
 
+#include <X11/Xdefs.h>
 #include <X11/extensions/XKBproto.h>
+
 #include "xkbstr.h"
 #include "xkbrules.h"
 #include "inputstr.h"
@@ -104,23 +106,6 @@ typedef struct _XkbEventCause {
 #define	XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
 #define	XkbSetCauseUnknown(c)	   XkbSetCauseKey(c,0,0)
 
-#define	_BEEP_NONE		0
-#define	_BEEP_FEATURE_ON	1
-#define	_BEEP_FEATURE_OFF	2
-#define	_BEEP_FEATURE_CHANGE	3
-#define	_BEEP_SLOW_WARN		4
-#define	_BEEP_SLOW_PRESS	5
-#define	_BEEP_SLOW_ACCEPT	6
-#define	_BEEP_SLOW_REJECT	7
-#define	_BEEP_SLOW_RELEASE	8
-#define	_BEEP_STICKY_LATCH	9
-#define	_BEEP_STICKY_LOCK	10
-#define	_BEEP_STICKY_UNLOCK	11
-#define	_BEEP_LED_ON		12
-#define	_BEEP_LED_OFF		13
-#define	_BEEP_LED_CHANGE	14
-#define	_BEEP_BOUNCE_REJECT	15
-
 typedef struct _XkbFilter {
     CARD16 keycode;
     CARD8 what;
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 86b6e7c99..e68478fb2 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -30,11 +30,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XI.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include <xkbsrv.h>
-#include <X11/extensions/XI.h>
 
 /*#define FALLING_TONE	1*/
 /*#define RISING_TONE	1*/
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 1c07c2eff..8c528c879 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -14,6 +14,23 @@
 #include "xkbsrv.h"
 #include "xkbstr.h"
 
+#define _BEEP_NONE              0
+#define _BEEP_FEATURE_ON        1
+#define _BEEP_FEATURE_OFF       2
+#define _BEEP_FEATURE_CHANGE    3
+#define _BEEP_SLOW_WARN         4
+#define _BEEP_SLOW_PRESS        5
+#define _BEEP_SLOW_ACCEPT       6
+#define _BEEP_SLOW_REJECT       7
+#define _BEEP_SLOW_RELEASE      8
+#define _BEEP_STICKY_LATCH      9
+#define _BEEP_STICKY_LOCK       10
+#define _BEEP_STICKY_UNLOCK     11
+#define _BEEP_LED_ON            12
+#define _BEEP_LED_OFF           13
+#define _BEEP_LED_CHANGE        14
+#define _BEEP_BOUNCE_REJECT     15
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);