diff --git a/Xi/allowev.h b/Xi/allowev.h
index f081ab52e..2664eddf4 100644
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef ALLOWEV_H
 #define ALLOWEV_H 1
 
+#include <dix-config.h>
+
 int SProcXAllowDeviceEvents(ClientPtr   /* client */
     );
 
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
index 3924f7251..68ad4c9af 100644
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGDCTL_H
 #define CHGDCTL_H 1
 
+#include <dix-config.h>
+
 int SProcXChangeDeviceControl(ClientPtr /* client */
     );
 
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
index 45a55a5f8..5524af889 100644
--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGFCTL_H
 #define CHGFCTL_H 1
 
+#include <dix-config.h>
+
 int SProcXChangeFeedbackControl(ClientPtr       /* client */
     );
 
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
index 55ea3947a..ec840afb0 100644
--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGKBD_H
 #define CHGKBD_H 1
 
+#include <dix-config.h>
+
 int ProcXChangeKeyboardDevice(ClientPtr /* client */
     );
 
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
index 633af7ca4..36a62e065 100644
--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGKMAP_H
 #define CHGKMAP_H 1
 
+#include <dix-config.h>
+
 int SProcXChangeDeviceKeyMapping(ClientPtr      /* client */
     );
 
diff --git a/Xi/chgprop.h b/Xi/chgprop.h
index 89d6b5695..ffef6d6e2 100644
--- a/Xi/chgprop.h
+++ b/Xi/chgprop.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGPROP_H
 #define CHGPROP_H 1
 
+#include <dix-config.h>
+
 int SProcXChangeDeviceDontPropagateList(ClientPtr       /* client */
     );
 
diff --git a/Xi/chgptr.h b/Xi/chgptr.h
index 3a85f0f03..d5637f1bb 100644
--- a/Xi/chgptr.h
+++ b/Xi/chgptr.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHGPTR_H
 #define CHGPTR_H 1
 
+#include <dix-config.h>
+
 int ProcXChangePointerDevice(ClientPtr  /* client */
     );
 
diff --git a/Xi/closedev.h b/Xi/closedev.h
index 201d14f0a..d9cbfc015 100644
--- a/Xi/closedev.h
+++ b/Xi/closedev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CLOSEDEV_H
 #define CLOSEDEV_H 1
 
+#include <dix-config.h>
+
 int ProcXCloseDevice(ClientPtr  /* client */
     );
 
diff --git a/Xi/devbell.h b/Xi/devbell.h
index c83a9d4b0..39e1f267b 100644
--- a/Xi/devbell.h
+++ b/Xi/devbell.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DEVBELL_H
 #define DEVBELL_H 1
 
+#include <dix-config.h>
+
 int ProcXDeviceBell(ClientPtr   /* client */
     );
 
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index 02c9fe9d1..fe0d9f225 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -28,9 +28,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * Globals referenced elsewhere in the server.
  *
  */
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
+
 #include "privates.h"
 
 #ifndef EXGLOBALS_H
diff --git a/Xi/getbmap.h b/Xi/getbmap.h
index 78cb15198..6dd6d0735 100644
--- a/Xi/getbmap.h
+++ b/Xi/getbmap.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETBMAP_H
 #define GETBMAP_H 1
 
+#include <dix-config.h>
+
 int ProcXGetDeviceButtonMapping(ClientPtr       /* client */
     );
 
diff --git a/Xi/getdctl.h b/Xi/getdctl.h
index 430b75b1d..500e9b928 100644
--- a/Xi/getdctl.h
+++ b/Xi/getdctl.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETDCTL_H
 #define GETDCTL_H 1
 
+#include <dix-config.h>
+
 int SProcXGetDeviceControl(ClientPtr    /* client */
     );
 
diff --git a/Xi/getfctl.h b/Xi/getfctl.h
index 63083432e..376f6ebba 100644
--- a/Xi/getfctl.h
+++ b/Xi/getfctl.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETFCTL_H
 #define GETFCTL_H 1
 
