summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Weigelt, metux IT consult <info@metux.net>2024-01-25 14:39:00 +0100
committerPovilas Kanapickas <povilas@radix.lt>2024-10-10 13:38:31 +0000
commita917f6a8a883f0f4f7614c1dbb326a6b4c8f7fbf (patch)
treef59eda2a235bf39764ec3cafc6338f338682db59
parent4cac1ee46d224fc83b7f7e6fbbf820739f0c1fab (diff)
drop obsolete HAVE_DIX_CONFIG_H
The symbol controls whether to include dix-config.h, and it's always set, thus we don't need it (and dozens of ifdef's) anymore. This commit only removes them from our own source files, where we can guarantee that dix-config.h is present - leaving the (potentially exported) headers untouched. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
-rw-r--r--Xext/bigreq.c2
-rw-r--r--Xext/dpms.c2
-rw-r--r--Xext/geext.c2
-rw-r--r--Xext/hashtable.c2
-rw-r--r--Xext/panoramiX.c2
-rw-r--r--Xext/panoramiXSwap.c2
-rw-r--r--Xext/panoramiXprocs.c2
-rw-r--r--Xext/saver.c2
-rw-r--r--Xext/security.c2
-rw-r--r--Xext/shape.c2
-rw-r--r--Xext/shm.c2
-rw-r--r--Xext/sleepuntil.c2
-rw-r--r--Xext/sync.c2
-rw-r--r--Xext/vidmode.c2
-rw-r--r--Xext/xace.c2
-rw-r--r--Xext/xcmisc.c2
-rw-r--r--Xext/xf86bigfont.c2
-rw-r--r--Xext/xres.c2
-rw-r--r--Xext/xselinux_ext.c2
-rw-r--r--Xext/xselinux_hooks.c2
-rw-r--r--Xext/xselinux_label.c2
-rw-r--r--Xext/xtest.c2
-rw-r--r--Xext/xvdisp.c2
-rw-r--r--Xext/xvmain.c2
-rw-r--r--Xext/xvmc.c2
-rw-r--r--Xi/allowev.c2
-rw-r--r--Xi/chgdctl.c2
-rw-r--r--Xi/chgfctl.c2
-rw-r--r--Xi/chgkbd.c2
-rw-r--r--Xi/chgkmap.c2
-rw-r--r--Xi/chgprop.c2
-rw-r--r--Xi/chgptr.c2
-rw-r--r--Xi/closedev.c2
-rw-r--r--Xi/devbell.c2
-rw-r--r--Xi/exevents.c2
-rw-r--r--Xi/extinit.c2
-rw-r--r--Xi/getbmap.c2
-rw-r--r--Xi/getdctl.c2
-rw-r--r--Xi/getfctl.c2
-rw-r--r--Xi/getfocus.c2
-rw-r--r--Xi/getkmap.c2
-rw-r--r--Xi/getmmap.c2
-rw-r--r--Xi/getprop.c2
-rw-r--r--Xi/getselev.c2
-rw-r--r--Xi/getvers.c2
-rw-r--r--Xi/grabdev.c2
-rw-r--r--Xi/grabdevb.c2
-rw-r--r--Xi/grabdevk.c2
-rw-r--r--Xi/gtmotion.c2
-rw-r--r--Xi/listdev.c2
-rw-r--r--Xi/opendev.c2
-rw-r--r--Xi/queryst.c2
-rw-r--r--Xi/selectev.c2
-rw-r--r--Xi/sendexev.c2
-rw-r--r--Xi/setbmap.c2
-rw-r--r--Xi/setdval.c2
-rw-r--r--Xi/setfocus.c2
-rw-r--r--Xi/setmmap.c2
-rw-r--r--Xi/setmode.c2
-rw-r--r--Xi/stubs.c2
-rw-r--r--Xi/ungrdev.c2
-rw-r--r--Xi/ungrdevb.c2
-rw-r--r--Xi/ungrdevk.c2
-rw-r--r--Xi/xiallowev.c2
-rw-r--r--Xi/xibarriers.c2
-rw-r--r--Xi/xichangecursor.c2
-rw-r--r--Xi/xichangehierarchy.c2
-rw-r--r--Xi/xigetclientpointer.c2
-rw-r--r--Xi/xigrabdev.c2
-rw-r--r--Xi/xipassivegrab.c2
-rw-r--r--Xi/xiproperty.c2
-rw-r--r--Xi/xiquerydevice.c2
-rw-r--r--Xi/xiquerypointer.c2
-rw-r--r--Xi/xiqueryversion.c2
-rw-r--r--Xi/xiselectev.c2
-rw-r--r--Xi/xisetclientpointer.c2
-rw-r--r--Xi/xisetdevfocus.c2
-rw-r--r--Xi/xiwarppointer.c2
-rw-r--r--composite/compalloc.c2
-rw-r--r--composite/compext.c2
-rw-r--r--composite/compinit.c2
-rw-r--r--composite/compoverlay.c2
-rw-r--r--composite/compwindow.c2
-rw-r--r--config/config.c2
-rw-r--r--config/dbus-core.c2
-rw-r--r--config/hal.c2
-rw-r--r--config/udev.c2
-rw-r--r--config/wscons.c2
-rw-r--r--damageext/damageext.c2
-rw-r--r--dbe/dbe.c2
-rw-r--r--dbe/midbe.c2
-rw-r--r--exa/exa.c2
-rw-r--r--exa/exa_accel.c2
-rw-r--r--exa/exa_classic.c2
-rw-r--r--exa/exa_driver.c2
-rw-r--r--exa/exa_glyphs.c2
-rw-r--r--exa/exa_migration_classic.c2
-rw-r--r--exa/exa_migration_mixed.c2
-rw-r--r--exa/exa_mixed.c2
-rw-r--r--exa/exa_render.c2
-rw-r--r--fb/fballpriv.c2
-rw-r--r--fb/fbarc.c2
-rw-r--r--fb/fbbits.c2
-rw-r--r--fb/fbblt.c2
-rw-r--r--fb/fbbltone.c2
-rw-r--r--fb/fbcmap_mi.c2
-rw-r--r--fb/fbcopy.c2
-rw-r--r--fb/fbfill.c2
-rw-r--r--fb/fbfillrect.c2
-rw-r--r--fb/fbfillsp.c2
-rw-r--r--fb/fbgc.c2
-rw-r--r--fb/fbgetsp.c2
-rw-r--r--fb/fbglyph.c2
-rw-r--r--fb/fbimage.c2
-rw-r--r--fb/fbline.c2
-rw-r--r--fb/fboverlay.c2
-rw-r--r--fb/fbpict.c2
-rw-r--r--fb/fbpixmap.c2
-rw-r--r--fb/fbpoint.c2
-rw-r--r--fb/fbpush.c2
-rw-r--r--fb/fbscreen.c2
-rw-r--r--fb/fbseg.c2
-rw-r--r--fb/fbsetsp.c2
-rw-r--r--fb/fbsolid.c2
-rw-r--r--fb/fbtile.c2
-rw-r--r--fb/fbtrap.c2
-rw-r--r--fb/fbutil.c2
-rw-r--r--fb/fbwindow.c2
-rw-r--r--glamor/glamor_xv.c2
-rw-r--r--glx/clientinfo.c2
-rw-r--r--glx/createcontext.c2
-rw-r--r--glx/glxcmds.c2
-rw-r--r--glx/glxcmdsswap.c2
-rw-r--r--glx/glxdri2.c2
-rw-r--r--glx/glxdricommon.c2
-rw-r--r--glx/glxdriswrast.c2
-rw-r--r--glx/glxext.c2
-rw-r--r--glx/glxscreens.c2
-rw-r--r--glx/indirect_program.c2
-rw-r--r--glx/indirect_texture_compression.c2
-rw-r--r--glx/indirect_util.c2
-rw-r--r--glx/render2.c2
-rw-r--r--glx/render2swap.c2
-rw-r--r--glx/renderpix.c2
-rw-r--r--glx/renderpixswap.c2
-rw-r--r--glx/rensize.c2
-rw-r--r--glx/single2.c2
-rw-r--r--glx/single2swap.c2
-rw-r--r--glx/singlepix.c2
-rw-r--r--glx/singlepixswap.c2
-rw-r--r--glx/singlesize.c2
-rw-r--r--glx/swap_interval.c2
-rw-r--r--glx/xfont.c2
-rw-r--r--hw/kdrive/ephyr/ephyr.c2
-rw-r--r--hw/kdrive/ephyr/ephyr_draw.c2
-rw-r--r--hw/kdrive/ephyr/ephyr_glamor_xv.c2
-rw-r--r--hw/kdrive/ephyr/ephyrcursor.c2
-rw-r--r--hw/kdrive/ephyr/ephyrinit.c2
-rw-r--r--hw/kdrive/ephyr/ephyrvideo.c2
-rw-r--r--hw/kdrive/ephyr/hostx.c2
-rw-r--r--hw/kdrive/src/kcmap.c2
-rw-r--r--hw/kdrive/src/kdrive.c2
-rw-r--r--hw/kdrive/src/kinfo.c2
-rw-r--r--hw/kdrive/src/kinput.c2
-rw-r--r--hw/kdrive/src/kshadow.c2
-rw-r--r--hw/kdrive/src/kxv.c2
-rw-r--r--hw/vfb/InitInput.c2
-rw-r--r--hw/vfb/InitOutput.c2
-rw-r--r--hw/xfree86/drivers/modesetting/dri2.c2
-rw-r--r--hw/xfree86/drivers/modesetting/driver.c2
-rw-r--r--hw/xfree86/drivers/modesetting/drmmode_display.c2
-rw-r--r--hw/xfree86/drivers/modesetting/dumb_bo.c2
-rw-r--r--hw/xfree86/drivers/modesetting/pageflip.c2
-rw-r--r--hw/xfree86/drivers/modesetting/present.c2
-rw-r--r--hw/xfree86/drivers/modesetting/vblank.c2
-rw-r--r--hw/xfree86/glamor_egl/glamor_xf86_xv.c2
-rw-r--r--hw/xfree86/xkb/xkbKillSrv.c2
-rw-r--r--hw/xfree86/xkb/xkbPrivate.c2
-rw-r--r--hw/xfree86/xkb/xkbVT.c2
-rw-r--r--hw/xquartz/GL/capabilities.c2
-rw-r--r--hw/xquartz/GL/glcontextmodes.c2
-rw-r--r--hw/xquartz/GL/indirect.c2
-rw-r--r--hw/xquartz/GL/visualConfigs.c2
-rw-r--r--hw/xquartz/X11Application.m2
-rw-r--r--hw/xquartz/X11Controller.m2
-rw-r--r--hw/xquartz/applewm.c2
-rw-r--r--hw/xquartz/darwin.c2
-rw-r--r--hw/xquartz/darwinEvents.c2
-rw-r--r--hw/xquartz/darwinXinput.c2
-rw-r--r--hw/xquartz/mach-startup/bundle-main.c2
-rw-r--r--hw/xquartz/mach-startup/launchd_fd.c2
-rw-r--r--hw/xquartz/mach-startup/stub.c2
-rw-r--r--hw/xquartz/quartz.c2
-rw-r--r--hw/xquartz/quartzKeyboard.c2
-rw-r--r--hw/xquartz/quartzRandR.c2
-rw-r--r--hw/xquartz/quartzStartup.c2
-rw-r--r--hw/xquartz/xpr/appledri.c2
-rw-r--r--hw/xquartz/xpr/dri.c2
-rw-r--r--hw/xquartz/xpr/driWrap.c2
-rw-r--r--hw/xquartz/xpr/x-hash.c2
-rw-r--r--hw/xquartz/xpr/x-hook.c2
-rw-r--r--hw/xquartz/xpr/x-list.c2
-rw-r--r--hw/xquartz/xpr/xprAppleWM.c2
-rw-r--r--hw/xquartz/xpr/xprCursor.c2
-rw-r--r--hw/xquartz/xpr/xprEvent.c2
-rw-r--r--hw/xquartz/xpr/xprFrame.c2
-rw-r--r--hw/xquartz/xpr/xprScreen.c2
-rw-r--r--hw/xwayland/xwayland-vidmode.c2
-rw-r--r--hw/xwayland/xwayland-window.c2
-rw-r--r--hw/xwin/dri/windowsdri.c2
-rw-r--r--mi/miarc.c2
-rw-r--r--mi/micmap.c2
-rw-r--r--mi/micopy.c2
-rw-r--r--mi/midash.c2
-rw-r--r--mi/midispcur.c2
-rw-r--r--mi/mieq.c2
-rw-r--r--mi/miexpose.c2
-rw-r--r--mi/mifillarc.c2
-rw-r--r--mi/migc.c2
-rw-r--r--mi/miglblt.c2
-rw-r--r--mi/miinitext.c2
-rw-r--r--mi/mioverlay.c2
-rw-r--r--mi/mipointer.c2
-rw-r--r--mi/mipoly.c2
-rw-r--r--mi/mipolypnt.c2
-rw-r--r--mi/mipolyrect.c2
-rw-r--r--mi/mipolyseg.c2
-rw-r--r--mi/mipolytext.c2
-rw-r--r--mi/mipushpxl.c2
-rw-r--r--mi/miscrinit.c2
-rw-r--r--mi/misprite.c2
-rw-r--r--mi/mivaltree.c2
-rw-r--r--mi/miwideline.c2
-rw-r--r--mi/miwindow.c2
-rw-r--r--mi/mizerarc.c2
-rw-r--r--mi/mizerclip.c2
-rw-r--r--mi/mizerline.c2
-rw-r--r--miext/damage/damage.c2
-rw-r--r--miext/rootless/rootlessCommon.c2
-rw-r--r--miext/rootless/rootlessGC.c2
-rw-r--r--miext/rootless/rootlessScreen.c2
-rw-r--r--miext/rootless/rootlessValTree.c2
-rw-r--r--miext/rootless/rootlessWindow.c2
-rw-r--r--miext/shadow/sh3224.c2
-rw-r--r--miext/shadow/shadow.c2
-rw-r--r--miext/shadow/shafb4.c2
-rw-r--r--miext/shadow/shafb8.c2
-rw-r--r--miext/shadow/shiplan2p4.c2
-rw-r--r--miext/shadow/shiplan2p8.c2
-rw-r--r--miext/shadow/shpacked.c2
-rw-r--r--miext/shadow/shplanar.c2
-rw-r--r--miext/shadow/shplanar8.c2
-rw-r--r--miext/shadow/shrot16pack.c2
-rw-r--r--miext/shadow/shrot16pack_180.c2
-rw-r--r--miext/shadow/shrot16pack_270.c2
-rw-r--r--miext/shadow/shrot16pack_270YX.c2
-rw-r--r--miext/shadow/shrot16pack_90.c2
-rw-r--r--miext/shadow/shrot16pack_90YX.c2
-rw-r--r--miext/shadow/shrot32pack.c2
-rw-r--r--miext/shadow/shrot32pack_180.c2
-rw-r--r--miext/shadow/shrot32pack_270.c2
-rw-r--r--miext/shadow/shrot32pack_90.c2
-rw-r--r--miext/shadow/shrot8pack.c2
-rw-r--r--miext/shadow/shrot8pack_180.c2
-rw-r--r--miext/shadow/shrot8pack_270.c2
-rw-r--r--miext/shadow/shrot8pack_90.c2
-rw-r--r--miext/shadow/shrotate.c2
-rw-r--r--miext/sync/misync.c2
-rw-r--r--miext/sync/misyncfd.c2
-rw-r--r--miext/sync/misyncshm.c2
-rw-r--r--os/WaitFor.c2
-rw-r--r--os/access.c2
-rw-r--r--os/auth.c2
-rw-r--r--os/backtrace.c2
-rw-r--r--os/busfault.c2
-rw-r--r--os/connection.c2
-rw-r--r--os/inputthread.c2
-rw-r--r--os/io.c2
-rw-r--r--os/mitauth.c2
-rw-r--r--os/osinit.c2
-rw-r--r--os/ospoll.c2
-rw-r--r--os/reallocarray.c2
-rw-r--r--os/strcasecmp.c2
-rw-r--r--os/strcasestr.c2
-rw-r--r--os/strlcat.c2
-rw-r--r--os/strlcpy.c2
-rw-r--r--os/strndup.c2
-rw-r--r--os/utils.c2
-rw-r--r--os/xdmauth.c2
-rw-r--r--os/xdmcp.c2
-rw-r--r--os/xprintf.c2
-rw-r--r--os/xserver_poll.c2
-rw-r--r--os/xsha1.c2
-rw-r--r--os/xstrans.c9
-rw-r--r--pseudoramiX/pseudoramiX.c2
-rw-r--r--randr/randr.c2
-rw-r--r--record/record.c2
-rw-r--r--record/set.c2
-rw-r--r--render/animcur.c2
-rw-r--r--render/filter.c2
-rw-r--r--render/glyph.c2
-rw-r--r--render/matrix.c2
-rw-r--r--render/miindex.c2
-rw-r--r--render/mipict.c2
-rw-r--r--render/mirect.c2
-rw-r--r--render/mitrap.c2
-rw-r--r--render/mitri.c2
-rw-r--r--render/picture.c2
-rw-r--r--render/render.c2
-rw-r--r--test/fixes.c2
-rw-r--r--test/hashtabletest.c2
-rw-r--r--test/input.c2
-rw-r--r--test/list.c2
-rw-r--r--test/misc.c2
-rw-r--r--test/signal-logging.c2
-rw-r--r--test/simple-xinit.c2
-rw-r--r--test/string.c2
-rw-r--r--test/test_xkb.c2
-rw-r--r--test/touch.c2
-rw-r--r--test/xfree86.c2
-rw-r--r--test/xi1/protocol-xchangedevicecontrol.c2
-rw-r--r--test/xi2/protocol-common.c2
-rw-r--r--test/xi2/protocol-eventconvert.c2
-rw-r--r--test/xi2/protocol-xigetclientpointer.c2
-rw-r--r--test/xi2/protocol-xigetselectedevents.c2
-rw-r--r--test/xi2/protocol-xipassivegrabdevice.c2
-rw-r--r--test/xi2/protocol-xiquerydevice.c2
-rw-r--r--test/xi2/protocol-xiquerypointer.c2
-rw-r--r--test/xi2/protocol-xiqueryversion.c2
-rw-r--r--test/xi2/protocol-xiselectevents.c2
-rw-r--r--test/xi2/protocol-xisetclientpointer.c2
-rw-r--r--test/xi2/protocol-xiwarppointer.c2
-rw-r--r--test/xi2/xi2.c2
-rw-r--r--test/xtest.c2
-rw-r--r--xfixes/cursor.c2
-rw-r--r--xfixes/disconnect.c2
-rw-r--r--xfixes/region.c2
-rw-r--r--xfixes/saveset.c2
-rw-r--r--xfixes/select.c2
-rw-r--r--xfixes/xfixes.c2
-rw-r--r--xkb/XKBAlloc.c2
-rw-r--r--xkb/XKBGAlloc.c2
-rw-r--r--xkb/XKBMAlloc.c2
-rw-r--r--xkb/XKBMisc.c2
-rw-r--r--xkb/ddxBeep.c2
-rw-r--r--xkb/ddxCtrls.c2
-rw-r--r--xkb/ddxKillSrv.c2
-rw-r--r--xkb/ddxLEDs.c2
-rw-r--r--xkb/ddxLoad.c2
-rw-r--r--xkb/ddxPrivate.c2
-rw-r--r--xkb/ddxVT.c2
-rw-r--r--xkb/maprules.c2
-rw-r--r--xkb/xkb.c2
-rw-r--r--xkb/xkbAccessX.c2
-rw-r--r--xkb/xkbActions.c2
-rw-r--r--xkb/xkbEvents.c2
-rw-r--r--xkb/xkbInit.c2
-rw-r--r--xkb/xkbLEDs.c2
-rw-r--r--xkb/xkbPrKeyEv.c2
-rw-r--r--xkb/xkbSwap.c2
-rw-r--r--xkb/xkbUtils.c2
-rw-r--r--xkb/xkbfmisc.c2
-rw-r--r--xkb/xkbout.c2
-rw-r--r--xkb/xkbtext.c2
-rw-r--r--xkb/xkmread.c2
365 files changed, 0 insertions, 737 deletions
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 0dc60c258..13114e326 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,9 +26,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 8ac73d819..b0dca98e1 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -26,9 +26,7 @@ Equipment Corporation.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xext/geext.c b/Xext/geext.c
index ac21b7a53..68d900408 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -23,9 +23,7 @@
* Author: Peter Hutterer, University of South Australia, NICTA
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "windowstr.h"
#include <X11/extensions/ge.h>
diff --git a/Xext/hashtable.c b/Xext/hashtable.c
index 3434c9948..13db19f9d 100644
--- a/Xext/hashtable.c
+++ b/Xext/hashtable.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
#include "misc.h"
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 732e983ba..f43ae2a95 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -23,9 +23,7 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index 022defdc7..4257696a1 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -23,9 +23,7 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 3e3567590..e8252decf 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -25,9 +25,7 @@ Equipment Corporation.
/* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/Xext/saver.c b/Xext/saver.c
index f76ff8e10..705c6b7a9 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -26,9 +26,7 @@ in this Software without prior written authorization from the X Consortium.
* Author: Keith Packard, MIT X Consortium
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/Xext/security.c b/Xext/security.c
index 426dc8601..8eb29e150 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -24,9 +24,7 @@ in this Software without prior written authorization from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xmd.h>
#include <X11/extensions/securproto.h>
diff --git a/Xext/shape.c b/Xext/shape.c
index 213e7cc3f..12f4c7f78 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -24,9 +24,7 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
#include <X11/X.h>
diff --git a/Xext/shm.c b/Xext/shm.c
index 091a95b50..5d07f30f1 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -28,9 +28,7 @@ in this Software without prior written authorization from The Open Group.
#define SHM
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/types.h>
#include <sys/ipc.h>
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index 3ff7a1d04..0fbfab10a 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -27,9 +27,7 @@ in this Software without prior written authorization from The Open Group.
/* dixsleep.c - implement millisecond timeouts for X clients */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "sleepuntil.h"
#include <X11/X.h>
diff --git a/Xext/sync.c b/Xext/sync.c
index c71d919c1..2172b72cb 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -49,9 +49,7 @@ PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <stdio.h>
diff --git a/Xext/vidmode.c b/Xext/vidmode.c
index c7c61647e..1bc98a8af 100644
--- a/Xext/vidmode.c
+++ b/Xext/vidmode.c
@@ -29,9 +29,7 @@ from Kaleb S. KEITHLEY
*/
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef XF86VIDMODE
diff --git a/Xext/xace.c b/Xext/xace.c
index bb8ce6997..5051b832c 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdarg.h>
#include "scrnintstr.h"
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 385e63383..b70e54ed4 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -26,9 +26,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index ef0113793..4058740d1 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -34,9 +34,7 @@
* XLoadQueryFont).
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/types.h>
#ifdef MITSHM
diff --git a/Xext/xres.c b/Xext/xres.c
index 9d71402f1..818a45c02 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -2,9 +2,7 @@
Copyright (c) 2002 XFree86 Inc
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <string.h>
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 534d50b71..506eb5d0f 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
#include "dix/property_priv.h"
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 65cb60217..13d0dfe2a 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -22,9 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* All rights reserved.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <errno.h>
#include <sys/socket.h>
diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
index 08159ff0b..4110f9074 100644
--- a/Xext/xselinux_label.c
+++ b/Xext/xselinux_label.c
@@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <selinux/label.h>
diff --git a/Xext/xtest.c b/Xext/xtest.c
index ddd02f610..cfb70bafe 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -26,9 +26,7 @@
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 64a5a1bf6..bd58388e5 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -21,9 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 34b6f1df5..190360529 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -73,9 +73,7 @@ SOFTWARE.
**
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <X11/X.h>
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 22856af56..435a1be12 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -1,7 +1,5 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <X11/X.h>
diff --git a/Xi/allowev.c b/Xi/allowev.c
index fc4f33be8..0db7925a3 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index 4dd4799ad..188d92fc5 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> /* control constants */
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 7a597e43d..19213f421 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index 4f5abd731..098c41fa9 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 2940a2cb0..282d327d1 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index a97fab18d..78b4d2163 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index 06047a62a..e90939092 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/closedev.c b/Xi/closedev.c
index af60d7e99..c0fb424ab 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 2e2a348f9..51facd9b6 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 2f02d7ed4..5c866e2ec 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -78,9 +78,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/cursor_priv.h"
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 6354ad059..223722ad2 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -51,9 +51,7 @@ SOFTWARE.
*/
#define NUMTYPES 15
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index ce3e9e60b..01ade01c4 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 149f5e14e..98fea52de 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index eea0113c1..88e816975 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index cf8e02449..de280ea79 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "windowstr.h" /* focus struct */
#include "inputstr.h" /* DeviceIntPtr */
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index c6db2cee2..1352ae6c7 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 19d8eb221..31f723cdf 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 282831310..205b4ec5c 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/getselev.c b/Xi/getselev.c
index b85eca3ff..2e1eb906a 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/getvers.c b/Xi/getvers.c
index a56ff1684..98fc2a199 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index d26bea434..db6a72335 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 344dc54a8..124ce4fbe 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index a230f7c3d..26dd30fbc 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 57a25bb2e..557dd888c 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/listdev.c b/Xi/listdev.c
index acd73af28..37961b6c1 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 3472c97dd..8d2e117e8 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
diff --git a/Xi/queryst.c b/Xi/queryst.c
index d0aad33de..3bfba94ae 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -32,9 +32,7 @@ from The Open Group.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 378403d3b..02ab1adcc 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XI2.h>
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 0f6b4e46a..9e66bf1d3 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index cad881b7a..477d86e92 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 26dedfbf6..175b84cf7 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index f0c80accc..de3870201 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 5adc7e9d5..0f639cff8 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XI2.h>
diff --git a/Xi/setmode.c b/Xi/setmode.c
index f67e89e1a..e218eefb4 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 27848a2f6..ace15c006 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -54,9 +54,7 @@ SOFTWARE.
* Xnest could do the same thing.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index fd4fc0f45..44afc47b1 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h" /* DeviceIntPtr */
#include "windowstr.h" /* window structure */
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 0f5c7913c..e2a62104f 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index 8aa797b4d..ff4a11f2d 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -50,9 +50,7 @@ SOFTWARE.
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c
index 23ad4c7ce..63c5ac994 100644
--- a/Xi/xiallowev.c
+++ b/Xi/xiallowev.c
@@ -29,9 +29,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 0c6f8877e..067f71be7 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -41,9 +41,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index 3638f9e20..066fe290b 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -29,9 +29,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index 8e7a0dcae..c89cafbd5 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -30,9 +30,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c
index f63d6006e..597cf38b8 100644
--- a/Xi/xigetclientpointer.c
+++ b/Xi/xigetclientpointer.c
@@ -23,9 +23,7 @@
* Author: Peter Hutterer, University of South Australia, NICTA
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c
index 604f8c926..ca4f66ee4 100644
--- a/Xi/xigrabdev.c
+++ b/Xi/xigrabdev.c
@@ -29,9 +29,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index 78147d8dd..7c7350125 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -29,9 +29,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 5ac5d1c1d..0a2376776 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -25,9 +25,7 @@
/* This code is a modified version of randr/rrproperty.c */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xatom.h>
#include <X11/extensions/XI.h>
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index e286064c2..cbc3c037e 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -28,9 +28,7 @@
* @file Protocol handling for the XIQueryDevice request/reply.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xatom.h>
diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c
index 594804662..fd362dd54 100644
--- a/Xi/xiquerypointer.c
+++ b/Xi/xiquerypointer.c
@@ -29,9 +29,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c
index dc3860a21..8672409f7 100644
--- a/Xi/xiqueryversion.c
+++ b/Xi/xiqueryversion.c
@@ -29,9 +29,7 @@
* Protocol handling for the XIQueryVersion request/reply.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h"
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 6c6aff884..51de4d7bc 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -23,9 +23,7 @@
* Author: Peter Hutterer
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI2proto.h>
diff --git a/Xi/xisetclientpointer.c b/Xi/xisetclientpointer.c
index a865c164c..85ce3d75e 100644
--- a/Xi/xisetclientpointer.c
+++ b/Xi/xisetclientpointer.c
@@ -30,9 +30,7 @@
* default value.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c
index d09aa9d5e..421511ee5 100644
--- a/Xi/xisetdevfocus.c
+++ b/Xi/xisetdevfocus.c
@@ -28,9 +28,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c
index d5597471c..daa56619b 100644
--- a/Xi/xiwarppointer.c
+++ b/Xi/xiwarppointer.c
@@ -29,9 +29,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h> /* for inputstr.h */
#include <X11/Xproto.h> /* Request macro */
diff --git a/composite/compalloc.c b/composite/compalloc.c
index 116b85022..e52c009bd 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -41,9 +41,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "compint.h"
diff --git a/composite/compext.c b/composite/compext.c
index d0e4e0bfa..25b3e817e 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -41,9 +41,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "compint.h"
#include "xace.h"
diff --git a/composite/compinit.c b/composite/compinit.c
index ecb36897d..e645ff6aa 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -41,9 +41,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
diff --git a/composite/compoverlay.c b/composite/compoverlay.c
index 18538ed98..6fd479560 100644
--- a/composite/compoverlay.c
+++ b/composite/compoverlay.c
@@ -41,9 +41,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "compint.h"
#include "xace.h"
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 3d62358b9..f67559129 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -41,9 +41,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
#include "os/osdep.h"
diff --git a/config/config.c b/config/config.c
index ae67dde27..270631af8 100644
--- a/config/config.c
+++ b/config/config.c
@@ -23,9 +23,7 @@
* Author: Daniel Stone <daniel@fooishbar.org>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <unistd.h>
#include "os.h"
diff --git a/config/dbus-core.c b/config/dbus-core.c
index 180ca9364..30495f07b 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -23,9 +23,7 @@
* Author: Daniel Stone <daniel@fooishbar.org>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <dbus/dbus.h>
#include <sys/select.h>
diff --git a/config/hal.c b/config/hal.c
index 8289956eb..5210b4aaa 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -24,9 +24,7 @@
* Author: Daniel Stone <daniel@fooishbar.org>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <dbus/dbus.h>
#include <hal/libhal.h>
diff --git a/config/udev.c b/config/udev.c
index 836fc2afa..19f887c7a 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -23,9 +23,7 @@
* Author: Julien Cristau <jcristau@debian.org>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <libudev.h>
#include <ctype.h>
diff --git a/config/wscons.c b/config/wscons.c
index a7beb85a4..eb44e1b25 100644
--- a/config/wscons.c
+++ b/config/wscons.c
@@ -21,9 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/time.h>
#include <dev/wscons/wsconsio.h>
diff --git a/damageext/damageext.c b/damageext/damageext.c
index 6a46291fd..7fe4ad513 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 29cac9533..681d8934c 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -32,9 +32,7 @@
/* INCLUDES */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <stdint.h>
diff --git a/dbe/midbe.c b/dbe/midbe.c
index c97dac8de..379b7a024 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -32,9 +32,7 @@
/* INCLUDES */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/exa/exa.c b/exa/exa.c
index 8a61a58e3..0422c615f 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -28,9 +28,7 @@
* memory management.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 2a31bd3c7..92211964f 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -27,9 +27,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "exa_priv.h"
#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
diff --git a/exa/exa_classic.c b/exa/exa_classic.c
index a9460f999..1b70d350e 100644
--- a/exa/exa_classic.c
+++ b/exa/exa_classic.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index 7a74c4500..4b7a53f7e 100644
--- a/exa/exa_driver.c
+++ b/exa/exa_driver.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
index 6b97a83b1..371301888 100644
--- a/exa/exa_glyphs.c
+++ b/exa/exa_glyphs.c
@@ -40,9 +40,7 @@
* Based on code by: Keith Packard
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/exa/exa_migration_classic.c b/exa/exa_migration_classic.c
index f712e1914..825789578 100644
--- a/exa/exa_migration_classic.c
+++ b/exa/exa_migration_classic.c
@@ -26,9 +26,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index 7d3fca7c0..52623e3ca 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 4c7714657..f1aeacd48 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 9fbfdfca2..da74f64d7 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -22,9 +22,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 187d0b068..e5f9f80ac 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbarc.c b/fb/fbarc.c
index fe14aed61..98d4281a7 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
#include "mizerarc.h"
diff --git a/fb/fbbits.c b/fb/fbbits.c
index 7435ad56a..682eff647 100644
--- a/fb/fbbits.c
+++ b/fb/fbbits.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
#include "miline.h"
diff --git a/fb/fbblt.c b/fb/fbblt.c
index c1730ab6a..b0ac72b82 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include "fb.h"
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index 7eac85b08..732a89a9c 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c
index 6c826dcab..d9447e095 100644
--- a/fb/fbcmap_mi.c
+++ b/fb/fbcmap_mi.c
@@ -27,9 +27,7 @@
* XFree86Server being defined.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 3af128ada..8a834ac3e 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/fb/fbfill.c b/fb/fbfill.c
index ad09671fa..5d08e2257 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
index 0075b2cdb..78feba691 100644
--- a/fb/fbfillrect.c
+++ b/fb/fbfillrect.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
index 4debe1ebd..3fe85b45a 100644
--- a/fb/fbfillsp.c
+++ b/fb/fbfillsp.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 2ab9ecad1..a269a2120 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index 445a4e385..2bccb5dd8 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 1bdc2d4fd..5a1282ba9 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
#include <X11/fonts/fontstruct.h>
diff --git a/fb/fbimage.c b/fb/fbimage.c
index bd24728fd..3e459885d 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/fb/fbline.c b/fb/fbline.c
index 38c3c6c16..0a3d45452 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index d47a7c67b..5ead17315 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -22,9 +22,7 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/fb/fbpict.c b/fb/fbpict.c
index f985198fb..76b7aaf00 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -23,9 +23,7 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 89e3370a6..3ed2b5680 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index d4c95eea7..0b804e557 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbpush.c b/fb/fbpush.c
index 1d1bcfd08..fd9641154 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index 42efaa911..e825aa92e 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 6c3d69363..4992973c0 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index fe94e283c..0fdc17380 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 1ee165950..1ad4ab2ab 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -22,9 +22,7 @@
#define FbSelectPart(xor,o,t) xor
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbtile.c b/fb/fbtile.c
index 785c5f0e4..a7d938667 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index bf82f8f2c..0893d168f 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbutil.c b/fb/fbutil.c
index c1d5923c4..920d70197 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "fb.h"
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index df33af948..96e749a20 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index 328769ab1..a5b4b6802 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -32,9 +32,7 @@
* Xv acceleration implementation
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glamor_priv.h"
#include "glamor_transform.h"
diff --git a/glx/clientinfo.c b/glx/clientinfo.c
index 74ad91991..3dcabf844 100644
--- a/glx/clientinfo.c
+++ b/glx/clientinfo.c
@@ -20,9 +20,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "indirect_dispatch.h"
diff --git a/glx/createcontext.c b/glx/createcontext.c
index 37d14fe99..185bd6bb2 100644
--- a/glx/createcontext.c
+++ b/glx/createcontext.c
@@ -20,9 +20,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <GL/glxtokens.h>
#include "glxserver.h"
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 64dcd6b81..ab1ed6410 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <assert.h>
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 7d6674470..59ce663b7 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include "glxserver.h"
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bb557fb7d..c4e02b7b7 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -21,9 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <stdio.h>
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index 35a539629..0d83fa714 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -23,9 +23,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <ctype.h>
#include <stdint.h>
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index c57d80db7..ac657d6f8 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -24,9 +24,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <stdio.h>
diff --git a/glx/glxext.c b/glx/glxext.c
index 585f64eda..467fdd542 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include "glxserver.h"
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
index e766e2579..ef969fcd6 100644
--- a/glx/glxscreens.c
+++ b/glx/glxscreens.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <GL/glxtokens.h>
#include <string.h>
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index c7bfa03ca..c0c7ae898 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -29,9 +29,7 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "glxbyteorder.h"
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 6d25bcd04..c82bc1cb7 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -23,9 +23,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "glxbyteorder.h"
diff --git a/glx/indirect_util.c b/glx/indirect_util.c
index ba180b0cc..d91ec5d61 100644
--- a/glx/indirect_util.c
+++ b/glx/indirect_util.c
@@ -23,9 +23,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/glx/render2.c b/glx/render2.c
index 8d9b5f4d2..5d126eeca 100644
--- a/glx/render2.c
+++ b/glx/render2.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <glxserver.h>
#include "unpack.h"
diff --git a/glx/render2swap.c b/glx/render2swap.c
index 6ed364f75..243dd0fed 100644
--- a/glx/render2swap.c
+++ b/glx/render2swap.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "unpack.h"
diff --git a/glx/renderpix.c b/glx/renderpix.c
index 91ba91187..958f699c1 100644
--- a/glx/renderpix.c
+++ b/glx/renderpix.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "unpack.h"
diff --git a/glx/renderpixswap.c b/glx/renderpixswap.c
index a4cb246bb..322dc7e86 100644
--- a/glx/renderpixswap.c
+++ b/glx/renderpixswap.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "unpack.h"
diff --git a/glx/rensize.c b/glx/rensize.c
index 55ad4a2af..821c6b3fb 100644
--- a/glx/rensize.c
+++ b/glx/rensize.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <GL/gl.h>
#include "glxserver.h"
diff --git a/glx/single2.c b/glx/single2.c
index 36a01f0cb..7c9e24549 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <stdio.h>
diff --git a/glx/single2swap.c b/glx/single2swap.c
index b140946ba..b7c7c00da 100644
--- a/glx/single2swap.c
+++ b/glx/single2swap.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "glxutil.h"
diff --git a/glx/singlepix.c b/glx/singlepix.c
index e1bed19aa..95dbf51e7 100644
--- a/glx/singlepix.c
+++ b/glx/singlepix.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "glxext.h"
diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c
index 8e4d9bddf..0e2779145 100644
--- a/glx/singlepixswap.c
+++ b/glx/singlepixswap.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "glxext.h"
diff --git a/glx/singlesize.c b/glx/singlesize.c
index 4c60b6920..344ffef7f 100644
--- a/glx/singlesize.c
+++ b/glx/singlesize.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <GL/gl.h>
#include "glxserver.h"
diff --git a/glx/swap_interval.c b/glx/swap_interval.c
index 232055080..2f1b02cf7 100644
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
@@ -22,9 +22,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "glxserver.h"
#include "glxutil.h"
diff --git a/glx/xfont.c b/glx/xfont.c
index bd090cb15..3e84369e8 100644
--- a/glx/xfont.c
+++ b/glx/xfont.c
@@ -28,9 +28,7 @@
* Silicon Graphics, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 12fbdc0b0..eee12ac8a 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -23,9 +23,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <xcb/xcb_keysyms.h>
#include <X11/keysym.h>
diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c
index 64e07a7d1..ea9f0cb1a 100644
--- a/hw/kdrive/ephyr/ephyr_draw.c
+++ b/hw/kdrive/ephyr/ephyr_draw.c
@@ -25,9 +25,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "ephyr.h"
#include "exa_priv.h"
diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c
index 62e7adaeb..a93afa17b 100644
--- a/hw/kdrive/ephyr/ephyr_glamor_xv.c
+++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c
@@ -21,9 +21,7 @@
* IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "kdrive.h"
#include "kxv.h"
diff --git a/hw/kdrive/ephyr/ephyrcursor.c b/hw/kdrive/ephyr/ephyrcursor.c
index 3f192d034..9438b2ba3 100644
--- a/hw/kdrive/ephyr/ephyrcursor.c
+++ b/hw/kdrive/ephyr/ephyrcursor.c
@@ -24,9 +24,7 @@
* Adam Jackson <ajax@redhat.com>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "ephyr.h"
#include "ephyrlog.h"
#include "hostx.h"
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index 25c078bfb..9306f3367 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -23,9 +23,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
#include "os/cmdline.h"
diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c
index 2dbddfb8d..cdf21304e 100644
--- a/hw/kdrive/ephyr/ephyrvideo.c
+++ b/hw/kdrive/ephyr/ephyrvideo.c
@@ -26,9 +26,7 @@
* Dodji Seketeli <dodji@openedhand.com>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <X11/extensions/Xv.h>
#include <xcb/xcb.h>
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 40bfcf07f..b7ac56d50 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -23,9 +23,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
#include <stdio.h>
diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c
index 2a8020f0e..b19b90b08 100644
--- a/hw/kdrive/src/kcmap.c
+++ b/hw/kdrive/src/kcmap.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "kdrive.h"
#include "dix/colormap_priv.h"
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index aeefa01fb..9144091a4 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index 4abb082b0..9a1585413 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "kdrive.h"
KdCardInfo *kdCardInfo;
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 9f3af8fb2..52c058f3e 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -21,10 +21,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#include <xkb-config.h>
-#endif
#include "kdrive.h"
#include "inputstr.h"
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index 0cc8a1309..292a03321 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "kdrive.h"
Bool
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 9e284203e..3077009a6 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -35,9 +35,7 @@ of the copyright holder.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvproto.h>
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 21387dee4..ca451604d 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -26,9 +26,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "mi.h"
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 4ebd8b058..4a448a5ae 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -26,9 +26,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#if defined(WIN32)
#include <X11/Xwinsock.h>
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index db755613a..af7db7ddc 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -32,9 +32,7 @@
* This doesn't implement pageflipping yet.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include <errno.h>
#include <time.h>
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index a3d0b5197..05e9e459f 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -32,9 +32,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include <errno.h>
#include <unistd.h>
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index a3e293155..6d0b4453b 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -27,9 +27,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include <errno.h>
#include <sys/ioctl.h>
diff --git a/hw/xfree86/drivers/modesetting/dumb_bo.c b/hw/xfree86/drivers/modesetting/dumb_bo.c
index cf13f0a9c..cdff166ce 100644
--- a/hw/xfree86/drivers/modesetting/dumb_bo.c
+++ b/hw/xfree86/drivers/modesetting/dumb_bo.c
@@ -25,9 +25,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include "dumb_bo.h"
diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c
index 86849a070..785c0d2d1 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include <errno.h>
diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c
index 412fb5713..8956a7c57 100644
--- a/hw/xfree86/drivers/modesetting/present.c
+++ b/hw/xfree86/drivers/modesetting/present.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include <assert.h>
#include <errno.h>
diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c
index c89aa3f17..a406279c2 100644
--- a/hw/xfree86/drivers/modesetting/vblank.c
+++ b/hw/xfree86/drivers/modesetting/vblank.c
@@ -25,9 +25,7 @@
* Support for tracking the DRM's vblank events.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include <errno.h>
#include <unistd.h>
diff --git a/hw/xfree86/glamor_egl/glamor_xf86_xv.c b/hw/xfree86/glamor_egl/glamor_xf86_xv.c
index 5f8bb8f15..5e0eb0afd 100644
--- a/hw/xfree86/glamor_egl/glamor_xf86_xv.c
+++ b/hw/xfree86/glamor_egl/glamor_xf86_xv.c
@@ -34,9 +34,7 @@
* device-dependent XV interfaces.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#define GLAMOR_FOR_XORG
#include "glamor_priv.h"
diff --git a/hw/xfree86/xkb/xkbKillSrv.c b/hw/xfree86/xkb/xkbKillSrv.c
index 79cf08198..d03674a94 100644
--- a/hw/xfree86/xkb/xkbKillSrv.c
+++ b/hw/xfree86/xkb/xkbKillSrv.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c
index 506b60bb0..54ba1e36f 100644
--- a/hw/xfree86/xkb/xkbPrivate.c
+++ b/hw/xfree86/xkb/xkbPrivate.c
@@ -1,7 +1,5 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xkb/xkbVT.c b/hw/xfree86/xkb/xkbVT.c
index 984096122..463ff2362 100644
--- a/hw/xfree86/xkb/xkbVT.c
+++ b/hw/xfree86/xkb/xkbVT.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index 1744f1203..cc116b14b 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -20,9 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c
index 64a1ac7c4..6e7f49af4 100644
--- a/hw/xquartz/GL/glcontextmodes.c
+++ b/hw/xquartz/GL/glcontextmodes.c
@@ -34,9 +34,7 @@
#if defined(IN_MINI_GLX)
#include <GL/gl.h>
#else
-#if defined(HAVE_DIX_CONFIG_H)
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <GL/glx.h>
#include "GL/glxint.h"
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index a8ccfc8ee..594c01a2c 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -31,9 +31,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <dlfcn.h>
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index e5c55d8ba..4f327cdd8 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -28,9 +28,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dri.h"
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index dd96e89f7..f6f83936a 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -30,9 +30,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#import "X11Application.h"
#import "NSUserDefaults+XQuartzDefaults.h"
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index e21aed0d3..4aaa87d06 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -30,9 +30,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#import "X11Controller.h"
#import "X11Application.h"
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 4edab98e0..4441038f5 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -30,9 +30,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <errno.h>
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 1ec244b03..45e79b649 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -28,9 +28,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/stat.h>
#include <X11/X.h>
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index fd87e968b..ea5693be1 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -40,9 +40,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c
index fea7e921e..b9d475d63 100644
--- a/hw/xquartz/darwinXinput.c
+++ b/hw/xquartz/darwinXinput.c
@@ -51,9 +51,7 @@
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index a2c18e1e1..f8598534f 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -30,9 +30,7 @@
#include <CoreFoundation/CoreFoundation.h>
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <errno.h>
#include <X11/Xlib.h>
diff --git a/hw/xquartz/mach-startup/launchd_fd.c b/hw/xquartz/mach-startup/launchd_fd.c
index 15866cc42..90e59cbfd 100644
--- a/hw/xquartz/mach-startup/launchd_fd.c
+++ b/hw/xquartz/mach-startup/launchd_fd.c
@@ -26,9 +26,7 @@
* prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <launch.h>
#include <asl.h>
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index 83252e805..5ab09d9a7 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -28,9 +28,7 @@
#include <CoreServices/CoreServices.h>
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
#include <unistd.h>
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 38f5dbcdd..9c3f59461 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -31,9 +31,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "quartzRandR.h"
#include "inputstr.h"
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index c35a2d15d..82b8d45b4 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -33,9 +33,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#define HACK_MISSING 1
#define HACK_KEYPAD 1
diff --git a/hw/xquartz/quartzRandR.c b/hw/xquartz/quartzRandR.c
index 3ecc0e771..48a8be82d 100644
--- a/hw/xquartz/quartzRandR.c
+++ b/hw/xquartz/quartzRandR.c
@@ -31,9 +31,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "quartzRandR.h"
#include "quartz.h"
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 77ff84506..4c346433b 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -29,9 +29,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <fcntl.h>
#include <unistd.h>
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 40422b61a..c9189c9d2 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -36,9 +36,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index 091418e19..952c85812 100644
--- a/hw/xquartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
@@ -34,9 +34,7 @@
* Jeremy Huddleston <jeremyhu@apple.com>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/time.h>
#include <unistd.h>
diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c
index f588a834d..cf63eb9fc 100644
--- a/hw/xquartz/xpr/driWrap.c
+++ b/hw/xquartz/xpr/driWrap.c
@@ -27,9 +27,7 @@
* prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stddef.h>
#include "mi.h"
diff --git a/hw/xquartz/xpr/x-hash.c b/hw/xquartz/xpr/x-hash.c
index 087656d9b..2108fe6ae 100644
--- a/hw/xquartz/xpr/x-hash.c
+++ b/hw/xquartz/xpr/x-hash.c
@@ -28,9 +28,7 @@
* prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "x-hash.h"
#include "x-list.h"
diff --git a/hw/xquartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c
index 3922bb86c..7ea0d01fd 100644
--- a/hw/xquartz/xpr/x-hook.c
+++ b/hw/xquartz/xpr/x-hook.c
@@ -28,9 +28,7 @@
* prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "x-hook.h"
#include <stdlib.h>
diff --git a/hw/xquartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c
index 171657686..0250ac549 100644
--- a/hw/xquartz/xpr/x-list.c
+++ b/hw/xquartz/xpr/x-list.c
@@ -28,9 +28,7 @@
* prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "x-list.h"
#include <stdlib.h>
diff --git a/hw/xquartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c
index 126661766..ed031d228 100644
--- a/hw/xquartz/xpr/xprAppleWM.c
+++ b/hw/xquartz/xpr/xprAppleWM.c
@@ -27,9 +27,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "xpr.h"
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index ff6cf4dd0..22b52344d 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -31,9 +31,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "quartz.h"
#include "xpr.h"
diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index eb321a52f..7490da649 100644
--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@@ -26,9 +26,7 @@
* prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "xpr.h"
diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
index 57d16d42f..9d88abbb6 100644
--- a/hw/xquartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -27,9 +27,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "xpr.h"
#include "rootlessCommon.h"
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 81de33769..f595748ef 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -29,9 +29,7 @@
#include "sanitizedCarbon.h"
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "inputstr.h"
#include "quartz.h"
diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c
index 77e57b1e4..a4ca0eaf1 100644
--- a/hw/xwayland/xwayland-vidmode.c
+++ b/hw/xwayland/xwayland-vidmode.c
@@ -25,9 +25,7 @@
* authorization from the copyright holder(s) and author(s).
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index e5d45a919..b717fcf3c 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -23,9 +23,7 @@
* SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <float.h>
#include <math.h>
diff --git a/hw/xwin/dri/windowsdri.c b/hw/xwin/dri/windowsdri.c
index 3666e97dd..5ed4450da 100644
--- a/hw/xwin/dri/windowsdri.c
+++ b/hw/xwin/dri/windowsdri.c
@@ -21,9 +21,7 @@
* IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/mi/miarc.c b/mi/miarc.c
index 3a0ecc446..602ccbf76 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -46,9 +46,7 @@ SOFTWARE.
/* Author: Keith Packard and Bob Scheifler */
/* Warning: this code is toxic, do not dally very long here. */
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <math.h>
#include <X11/X.h>
diff --git a/mi/micmap.c b/mi/micmap.c
index 2c312845d..e3675c301 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -27,9 +27,7 @@
* are may be debatable.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/mi/micopy.c b/mi/micopy.c
index 40096f24c..f2bc9deef 100644
--- a/mi/micopy.c
+++ b/mi/micopy.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "mi.h"
#include "scrnintstr.h"
diff --git a/mi/midash.c b/mi/midash.c
index 08f11aa38..76bd4266d 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "regionstr.h"
#include "mistruct.h"
diff --git a/mi/midispcur.c b/mi/midispcur.c
index dc4928fd7..305b6fc68 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -29,9 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/mi/mieq.c b/mi/mieq.c
index 850248ece..bb15e2aa9 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -32,9 +32,7 @@ in this Software without prior written authorization from The Open Group.
*
*/
-#if HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 29ac46486..7b13b034f 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -71,9 +71,7 @@ Equipment Corporation.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index 888519edf..1f467db28 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -26,9 +26,7 @@ Author: Bob Scheifler, MIT X Consortium
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <math.h>
#include <X11/X.h>
diff --git a/mi/migc.c b/mi/migc.c
index bc2e1aede..e4f3b547e 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -26,9 +26,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "scrnintstr.h"
#include "gcstruct.h"
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 169d44ffc..4314b4091 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -44,9 +44,7 @@ SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 04f320118..348198b93 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -71,9 +71,7 @@ SOFTWARE.
* authorization from the copyright holder(s) and author(s).
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 7a86cdfed..5e380cd7e 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1,7 +1,5 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 7c29d70d4..b4bf128bd 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -46,9 +46,7 @@ in this Software without prior written authorization from The Open Group.
* DIX, DDX and some drivers.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/mi/mipoly.c b/mi/mipoly.c
index a97e2bb64..3cdb56925 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -48,9 +48,7 @@ SOFTWARE.
*
* Written by Brian Kelleher; June 1986
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "windowstr.h"
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index 1c4150dfb..1f688a028 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xprotostr.h>
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index 7ebf9db8d..acec81fb3 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xprotostr.h>
diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c
index 7909b398b..cdfcba1dd 100644
--- a/mi/mipolyseg.c
+++ b/mi/mipolyseg.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xprotostr.h>
diff --git a/mi/mipolytext.c b/mi/mipolytext.c
index f1e5ed867..ea3d1b017 100644
--- a/mi/mipolytext.c
+++ b/mi/mipolytext.c
@@ -52,9 +52,7 @@ SOFTWARE.
* Date: Thu Feb 5 1987
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index f6a1b5259..028b8633e 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "gcstruct.h"
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 57571b9ab..b80f74e63 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -26,9 +26,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/mi/misprite.c b/mi/misprite.c
index 87e6fbe8e..e832daa64 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -29,9 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index ea6889fdc..0dff150c2 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -88,9 +88,7 @@ Equipment Corporation.
* Bob Scheifler -- avoid miComputeClips for unmapped windows,
* valdata changes
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "scrnintstr.h"
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 6e02d70cb..0d81519cf 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -52,9 +52,7 @@ SOFTWARE.
* bresenham zero-width lines, except walks an X edge
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#ifdef _XOPEN_SOURCE
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 32debb48e..40b81eec7 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -44,9 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/extensions/shapeconst.h>
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index e1b5f0c18..ca2cb4087 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -32,9 +32,7 @@ Author: Bob Scheifler, MIT X Consortium
* The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <math.h>
#include <X11/X.h>
diff --git a/mi/mizerclip.c b/mi/mizerclip.c
index 0ae964190..e3e2b9616 100644
--- a/mi/mizerclip.c
+++ b/mi/mizerclip.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/mi/mizerline.c b/mi/mizerline.c
index 1a0ca3427..dc4790ba8 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 0ed392ca2..592f07bfe 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c
index 44c2c3789..6ca58c5c1 100644
--- a/miext/rootless/rootlessCommon.c
+++ b/miext/rootless/rootlessCommon.c
@@ -29,9 +29,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stddef.h> /* For NULL */
#include <limits.h> /* For CHAR_BIT */
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index 5af18a4a0..1f6822831 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -29,9 +29,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stddef.h> /* For NULL */
#include "mi.h"
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index 5d9c3e597..b57018242 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -29,9 +29,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index 409e6a092..e311021db 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -89,9 +89,7 @@ Equipment Corporation.
* Bob Scheifler -- avoid miComputeClips for unmapped windows,
* valdata changes
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stddef.h> /* For NULL */
#include <X11/X.h>
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 643dedff6..68df06c89 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -29,9 +29,7 @@
* use or other dealings in this Software without prior written authorization.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stddef.h> /* For NULL */
#include <limits.h> /* For CHAR_BIT */
diff --git a/miext/shadow/sh3224.c b/miext/shadow/sh3224.c
index 5d8f27482..e93b5a7fd 100644
--- a/miext/shadow/sh3224.c
+++ b/miext/shadow/sh3224.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include "dix-config.h"
-#endif
#include "shadow.h"
#include "fb.h"
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index e8d0d51b0..cecedee7d 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shafb4.c b/miext/shadow/shafb4.c
index ae59e2d32..5610ad6bc 100644
--- a/miext/shadow/shafb4.c
+++ b/miext/shadow/shafb4.c
@@ -23,9 +23,7 @@
* Based on shpacked.c, which is Copyright © 2000 Keith Packard
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shafb8.c b/miext/shadow/shafb8.c
index d2b73fc64..7bb72031d 100644
--- a/miext/shadow/shafb8.c
+++ b/miext/shadow/shafb8.c
@@ -23,9 +23,7 @@
* Based on shpacked.c, which is Copyright © 2000 Keith Packard
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shiplan2p4.c b/miext/shadow/shiplan2p4.c
index f37c58d71..ac46bb8b7 100644
--- a/miext/shadow/shiplan2p4.c
+++ b/miext/shadow/shiplan2p4.c
@@ -23,9 +23,7 @@
* Based on shpacked.c, which is Copyright © 2000 Keith Packard
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shiplan2p8.c b/miext/shadow/shiplan2p8.c
index 44cb8d336..01a5c076f 100644
--- a/miext/shadow/shiplan2p8.c
+++ b/miext/shadow/shiplan2p8.c
@@ -23,9 +23,7 @@
* Based on shpacked.c, which is Copyright © 2000 Keith Packard
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c
index 5220854c1..25c0dd1ba 100644
--- a/miext/shadow/shpacked.c
+++ b/miext/shadow/shpacked.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c
index 92c7971d2..4c5cf951a 100644
--- a/miext/shadow/shplanar.c
+++ b/miext/shadow/shplanar.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c
index 412335940..622430b2b 100644
--- a/miext/shadow/shplanar8.c
+++ b/miext/shadow/shplanar8.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c
index 0b7faca6a..a4fad6d46 100644
--- a/miext/shadow/shrot16pack.c
+++ b/miext/shadow/shrot16pack.c
@@ -23,8 +23,6 @@
#define FUNC shadowUpdateRotate16
#define Data CARD16
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c
index d8f2633e5..746351e75 100644
--- a/miext/shadow/shrot16pack_180.c
+++ b/miext/shadow/shrot16pack_180.c
@@ -24,8 +24,6 @@
#define Data CARD16
#define ROTATE 180
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c
index 4aa471325..fd8b5f68d 100644
--- a/miext/shadow/shrot16pack_270.c
+++ b/miext/shadow/shrot16pack_270.c
@@ -24,8 +24,6 @@
#define Data CARD16
#define ROTATE 270
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot16pack_270YX.c b/miext/shadow/shrot16pack_270YX.c
index 0df1fd51f..5386bb4da 100644
--- a/miext/shadow/shrot16pack_270YX.c
+++ b/miext/shadow/shrot16pack_270YX.c
@@ -24,8 +24,6 @@
#define Data CARD16
#define ROTATE 270
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpackYX.h"
diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c
index 81e49151a..4a8848f65 100644
--- a/miext/shadow/shrot16pack_90.c
+++ b/miext/shadow/shrot16pack_90.c
@@ -24,8 +24,6 @@
#define Data CARD16
#define ROTATE 90
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot16pack_90YX.c b/miext/shadow/shrot16pack_90YX.c
index 5fc3b236a..77fd87058 100644
--- a/miext/shadow/shrot16pack_90YX.c
+++ b/miext/shadow/shrot16pack_90YX.c
@@ -24,8 +24,6 @@
#define Data CARD16
#define ROTATE 90
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpackYX.h"
diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c
index 4a9cbc0ff..083e21661 100644
--- a/miext/shadow/shrot32pack.c
+++ b/miext/shadow/shrot32pack.c
@@ -23,8 +23,6 @@
#define FUNC shadowUpdateRotate32
#define Data CARD32
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c
index 8f5fb5760..29cde5060 100644
--- a/miext/shadow/shrot32pack_180.c
+++ b/miext/shadow/shrot32pack_180.c
@@ -24,8 +24,6 @@
#define Data CARD32
#define ROTATE 180
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c
index 7d52fd2bf..d25d20e39 100644
--- a/miext/shadow/shrot32pack_270.c
+++ b/miext/shadow/shrot32pack_270.c
@@ -24,8 +24,6 @@
#define Data CARD32
#define ROTATE 270
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c
index 0abeb5cdd..36aabc111 100644
--- a/miext/shadow/shrot32pack_90.c
+++ b/miext/shadow/shrot32pack_90.c
@@ -24,8 +24,6 @@
#define Data CARD32
#define ROTATE 90
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c
index 552d838f3..3e583b021 100644
--- a/miext/shadow/shrot8pack.c
+++ b/miext/shadow/shrot8pack.c
@@ -23,8 +23,6 @@
#define FUNC shadowUpdateRotate8
#define Data CARD8
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c
index 526d8f15f..2cf313127 100644
--- a/miext/shadow/shrot8pack_180.c
+++ b/miext/shadow/shrot8pack_180.c
@@ -24,8 +24,6 @@
#define Data CARD8
#define ROTATE 180
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c
index 73f82a712..16ef5df14 100644
--- a/miext/shadow/shrot8pack_270.c
+++ b/miext/shadow/shrot8pack_270.c
@@ -24,8 +24,6 @@
#define Data CARD8
#define ROTATE 270
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c
index 73060cad1..b5e4fb991 100644
--- a/miext/shadow/shrot8pack_90.c
+++ b/miext/shadow/shrot8pack_90.c
@@ -24,8 +24,6 @@
#define Data CARD8
#define ROTATE 90
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "shrotpack.h"
diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c
index 174553788..ec90fa5fe 100644
--- a/miext/shadow/shrotate.c
+++ b/miext/shadow/shrotate.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "scrnintstr.h"
diff --git a/miext/sync/misync.c b/miext/sync/misync.c
index 48234ef8a..806f7adbe 100644
--- a/miext/sync/misync.c
+++ b/miext/sync/misync.c
@@ -21,9 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "scrnintstr.h"
#include "misync_priv.h"
diff --git a/miext/sync/misyncfd.c b/miext/sync/misyncfd.c
index 917931168..c2ad550c1 100644
--- a/miext/sync/misyncfd.c
+++ b/miext/sync/misyncfd.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/input_priv.h"
diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
index 1e8865e89..fa163a3df 100644
--- a/miext/sync/misyncshm.c
+++ b/miext/sync/misyncshm.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <fcntl.h>
#include <sys/mman.h>
diff --git a/os/WaitFor.c b/os/WaitFor.c
index c88cdfcfe..dac1b83b4 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -52,9 +52,7 @@ SOFTWARE.
*
*****************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <errno.h>
#include <stdio.h>
diff --git a/os/access.c b/os/access.c
index abf099cf6..d3fce1ec6 100644
--- a/os/access.c
+++ b/os/access.c
@@ -76,9 +76,7 @@ SOFTWARE.
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef WIN32
#include <X11/Xwinsock.h>
diff --git a/os/auth.c b/os/auth.c
index e768060fe..de2aae917 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -31,9 +31,7 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xauth.h>
diff --git a/os/backtrace.c b/os/backtrace.c
index 659126a6a..767f909b7 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -21,9 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "os.h"
#include "misc.h"
diff --git a/os/busfault.c b/os/busfault.c
index 7e6d4612e..3f653965c 100644
--- a/os/busfault.c
+++ b/os/busfault.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xos.h>
#include <X11/Xdefs.h>
diff --git a/os/connection.c b/os/connection.c
index f7eb95b1e..0b81106a5 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -60,9 +60,7 @@ SOFTWARE.
*
*****************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef WIN32
#include <X11/Xwinsock.h>
diff --git a/os/inputthread.c b/os/inputthread.c
index 132940f98..623648256 100644
--- a/os/inputthread.c
+++ b/os/inputthread.c
@@ -25,9 +25,7 @@
* Tiago Vignatti <vignatti at freedesktop org>
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <errno.h>
diff --git a/os/io.c b/os/io.c
index d4c03f3a7..b0c314a4d 100644
--- a/os/io.c
+++ b/os/io.c
@@ -51,9 +51,7 @@ SOFTWARE.
*
*****************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#undef DEBUG_COMMUNICATION
diff --git a/os/mitauth.c b/os/mitauth.c
index 44e3329c2..4383ac7ae 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -31,9 +31,7 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "os.h"
diff --git a/os/osinit.c b/os/osinit.c
index d376be780..6e1d822e2 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -44,9 +44,7 @@ SOFTWARE.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <errno.h>
#include <stdio.h>
diff --git a/os/ospoll.c b/os/ospoll.c
index 71410a2e2..dc2ecd10f 100644
--- a/os/ospoll.c
+++ b/os/ospoll.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdlib.h>
#include <unistd.h>
diff --git a/os/reallocarray.c b/os/reallocarray.c
index c415e09af..3c34f7ff9 100644
--- a/os/reallocarray.c
+++ b/os/reallocarray.c
@@ -15,9 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/types.h>
#include <errno.h>
diff --git a/os/strcasecmp.c b/os/strcasecmp.c
index 2692f7f1e..50c2a3528 100644
--- a/os/strcasecmp.c
+++ b/os/strcasecmp.c
@@ -27,9 +27,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <ctype.h>
#include "dix.h"
diff --git a/os/strcasestr.c b/os/strcasestr.c
index 4e483a940..771bb00e4 100644
--- a/os/strcasestr.c
+++ b/os/strcasestr.c
@@ -30,9 +30,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <ctype.h>
#include <string.h>
diff --git a/os/strlcat.c b/os/strlcat.c
index 316dfa9d1..538e7ab3f 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -14,9 +14,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/types.h>
#include <string.h>
diff --git a/os/strlcpy.c b/os/strlcpy.c
index 52e7203b2..82c158a9f 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -14,9 +14,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <sys/types.h>
#include <string.h>
diff --git a/os/strndup.c b/os/strndup.c
index e0eddf13d..4606ab413 100644
--- a/os/strndup.c
+++ b/os/strndup.c
@@ -27,9 +27,7 @@
* SUCH DAMAGE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stddef.h>
#include <stdlib.h>
diff --git a/os/utils.c b/os/utils.c
index 6db344403..eb69980ad 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -48,9 +48,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef __CYGWIN__
#include <stdlib.h>
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 21b79e943..3a676e188 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -33,9 +33,7 @@ from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 7546d8309..4a12cae5b 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -13,9 +13,7 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifdef WIN32
#include <X11/Xwinsock.h>
diff --git a/os/xprintf.c b/os/xprintf.c
index e19e1ca03..9e93ac9b2 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -56,9 +56,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xos.h>
#include "os.h"
diff --git a/os/xserver_poll.c b/os/xserver_poll.c
index ff31b7890..64b94f199 100644
--- a/os/xserver_poll.c
+++ b/os/xserver_poll.c
@@ -73,9 +73,7 @@
Includes
\*---------------------------------------------------------------------------*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <unistd.h> /* standard Unix definitions */
#include <sys/types.h> /* system types */
diff --git a/os/xsha1.c b/os/xsha1.c
index f2863f523..a1a2448af 100644
--- a/os/xsha1.c
+++ b/os/xsha1.c
@@ -23,9 +23,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "os.h"
#include "os/xsha1.h"
diff --git a/os/xstrans.c b/os/xstrans.c
index 2bc79e7ae..c9363db71 100644
--- a/os/xstrans.c
+++ b/os/xstrans.c
@@ -1,16 +1,7 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xfuncproto.h>
-/* ErrorF is used by xtrans */
-#ifndef HAVE_DIX_CONFIG_H
-extern _X_EXPORT void
-ErrorF(const char *f, ...)
-_X_ATTRIBUTE_PRINTF(1, 2);
-#endif
-
#define TRANS_REOPEN
#define TRANS_SERVER
#define XSERV_t
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 0906ac030..233f91704 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -33,9 +33,7 @@
Equipment Corporation.
******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xfuncproto.h>
diff --git a/randr/randr.c b/randr/randr.c
index 3cb4cbd39..7e79ec992 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -26,9 +26,7 @@
* Keith Packard, Intel Corporation
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "randrstr_priv.h"
#include "extinit_priv.h"
diff --git a/record/record.c b/record/record.c
index 748088db8..6572b8e92 100644
--- a/record/record.c
+++ b/record/record.c
@@ -32,9 +32,7 @@ and Jim Haggerty of Metheus.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/cursor_priv.h"
#include "dix/eventconvert.h"
diff --git a/record/set.c b/record/set.c
index 74e40d93e..f071a4b3f 100644
--- a/record/set.c
+++ b/record/set.c
@@ -45,9 +45,7 @@ from The Open Group.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <string.h>
diff --git a/render/animcur.c b/render/animcur.c
index f02383c35..f906cd813 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -31,9 +31,7 @@
* delta times between each image.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include <X11/Xmd.h>
diff --git a/render/filter.c b/render/filter.c
index 44f6b6465..546998a92 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#define XK_LATIN1
#include <X11/keysymdef.h>
diff --git a/render/glyph.c b/render/glyph.c
index 5fa7f3b5b..57aa46789 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -22,9 +22,7 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "os/xsha1.h"
diff --git a/render/matrix.c b/render/matrix.c
index 83cd66c43..2d66e71de 100644
--- a/render/matrix.c
+++ b/render/matrix.c
@@ -20,9 +20,7 @@
* OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "misc.h"
#include "scrnintstr.h"
diff --git a/render/miindex.c b/render/miindex.c
index 7892b66ff..c1926e898 100644
--- a/render/miindex.c
+++ b/render/miindex.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#ifndef _MIINDEX_H_
#define _MIINDEX_H_
diff --git a/render/mipict.c b/render/mipict.c
index 7fb03435b..b80b58172 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "scrnintstr.h"
#include "gcstruct.h"
diff --git a/render/mirect.c b/render/mirect.c
index 65f8d5efd..6302ec7f1 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "scrnintstr.h"
#include "gcstruct.h"
diff --git a/render/mitrap.c b/render/mitrap.c
index 17b6dcd1c..cccaf6f4a 100644
--- a/render/mitrap.c
+++ b/render/mitrap.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "scrnintstr.h"
#include "gcstruct.h"
diff --git a/render/mitri.c b/render/mitri.c
index 922f22a6a..876631574 100644
--- a/render/mitri.c
+++ b/render/mitri.c
@@ -21,9 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "scrnintstr.h"
#include "gcstruct.h"
diff --git a/render/picture.c b/render/picture.c
index d41a0ed91..a6091f0ee 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -22,9 +22,7 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/colormap_priv.h"
diff --git a/render/render.c b/render/render.c
index 122bfead1..b43d8d9c9 100644
--- a/render/render.c
+++ b/render/render.c
@@ -22,9 +22,7 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <X11/X.h>
diff --git a/test/fixes.c b/test/fixes.c
index b5d57cf8f..454cccb4f 100644
--- a/test/fixes.c
+++ b/test/fixes.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
diff --git a/test/hashtabletest.c b/test/hashtabletest.c
index 59c39b464..47225e44a 100644
--- a/test/hashtabletest.c
+++ b/test/hashtabletest.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <misc.h>
#include <stdlib.h>
diff --git a/test/input.c b/test/input.c
index dffde3555..6e5e83b5a 100644
--- a/test/input.c
+++ b/test/input.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <X11/X.h>
diff --git a/test/list.c b/test/list.c
index 06a9afc1e..dbb7a768d 100644
--- a/test/list.c
+++ b/test/list.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xlib.h>
#include <list.h>
diff --git a/test/misc.c b/test/misc.c
index 5bf719312..bcb789ae9 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
diff --git a/test/signal-logging.c b/test/signal-logging.c
index 22966ed4c..db8efa852 100644
--- a/test/signal-logging.c
+++ b/test/signal-logging.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <unistd.h>
diff --git a/test/simple-xinit.c b/test/simple-xinit.c
index 57e7eed57..39daf54c9 100644
--- a/test/simple-xinit.c
+++ b/test/simple-xinit.c
@@ -21,9 +21,7 @@
* IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/Xfuncproto.h>
diff --git a/test/string.c b/test/string.c
index 6fa4882d9..be971e623 100644
--- a/test/string.c
+++ b/test/string.c
@@ -29,9 +29,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <assert.h>
#include "os.h"
diff --git a/test/test_xkb.c b/test/test_xkb.c
index 303bbec53..2fd9d1f36 100644
--- a/test/test_xkb.c
+++ b/test/test_xkb.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <xkb-config.h>
diff --git a/test/touch.c b/test/touch.c
index 86dcc32de..3e9100a9f 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
diff --git a/test/xfree86.c b/test/xfree86.c
index 7cbd37f40..d964f0b0b 100644
--- a/test/xfree86.c
+++ b/test/xfree86.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <assert.h>
diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c
index 4c1a1740a..1ec1d1a26 100644
--- a/test/xi1/protocol-xchangedevicecontrol.c
+++ b/test/xi1/protocol-xchangedevicecontrol.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for ChangeDeviceControl request.
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index aae84180a..821b4b132 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <errno.h>
#include <stdint.h>
diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c
index e1317ca1b..f340838c2 100644
--- a/test/xi2/protocol-eventconvert.c
+++ b/test/xi2/protocol-eventconvert.c
@@ -23,9 +23,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <X11/extensions/XI2proto.h>
diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c
index 6a066b022..f01199e84 100644
--- a/test/xi2/protocol-xigetclientpointer.c
+++ b/test/xi2/protocol-xigetclientpointer.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XIGetClientPointer request.
diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c
index 937b52b2e..33cd899f4 100644
--- a/test/xi2/protocol-xigetselectedevents.c
+++ b/test/xi2/protocol-xigetselectedevents.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XIGetSelectedEvents request.
diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c
index bc9866493..2146462b0 100644
--- a/test/xi2/protocol-xipassivegrabdevice.c
+++ b/test/xi2/protocol-xipassivegrabdevice.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XIPassiveGrab request.
diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c
index f0b03a19a..daa3f6024 100644
--- a/test/xi2/protocol-xiquerydevice.c
+++ b/test/xi2/protocol-xiquerydevice.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <X11/X.h>
diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c
index 394fc7c00..8a7ae608b 100644
--- a/test/xi2/protocol-xiquerypointer.c
+++ b/test/xi2/protocol-xiquerypointer.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XIQueryPointer request.
diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c
index b8145bc1c..f452333e6 100644
--- a/test/xi2/protocol-xiqueryversion.c
+++ b/test/xi2/protocol-xiqueryversion.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XIQueryVersion request and reply.
diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c
index 9389bd27e..612cb6bdb 100644
--- a/test/xi2/protocol-xiselectevents.c
+++ b/test/xi2/protocol-xiselectevents.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XISelectEvents request.
diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c
index 881fcf3f1..d47baea7d 100644
--- a/test/xi2/protocol-xisetclientpointer.c
+++ b/test/xi2/protocol-xisetclientpointer.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XISetClientPointer request.
diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c
index 417d9adfc..d225e79ed 100644
--- a/test/xi2/protocol-xiwarppointer.c
+++ b/test/xi2/protocol-xiwarppointer.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
/*
* Protocol testing for XIWarpPointer request.
diff --git a/test/xi2/xi2.c b/test/xi2/xi2.c
index 03022ebfa..b49a8fe8d 100644
--- a/test/xi2/xi2.c
+++ b/test/xi2/xi2.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include "inpututils.h"
diff --git a/test/xtest.c b/test/xtest.c
index f37863cd8..e1057b82c 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -24,9 +24,7 @@
/* Test relies on assert() */
#undef NDEBUG
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdint.h>
#include <X11/Xatom.h>
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 05f79d36c..561e20805 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -42,9 +42,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c
index e2140572a..73aa7cfc8 100644
--- a/xfixes/disconnect.c
+++ b/xfixes/disconnect.c
@@ -42,9 +42,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
diff --git a/xfixes/region.c b/xfixes/region.c
index 4595f8f2d..019287e04 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
#include "render/picturestr_priv.h"
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index 981d15b86..3db5c6634 100644
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
diff --git a/xfixes/select.c b/xfixes/select.c
index 660eed210..81b151199 100644
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -20,9 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "dix/dix_priv.h"
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index 69b8241a4..494367673 100644
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -42,9 +42,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "xfixesint.h"
#include "protocol-versions.h"
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 18557b804..504687ce5 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index f0cda24fe..d0cc51e99 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index fa4c86d44..46b61f53c 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 0a3b5cbc7..cf582cffd 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 52353ea81..86b6e7c99 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index 964ac3d51..e542a37f1 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 7c7e73970..e4531388c 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index e5aecb523..e6520ea76 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index abf213970..379a555b4 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <xkb-config.h>
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index fcde3a18c..26faaa563 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -1,7 +1,5 @@
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <X11/X.h>
#include "windowstr.h"
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index f3cd26a97..91b690071 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/maprules.c b/xkb/maprules.c
index e071ab539..0b6c107ae 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -24,9 +24,7 @@
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkb.c b/xkb/xkb.c
index f203270d5..751b4acfb 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 854dde221..32892ac20 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#if !defined(WIN32)
#include <sys/time.h>
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index bdfca425f..f3e602ec4 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <ctype.h>
#include <stdio.h>
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index e6325d875..cfe9ba11c 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index a45fba6f6..4c12c2480 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <xkb-config.h>
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index 7ac6b1ad9..749123577 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 903534d54..19dce29ab 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <ctype.h>
#include <stdio.h>
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index efbdb81c1..6a178d7de 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include "stdio.h"
#include <X11/X.h>
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 7ad50fc2f..ff0785ddb 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -48,9 +48,7 @@ DEALINGS IN THE SOFTWARE.
*/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 47da228ca..146e36683 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -24,9 +24,7 @@
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 297b3aa9c..98130fc32 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -24,9 +24,7 @@
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 35841dd2b..c7ed48956 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -24,9 +24,7 @@
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index def60def8..45da55660 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -24,9 +24,7 @@
********************************************************/
-#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
#include <stdio.h>