diff --git a/miext/damage/damage.h b/miext/damage/damage.h
index 718c396dd..29a25d422 100644
--- a/miext/damage/damage.h
+++ b/miext/damage/damage.h
@@ -19,14 +19,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
 #ifndef _DAMAGE_H_
 #define _DAMAGE_H_
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 typedef struct _damage *DamagePtr;
 
 typedef enum _damageReportLevel {
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index ade651c39..f91f7c164 100644
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -19,14 +19,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-
 #ifndef _DAMAGESTR_H_
 #define _DAMAGESTR_H_
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "damage.h"
 #include "gcstruct.h"
 #include "privates.h"
diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h
index 74245eb35..24ba20928 100644
--- a/miext/rootless/rootless.h
+++ b/miext/rootless/rootless.h
@@ -27,14 +27,9 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
 #ifndef _ROOTLESS_H
 #define _ROOTLESS_H
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "rootlessConfig.h"
 #include "mi.h"
 #include "gcstruct.h"
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 8ed52f730..396b47071 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -27,14 +27,9 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
 #ifndef _ROOTLESSCOMMON_H
 #define _ROOTLESSCOMMON_H
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <stdint.h>
 
 #include "misc.h"
diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h
index 7d8a19c92..f8329e874 100644
--- a/miext/rootless/rootlessConfig.h
+++ b/miext/rootless/rootlessConfig.h
@@ -26,14 +26,9 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
 #ifndef _ROOTLESSCONFIG_H
 #define _ROOTLESSCONFIG_H
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 /*# define ROOTLESSDEBUG*/
 
 #define ROOTLESS_PROTECT_ALPHA TRUE
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index b9b7436e8..91fa22c23 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -26,14 +26,9 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-
 #ifndef _ROOTLESSWINDOW_H
 #define _ROOTLESSWINDOW_H
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "dix/screen_hooks_priv.h"
 
 #include "rootlessCommon.h"
diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h
index 4814991f0..fc97d9bf9 100644
--- a/miext/shadow/shrotpack.h
+++ b/miext/shadow/shrotpack.h
@@ -25,11 +25,6 @@
  * Thanks to Daniel Chemko <dchemko@intrinsyc.com> for making the 90 and 180
  * orientations work.
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <stdlib.h>
 
 #include    <X11/X.h>
diff --git a/miext/sync/misync.h b/miext/sync/misync.h
index b247259b3..5956fe8a8 100644
--- a/miext/sync/misync.h
+++ b/miext/sync/misync.h
@@ -20,14 +20,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 #ifndef _MISYNC_H_
 #define _MISYNC_H_
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 typedef struct _SyncObject SyncObject;
 typedef struct _SyncFence SyncFence;
 typedef struct _SyncTrigger SyncTrigger;
diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h
index 4465b0c3c..8d4e29402 100644
--- a/miext/sync/misyncstr.h
+++ b/miext/sync/misyncstr.h
@@ -20,14 +20,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
 #ifndef _MISYNCSTR_H_
 #define _MISYNCSTR_H_
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <stdint.h>
 #include "dix.h"
 #include "misync.h"