+#include <dix-config.h>
+
 int ProcXGetFeedbackControl(ClientPtr   /* client */
     );
 
diff --git a/Xi/getfocus.h b/Xi/getfocus.h
index 00650c17d..594585684 100644
--- a/Xi/getfocus.h
+++ b/Xi/getfocus.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETFOCUS_H
 #define GETFOCUS_H 1
 
+#include <dix-config.h>
+
 int ProcXGetDeviceFocus(ClientPtr       /* client */
     );
 
diff --git a/Xi/getkmap.h b/Xi/getkmap.h
index 74e2e5b78..ecb70f803 100644
--- a/Xi/getkmap.h
+++ b/Xi/getkmap.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETKMAP_H
 #define GETKMAP_H 1
 
+#include <dix-config.h>
+
 int ProcXGetDeviceKeyMapping(ClientPtr  /* client */
     );
 
diff --git a/Xi/getmmap.h b/Xi/getmmap.h
index feef7c505..18e1dd9a4 100644
--- a/Xi/getmmap.h
+++ b/Xi/getmmap.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETMMAP_H
 #define GETMMAP_H 1
 
+#include <dix-config.h>
+
 int ProcXGetDeviceModifierMapping(ClientPtr     /* client */
     );
 
diff --git a/Xi/getprop.h b/Xi/getprop.h
index 59225cba9..a2762ca88 100644
--- a/Xi/getprop.h
+++ b/Xi/getprop.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETPROP_H
 #define GETPROP_H 1
 
+#include <dix-config.h>
+
 int SProcXGetDeviceDontPropagateList(ClientPtr  /* client */
     );
 
diff --git a/Xi/getselev.h b/Xi/getselev.h
index bcb8ebcbb..e035239c4 100644
--- a/Xi/getselev.h
+++ b/Xi/getselev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETSELEV_H
 #define GETSELEV_H 1
 
+#include <dix-config.h>
+
 int SProcXGetSelectedExtensionEvents(ClientPtr  /* client */
     );
 
diff --git a/Xi/getvers.h b/Xi/getvers.h
index 678046d1d..7632dfa25 100644
--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETVERS_H
 #define GETVERS_H 1
 
+#include <dix-config.h>
+
 int SProcXGetExtensionVersion(ClientPtr /* client */
     );
 
diff --git a/Xi/grabdev.h b/Xi/grabdev.h
index 8dfcab70d..6ec127ead 100644
--- a/Xi/grabdev.h
+++ b/Xi/grabdev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GRABDEV_H
 #define GRABDEV_H 1
 
+#include <dix-config.h>
+
 int SProcXGrabDevice(ClientPtr  /* client */
     );
 
diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h
index b2a9796b5..d2aab7bf2 100644
--- a/Xi/grabdevb.h
+++ b/Xi/grabdevb.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GRABDEVB_H
 #define GRABDEVB_H 1
 
+#include <dix-config.h>
+
 int SProcXGrabDeviceButton(ClientPtr    /* client */
     );
 
diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h
index 85738affa..65b92a94a 100644
--- a/Xi/grabdevk.h
+++ b/Xi/grabdevk.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GRABDEVK_H
 #define GRABDEVK_H 1
 
+#include <dix-config.h>
+
 int SProcXGrabDeviceKey(ClientPtr       /* client */
     );
 
diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h
index 70e75b85a..c78a3246e 100644
--- a/Xi/gtmotion.h
+++ b/Xi/gtmotion.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GTMOTION_H
 #define GTMOTION_H 1
 
+#include <dix-config.h>
+
 int SProcXGetDeviceMotionEvents(ClientPtr       /* client */
     );
 
diff --git a/Xi/listdev.h b/Xi/listdev.h
index 65a62220d..94a8f809a 100644
--- a/Xi/listdev.h
+++ b/Xi/listdev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef LISTDEV_H
 #define LISTDEV_H 1
 
