diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 66ce9014d..71c742163 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -30,6 +30,10 @@ 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>
 #define	NEED_EVENTS 1
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 0c3aee7e8..7816573c0 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -31,6 +31,10 @@ 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>
 #include <ctype.h>