diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 75d58157c..e55abcfa6 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -96,16 +96,6 @@ typedef struct _XkbEventCause {
     ClientPtr client;
 } XkbEventCauseRec, *XkbEventCausePtr;
 
-#define	XkbSetCauseKey(c,k,e)	{ (c)->kc= (k),(c)->event= (e),\
-				  (c)->mjr= (c)->mnr= 0; \
-				  (c)->client= NULL; }
-#define	XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
-				  (c)->mjr= (j),(c)->mnr= (n);\
-				  (c)->client= (cl); }
-#define	XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
-#define	XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
-#define	XkbSetCauseUnknown(c)	   XkbSetCauseKey(c,0,0)
-
 typedef struct _XkbFilter {
     CARD16 keycode;
     CARD8 what;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 2410c6cc6..d23c62b1e 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -35,10 +35,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "dix/dix_priv.h"
 #include "os/osdep.h"
 #include "xkb/xkbfmisc_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
-#include <xkbsrv.h>
 #include "extnsionst.h"
 #include "extinit_priv.h"
 #include "xace.h"
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 05177bc1b..7291f1cd7 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -35,11 +35,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "inputstr.h"
 #include "exglobals.h"
 #include "windowstr.h"
-#include "xkbsrv_priv.h"
 
 /***====================================================================***/
 
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 8c528c879..82d107619 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -31,6 +31,16 @@
 #define _BEEP_LED_CHANGE        14
 #define _BEEP_BOUNCE_REJECT     15
 
+#define XkbSetCauseKey(c,k,e)   { (c)->kc= (k),(c)->event= (e),\
+                                  (c)->mjr= (c)->mnr= 0; \
+                                  (c)->client= NULL; }
+#define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
+                                  (c)->mjr= (j),(c)->mnr= (n);\
+                                  (c)->client= (cl); }
+#define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
+#define XkbSetCauseXkbReq(c,e,cl)  XkbSetCauseReq(c,XkbReqCode,e,cl)
+#define XkbSetCauseUnknown(c)      XkbSetCauseKey(c,0,0)
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);