+#include <dix-config.h>
+
 #define VPC	20              /* Max # valuators per chunk */
 
 int ProcXListInputDevices(ClientPtr     /* client */
diff --git a/Xi/opendev.h b/Xi/opendev.h
index 89b326d43..f0a1250b3 100644
--- a/Xi/opendev.h
+++ b/Xi/opendev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef OPENDEV_H
 #define OPENDEV_H 1
 
+#include <dix-config.h>
+
 int ProcXOpenDevice(ClientPtr   /* client */
     );
 
diff --git a/Xi/queryst.h b/Xi/queryst.h
index 32960b1cd..f7f0d1146 100644
--- a/Xi/queryst.h
+++ b/Xi/queryst.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef QUERYST_H
 #define QUERYST_H 1
 
+#include <dix-config.h>
+
 int ProcXQueryDeviceState(ClientPtr     /* client */
     );
 
diff --git a/Xi/selectev.h b/Xi/selectev.h
index e80fe4a43..aea3e0a79 100644
--- a/Xi/selectev.h
+++ b/Xi/selectev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SELECTEV_H
 #define SELECTEV_H 1
 
+#include <dix-config.h>
+
 int SProcXSelectExtensionEvent(ClientPtr        /* client */
     );
 
diff --git a/Xi/sendexev.h b/Xi/sendexev.h
index 38c66434d..731af5e2e 100644
--- a/Xi/sendexev.h
+++ b/Xi/sendexev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SENDEXEV_H
 #define SENDEXEV_H 1
 
+#include <dix-config.h>
+
 int SProcXSendExtensionEvent(ClientPtr  /* client */
     );
 
diff --git a/Xi/setbmap.h b/Xi/setbmap.h
index f4bb22cb7..66a77d2e6 100644
--- a/Xi/setbmap.h
+++ b/Xi/setbmap.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETBMAP_H
 #define SETBMAP_H 1
 
+#include <dix-config.h>
+
 int ProcXSetDeviceButtonMapping(ClientPtr       /* client */
     );
 
diff --git a/Xi/setdval.h b/Xi/setdval.h
index 644bbcfbe..cc2d3b643 100644
--- a/Xi/setdval.h
+++ b/Xi/setdval.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETDVAL_H
 #define SETDVAL_H 1
 
+#include <dix-config.h>
+
 int ProcXSetDeviceValuators(ClientPtr   /* client */
     );
 
diff --git a/Xi/setfocus.h b/Xi/setfocus.h
index 0adf45157..a45fb06b4 100644
--- a/Xi/setfocus.h
+++ b/Xi/setfocus.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETFOCUS_H
 #define SETFOCUS_H 1
 
+#include <dix-config.h>
+
 int SProcXSetDeviceFocus(ClientPtr      /* client */
     );
 
diff --git a/Xi/setmmap.h b/Xi/setmmap.h
index a7de58d3a..cb5faa3be 100644
--- a/Xi/setmmap.h
+++ b/Xi/setmmap.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETMMAP_H
 #define SETMMAP_H 1
 
+#include <dix-config.h>
+
 int ProcXSetDeviceModifierMapping(ClientPtr     /* client */
     );
 
diff --git a/Xi/setmode.h b/Xi/setmode.h
index 68bdddbc5..2b41c2d25 100644
--- a/Xi/setmode.h
+++ b/Xi/setmode.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETMODE_H
 #define SETMODE_H 1
 
+#include <dix-config.h>
+
 int ProcXSetDeviceMode(ClientPtr        /* client */
     );
 
diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h
index 8a85c27f1..8cb082437 100644
--- a/Xi/ungrdev.h
+++ b/Xi/ungrdev.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef UNGRDEV_H
 #define UNGRDEV_H 1
 
+#include <dix-config.h>
+
 int SProcXUngrabDevice(ClientPtr        /* client */
     );
 
diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h
index 97d8aede1..f0217aea8 100644
--- a/Xi/ungrdevb.h
+++ b/Xi/ungrdevb.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef UNGRDEVB_H
 #define UNGRDEVB_H 1
 
+#include <dix-config.h>
+
 int SProcXUngrabDeviceButton(ClientPtr  /* client */
     );
 
diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h
index 1c4bab65b..e45e9eed2 100644
--- a/Xi/ungrdevk.h
+++ b/Xi/ungrdevk.h
@@ -22,14 +22,11 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef UNGRDEVK_H
 #define UNGRDEVK_H 1
 
+#include <dix-config.h>
+
 int SProcXUngrabDeviceKey(ClientPtr     /* client */
     );
 
diff --git a/Xi/xiallowev.h b/Xi/xiallowev.h
index c24ac3df4..ca6ff076a 100644
--- a/Xi/xiallowev.h
+++ b/Xi/xiallowev.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIALLOWEV_H
 #define XIALLOWEV_H 1
 
+#include <dix-config.h>
+
 int ProcXIAllowEvents(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);
 
diff --git a/Xi/xibarriers.h b/Xi/xibarriers.h
index 386a6ebe5..0e0647c7e 100644
--- a/Xi/xibarriers.h
+++ b/Xi/xibarriers.h
@@ -1,11 +1,8 @@
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _XIBARRIERS_H_
 #define _XIBARRIERS_H_
 
+#include <dix-config.h>
+
 #include "resource.h"
 
 extern RESTYPE PointerBarrierType;
diff --git a/Xi/xichangecursor.h b/Xi/xichangecursor.h
index 14477772a..14936f803 100644
--- a/Xi/xichangecursor.h
+++ b/Xi/xichangecursor.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHDEVCUR_H
 #define CHDEVCUR_H 1
 
+#include <dix-config.h>
+
 int SProcXIChangeCursor(ClientPtr /* client */ );
 int ProcXIChangeCursor(ClientPtr /* client */ );
 
diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h
index 8fa3a66e7..aacb8430e 100644
--- a/Xi/xichangehierarchy.h
+++ b/Xi/xichangehierarchy.h
@@ -28,14 +28,11 @@
  * Request change in the device hierarchy.
  *
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CHDEVHIER_H
 #define CHDEVHIER_H 1
 
+#include <dix-config.h>
+
 int ProcXIChangeHierarchy(ClientPtr /* client */ );
 
 void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]);
