diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 0e94b18b5..4f3cf7c1e 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -259,14 +259,6 @@ extern _X_EXPORT const char *XkbBinDirectory;
 
 extern _X_EXPORT CARD32 xkbDebugFlags;
 
-/* "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.
- */
-#define	_XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
-#define	_XkbErrCode3(a,b,c)	_XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
-#define	_XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
-
 #define	Status		int
 
 extern _X_EXPORT void XkbUseMsg(void
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 9a4c17e57..c63c44df3 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -29,9 +29,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "stdio.h"
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "xkb/xkbsrv_priv.h"
+
 #include "misc.h"
 #include "inputstr.h"
-#include <xkbsrv.h>
 #include "xkbstr.h"
 #include "extnsionst.h"
 #include "xkb-procs.h"
diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h
index 2e10ec002..3100a0d74 100644
--- a/xkb/xkbsrv_priv.h
+++ b/xkb/xkbsrv_priv.h
@@ -58,6 +58,14 @@
 
 #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.
+ */
+#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
+#define _XkbErrCode3(a,b,c)     _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
+#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
+
 void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
 
 void XkbForceUpdateDeviceLEDs(DeviceIntPtr keybd);