diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index b85ee8a41..e54ce59f0 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
 
-AM_CFLAGS = $(DIX_CFLAGS) \
-	-DHAVE_XKB_CONFIG_H
+AM_CFLAGS = $(DIX_CFLAGS)
 
 DDX_SRCS = \
         ddxBeep.c \
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index ba8d50b19..72aff2ac0 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#ifdef HAVE_XKB_CONFIG_H
 #include <xkb-config.h>
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 747c913f3..3d0fb0014 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#ifdef HAVE_XKB_CONFIG_H
 #include <xkb-config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>