Xi: drop using HAVE_DIX_CONFIG_H

This symbol is always defined, and the header is always present,
so no need to check for it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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 */
     );
 

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);
 

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;

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 */ );
 

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]);

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 */ );
 

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);
 

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);

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);

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);

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 */ );
 

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);
 

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);

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 */ );
 

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);
 

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 */ );