diff --git a/Xi/xigetclientpointer.h b/Xi/xigetclientpointer.h
index 2e3cfc330..e9987b3bc 100644
--- a/Xi/xigetclientpointer.h
+++ b/Xi/xigetclientpointer.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GETCPTR_H
 #define GETCPTR_H 1
 
+#include <dix-config.h>
+
 int SProcXIGetClientPointer(ClientPtr /* client */ );
 int ProcXIGetClientPointer(ClientPtr /* client */ );
 
diff --git a/Xi/xigrabdev.h b/Xi/xigrabdev.h
index 3deacffed..f7d110941 100644
--- a/Xi/xigrabdev.h
+++ b/Xi/xigrabdev.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIGRABDEV_H
 #define XIGRABDEV_H 1
 
+#include <dix-config.h>
+
 int ProcXIGrabDevice(ClientPtr client);
 int SProcXIGrabDevice(ClientPtr client);
 
diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h
index de59ab990..f5fcdbd9c 100644
--- a/Xi/xipassivegrab.h
+++ b/Xi/xipassivegrab.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIPASSIVEGRAB_H
 #define XIPASSIVEGRAB_H 1
 
+#include <dix-config.h>
+
 int SProcXIPassiveUngrabDevice(ClientPtr client);
 int ProcXIPassiveUngrabDevice(ClientPtr client);
 int ProcXIPassiveGrabDevice(ClientPtr client);
diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h
index 5edc28733..88349063b 100644
--- a/Xi/xiproperty.h
+++ b/Xi/xiproperty.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XIPROPERTY_H
 #define XIPROPERTY_H 1
 
+#include <dix-config.h>
+
 int ProcXListDeviceProperties(ClientPtr client);
 int ProcXChangeDeviceProperty(ClientPtr client);
 int ProcXDeleteDeviceProperty(ClientPtr client);
diff --git a/Xi/xiquerydevice.h b/Xi/xiquerydevice.h
index 5f6fee3db..74b1adf13 100644
--- a/Xi/xiquerydevice.h
+++ b/Xi/xiquerydevice.h
@@ -23,14 +23,11 @@
  * Authors: Peter Hutterer
  *
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef QUERYDEV_H
 #define QUERYDEV_H 1
 
+#include <dix-config.h>
+
 #include <X11/extensions/XI2proto.h>
 
 int SProcXIQueryDevice(ClientPtr client);
diff --git a/Xi/xiquerypointer.h b/Xi/xiquerypointer.h
index f4dfacc4f..0c012f99d 100644
--- a/Xi/xiquerypointer.h
+++ b/Xi/xiquerypointer.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef QUERYDP_H
 #define QUERYDP_H 1
 
+#include <dix-config.h>
+
 int SProcXIQueryPointer(ClientPtr /* client */ );
 int ProcXIQueryPointer(ClientPtr /* client */ );
 
diff --git a/Xi/xiqueryversion.h b/Xi/xiqueryversion.h
index 824e168a4..c0dfce1f5 100644
--- a/Xi/xiqueryversion.h
+++ b/Xi/xiqueryversion.h
@@ -23,16 +23,13 @@
  * Authors: Peter Hutterer
  *
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/extensions/XI2proto.h>
-
 #ifndef QUERYVERSION_H
 #define QUERYVERSION_H 1
 
+#include <dix-config.h>
+
+#include <X11/extensions/XI2proto.h>
+
 int SProcXIQueryVersion(ClientPtr client);
 int ProcXIQueryVersion(ClientPtr client);
 
diff --git a/Xi/xiselectev.h b/Xi/xiselectev.h
index f0f0d1c16..89b1a84ec 100644
--- a/Xi/xiselectev.h
+++ b/Xi/xiselectev.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XISELECTEVENTS_H
 #define XISELECTEVENTS_H 1
 
+#include <dix-config.h>
+
 int SProcXISelectEvents(ClientPtr client);
 int ProcXISelectEvents(ClientPtr client);
 int SProcXIGetSelectedEvents(ClientPtr client);
diff --git a/Xi/xisetclientpointer.h b/Xi/xisetclientpointer.h
index f5c15bf49..1e5476688 100644
--- a/Xi/xisetclientpointer.h
+++ b/Xi/xisetclientpointer.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SETCPTR_H
 #define SETCPTR_H 1
 
+#include <dix-config.h>
+
 int SProcXISetClientPointer(ClientPtr /* client */ );
 int ProcXISetClientPointer(ClientPtr /* client */ );
 
diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h
index 68dbe0ee5..cf3b7b598 100644
--- a/Xi/xisetdevfocus.h
+++ b/Xi/xisetdevfocus.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XISETDEVFOCUS_H
 #define XISETDEVFOCUS_H 1
 
+#include <dix-config.h>
+
 int SProcXISetFocus(ClientPtr client);
 int ProcXISetFocus(ClientPtr client);
 
diff --git a/Xi/xiwarppointer.h b/Xi/xiwarppointer.h
index 7637f422a..faff89345 100644
--- a/Xi/xiwarppointer.h
+++ b/Xi/xiwarppointer.h
@@ -22,14 +22,11 @@
  *
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef WARPDEVP_H
 #define WARPDEVP_H 1
 
+#include <dix-config.h>
+
 int SProcXIWarpPointer(ClientPtr /* client */ );
 int ProcXIWarpPointer(ClientPtr /* client */ );