diff --git a/dix/devices.c b/dix/devices.c
index ef1bdf354..c7d3494e8 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -66,7 +66,9 @@ SOFTWARE.
 #include "cursorstr.h"
 #include "dixstruct.h"
 #include "site.h"
+#ifndef XKB_IN_SERVER
 #define	XKB_IN_SERVER
+#endif
 #ifdef XKB
 #include <X11/extensions/XKBsrv.h>
 #endif
diff --git a/dix/dispatch.c b/dix/dispatch.c
index c8ee8d610..04e2ba11f 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -115,7 +115,9 @@ int ProcInitialConnection();
 #include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XKB
+#ifndef XKB_IN_SERVER
 #define XKB_IN_SERVER
+#endif
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 #endif