diff --git a/include/xf86Optrec.h b/include/xf86Optrec.h
index 9e9855558f..8447d7d68d 100644
--- a/include/xf86Optrec.h
+++ b/include/xf86Optrec.h
@@ -56,14 +56,9 @@
  * This file contains the Option Record that is passed between the Parser,
  * and Module setup procs.
  */
-
 #ifndef _xf86Optrec_h_
 #define _xf86Optrec_h_
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include "xf86Optionstr.h"
diff --git a/include/xf86Parser.h b/include/xf86Parser.h
index 85a186721e..8ffd2ba3cc 100644
--- a/include/xf86Parser.h
+++ b/include/xf86Parser.h
@@ -56,14 +56,9 @@
  * This file contains the external interfaces for the XFree86 configuration
  * file parser.
  */
-
 #ifndef _xf86Parser_h_
 #define _xf86Parser_h_
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include <X11/Xdefs.h>
 #include "xf86Optrec.h"
 #include "list.h"
diff --git a/include/xf86Sbus.h b/include/xf86Sbus.h
index 20d8e44dd2..1b75c82ab8 100644
--- a/include/xf86Sbus.h
+++ b/include/xf86Sbus.h
@@ -23,8 +23,6 @@
 #ifndef _XF86_SBUS_H
 #define _XF86_SBUS_H
 
-#include <xorg-config.h>
-
 #if defined(__linux__)
 #include <asm/types.h>
 #include <linux/fb.h>