diff --git a/hw/xfree86/xkb/xkbKillSrv.c b/hw/xfree86/xkb/xkbKillSrv.c
index 23d6c178bb..33e4b04e89 100644
--- a/hw/xfree86/xkb/xkbKillSrv.c
+++ b/hw/xfree86/xkb/xkbKillSrv.c
@@ -26,9 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <dix-config.h>
 
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>
diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c
index 1a3da3be69..fda940185b 100644
--- a/hw/xfree86/xkb/xkbPrivate.c
+++ b/hw/xfree86/xkb/xkbPrivate.c
@@ -1,9 +1,4 @@
-
-#include <dix-config.h>
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>
diff --git a/hw/xfree86/xkb/xkbVT.c b/hw/xfree86/xkb/xkbVT.c
index 8ef21e6ad8..1b198010a1 100644
--- a/hw/xfree86/xkb/xkbVT.c
+++ b/hw/xfree86/xkb/xkbVT.c
@@ -23,12 +23,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#include <dix-config.h>
-
-#ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
-#endif
 
 #include <stdio.h>
 #include <X11/X.h>