diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 1d8bce9d66..0e94b18b5c 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -259,8 +259,6 @@ extern _X_EXPORT const char *XkbBinDirectory;
 
 extern _X_EXPORT CARD32 xkbDebugFlags;
 
-#define	_XkbLibError(c,l,d)     /* Epoch fail */
-
 /* "a" is a "unique" numeric identifier that just defines which error
  * code statement it is. _XkbErrCode2(4, foo) means "this is the 4th error
  * statement in this function". lovely.
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index a8b2f15239..e19e704845 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -37,14 +37,13 @@
 
 #include "xkb/xkbfmisc_priv.h"
 #include "xkb/xkbout_priv.h"
+#include "xkb/xkbsrv_priv.h"
 #include "xkb/xkbtext_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#include <xkbsrv.h>
-
 #include "xkbgeom.h"
 
 #define	VMOD_HIDE_VALUE	0
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 97ef71b289..2e10ec0022 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -56,6 +56,8 @@
  */
 #define _XkbStateNotifyInProgress       (1<<0)
 
+#define _XkbLibError(c,l,d)     /* Epoch fail */
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index a7435e2d40..b9e3f3ee7e 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -36,11 +36,11 @@
 
 #include "xkb/xkbfile_priv.h"
 #include "xkb/xkbfmisc_priv.h"
+#include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"
-#include "xkbsrv.h"
 #include "xkbgeom.h"
 
 static Atom