diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 8b46ef344..a08766a81 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -31,9 +31,6 @@ Equipment Corporation. /* * PanoramiX definitions */ - -#include - #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index 8eea4831f..864937566 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,6 +1,3 @@ - -#include - #ifndef _PANORAMIXSRV_H_ #define _PANORAMIXSRV_H_ diff --git a/Xi/chgprop.h b/Xi/chgprop.h index 89d6b5695..d3572c5f7 100644 --- a/Xi/chgprop.h +++ b/Xi/chgprop.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGPROP_H #define CHGPROP_H 1 diff --git a/Xi/chgptr.h b/Xi/chgptr.h index 3a85f0f03..5832326e5 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGPTR_H #define CHGPTR_H 1 diff --git a/Xi/closedev.h b/Xi/closedev.h index 201d14f0a..92341f9f1 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CLOSEDEV_H #define CLOSEDEV_H 1 diff --git a/Xi/devbell.h b/Xi/devbell.h index c83a9d4b0..c76f2fe70 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef DEVBELL_H #define DEVBELL_H 1 diff --git a/Xi/exglobals.h b/Xi/exglobals.h index 02c9fe9d1..465e717a9 100644 --- a/Xi/exglobals.h +++ b/Xi/exglobals.h @@ -28,9 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Globals referenced elsewhere in the server. * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif #include "privates.h" #ifndef EXGLOBALS_H diff --git a/Xi/getbmap.h b/Xi/getbmap.h index 78cb15198..9b6606390 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETBMAP_H #define GETBMAP_H 1 diff --git a/Xi/getdctl.h b/Xi/getdctl.h index 430b75b1d..75eaa4b7a 100644 --- a/Xi/getdctl.h +++ b/Xi/getdctl.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETDCTL_H #define GETDCTL_H 1 diff --git a/Xi/getfctl.h b/Xi/getfctl.h index 63083432e..11d71b094 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETFCTL_H #define GETFCTL_H 1 diff --git a/Xi/getfocus.h b/Xi/getfocus.h index 00650c17d..70ce3b972 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETFOCUS_H #define GETFOCUS_H 1 diff --git a/Xi/getkmap.h b/Xi/getkmap.h index 74e2e5b78..898dcce2d 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETKMAP_H #define GETKMAP_H 1 diff --git a/Xi/getmmap.h b/Xi/getmmap.h index feef7c505..22390b666 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETMMAP_H #define GETMMAP_H 1 diff --git a/Xi/getprop.h b/Xi/getprop.h index 59225cba9..abe2d6128 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETPROP_H #define GETPROP_H 1 diff --git a/Xi/getselev.h b/Xi/getselev.h index bcb8ebcbb..60dc5d3a4 100644 --- a/Xi/getselev.h +++ b/Xi/getselev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETSELEV_H #define GETSELEV_H 1 diff --git a/Xi/getvers.h b/Xi/getvers.h index 678046d1d..82dbba5bb 100644 --- a/Xi/getvers.h +++ b/Xi/getvers.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETVERS_H #define GETVERS_H 1 diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 8dfcab70d..b064c40cc 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GRABDEV_H #define GRABDEV_H 1 diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h index b2a9796b5..f645bab71 100644 --- a/Xi/grabdevb.h +++ b/Xi/grabdevb.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GRABDEVB_H #define GRABDEVB_H 1 diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h index 85738affa..65c985009 100644 --- a/Xi/grabdevk.h +++ b/Xi/grabdevk.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GRABDEVK_H #define GRABDEVK_H 1 diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h index 70e75b85a..02d366d08 100644 --- a/Xi/gtmotion.h +++ b/Xi/gtmotion.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GTMOTION_H #define GTMOTION_H 1 diff --git a/Xi/listdev.h b/Xi/listdev.h index 65a62220d..958b4df6d 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef LISTDEV_H #define LISTDEV_H 1 diff --git a/Xi/opendev.h b/Xi/opendev.h index 89b326d43..d17f74a3f 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef OPENDEV_H #define OPENDEV_H 1 diff --git a/Xi/queryst.h b/Xi/queryst.h index 32960b1cd..1da6026d1 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef QUERYST_H #define QUERYST_H 1 diff --git a/Xi/selectev.h b/Xi/selectev.h index e80fe4a43..6b5ca397f 100644 --- a/Xi/selectev.h +++ b/Xi/selectev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SELECTEV_H #define SELECTEV_H 1 diff --git a/Xi/sendexev.h b/Xi/sendexev.h index 38c66434d..45b10482e 100644 --- a/Xi/sendexev.h +++ b/Xi/sendexev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SENDEXEV_H #define SENDEXEV_H 1 diff --git a/Xi/setbmap.h b/Xi/setbmap.h index f4bb22cb7..f7e2fa8d9 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETBMAP_H #define SETBMAP_H 1 diff --git a/Xi/setdval.h b/Xi/setdval.h index 644bbcfbe..26bc1446d 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETDVAL_H #define SETDVAL_H 1 diff --git a/Xi/setfocus.h b/Xi/setfocus.h index 0adf45157..3fea15fa4 100644 --- a/Xi/setfocus.h +++ b/Xi/setfocus.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETFOCUS_H #define SETFOCUS_H 1 diff --git a/Xi/setmmap.h b/Xi/setmmap.h index a7de58d3a..28e11ee0b 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETMMAP_H #define SETMMAP_H 1 diff --git a/Xi/setmode.h b/Xi/setmode.h index 68bdddbc5..e953bcb7e 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETMODE_H #define SETMODE_H 1 diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h index 8a85c27f1..39ad18fe7 100644 --- a/Xi/ungrdev.h +++ b/Xi/ungrdev.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef UNGRDEV_H #define UNGRDEV_H 1 diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h index 97d8aede1..852a7c7e1 100644 --- a/Xi/ungrdevb.h +++ b/Xi/ungrdevb.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef UNGRDEVB_H #define UNGRDEVB_H 1 diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h index 1c4bab65b..664712ae0 100644 --- a/Xi/ungrdevk.h +++ b/Xi/ungrdevk.h @@ -23,10 +23,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef UNGRDEVK_H #define UNGRDEVK_H 1 diff --git a/Xi/xiallowev.h b/Xi/xiallowev.h index c24ac3df4..8a9efd590 100644 --- a/Xi/xiallowev.h +++ b/Xi/xiallowev.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIALLOWEV_H #define XIALLOWEV_H 1 diff --git a/Xi/xibarriers.h b/Xi/xibarriers.h index 386a6ebe5..186648d37 100644 --- a/Xi/xibarriers.h +++ b/Xi/xibarriers.h @@ -1,8 +1,4 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _XIBARRIERS_H_ #define _XIBARRIERS_H_ diff --git a/Xi/xichangecursor.h b/Xi/xichangecursor.h index 14477772a..282117968 100644 --- a/Xi/xichangecursor.h +++ b/Xi/xichangecursor.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHDEVCUR_H #define CHDEVCUR_H 1 diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h index 8fa3a66e7..b238dd201 100644 --- a/Xi/xichangehierarchy.h +++ b/Xi/xichangehierarchy.h @@ -29,10 +29,6 @@ * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHDEVHIER_H #define CHDEVHIER_H 1 diff --git a/Xi/xigetclientpointer.h b/Xi/xigetclientpointer.h index 2e3cfc330..de25bd081 100644 --- a/Xi/xigetclientpointer.h +++ b/Xi/xigetclientpointer.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETCPTR_H #define GETCPTR_H 1 diff --git a/Xi/xigrabdev.h b/Xi/xigrabdev.h index 3deacffed..4ca0115ce 100644 --- a/Xi/xigrabdev.h +++ b/Xi/xigrabdev.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIGRABDEV_H #define XIGRABDEV_H 1 diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h index de59ab990..8381df986 100644 --- a/Xi/xipassivegrab.h +++ b/Xi/xipassivegrab.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIPASSIVEGRAB_H #define XIPASSIVEGRAB_H 1 diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h index 5edc28733..baea37071 100644 --- a/Xi/xiproperty.h +++ b/Xi/xiproperty.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIPROPERTY_H #define XIPROPERTY_H 1 diff --git a/Xi/xiquerydevice.h b/Xi/xiquerydevice.h index 5f6fee3db..ec428755c 100644 --- a/Xi/xiquerydevice.h +++ b/Xi/xiquerydevice.h @@ -24,10 +24,6 @@ * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef QUERYDEV_H #define QUERYDEV_H 1 diff --git a/Xi/xiquerypointer.h b/Xi/xiquerypointer.h index f4dfacc4f..c5a67bd04 100644 --- a/Xi/xiquerypointer.h +++ b/Xi/xiquerypointer.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef QUERYDP_H #define QUERYDP_H 1 diff --git a/Xi/xiqueryversion.h b/Xi/xiqueryversion.h index 824e168a4..99d7706f7 100644 --- a/Xi/xiqueryversion.h +++ b/Xi/xiqueryversion.h @@ -24,10 +24,6 @@ * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #ifndef QUERYVERSION_H diff --git a/Xi/xiselectev.h b/Xi/xiselectev.h index f0f0d1c16..d9c6c4cb7 100644 --- a/Xi/xiselectev.h +++ b/Xi/xiselectev.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XISELECTEVENTS_H #define XISELECTEVENTS_H 1 diff --git a/Xi/xisetclientpointer.h b/Xi/xisetclientpointer.h index f5c15bf49..eb2f7da06 100644 --- a/Xi/xisetclientpointer.h +++ b/Xi/xisetclientpointer.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETCPTR_H #define SETCPTR_H 1 diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h index 68dbe0ee5..94f7fca7d 100644 --- a/Xi/xisetdevfocus.h +++ b/Xi/xisetdevfocus.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XISETDEVFOCUS_H #define XISETDEVFOCUS_H 1 diff --git a/Xi/xiwarppointer.h b/Xi/xiwarppointer.h index 7637f422a..4492163c6 100644 --- a/Xi/xiwarppointer.h +++ b/Xi/xiwarppointer.h @@ -23,10 +23,6 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef WARPDEVP_H #define WARPDEVP_H 1 diff --git a/composite/compint.h b/composite/compint.h index 3a91914f9..8897f8a48 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -40,11 +40,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _COMPINT_H_ #define _COMPINT_H_ diff --git a/damageext/damageextint.h b/damageext/damageextint.h index a7e521dd6..b50861b94 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -20,10 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _DAMAGEEXTINT_H_ #define _DAMAGEEXTINT_H_ diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 1af1b458a..d4b9771ff 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -26,8 +26,6 @@ #ifndef EXAPRIV_H #define EXAPRIV_H -#include - #include "exa.h" #include diff --git a/fb/fbbits.h b/fb/fbbits.h index 808bf0918..e382f0e07 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -27,10 +27,6 @@ #define isClipped(c,ul,lr) (((c) | ((c) - (ul)) | ((lr) - (c))) & 0x80008000) -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include "fb/fb_priv.h" #define __FbMaskBits(x,w,l,n,r) { \ diff --git a/glx/glxcontext.h b/glx/glxcontext.h index 5dd0ebca6..6395a6175 100644 --- a/glx/glxcontext.h +++ b/glx/glxcontext.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _GLX_context_h_ #define _GLX_context_h_ diff --git a/glx/glxext.h b/glx/glxext.h index abaf1225c..77f8f2897 100644 --- a/glx/glxext.h +++ b/glx/glxext.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _glxext_h_ #define _glxext_h_ diff --git a/glx/glxscreens.h b/glx/glxscreens.h index 02170b0c6..6cae0c268 100644 --- a/glx/glxscreens.h +++ b/glx/glxscreens.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _GLX_screens_h_ #define _GLX_screens_h_ diff --git a/glx/glxutil.h b/glx/glxutil.h index 314606da2..1940de043 100644 --- a/glx/glxutil.h +++ b/glx/glxutil.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _glxcmds_h_ #define _glxcmds_h_ diff --git a/glx/singlesize.h b/glx/singlesize.h index dc85d3d36..fcb1ed98b 100644 --- a/glx/singlesize.h +++ b/glx/singlesize.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _singlesize_h_ #define _singlesize_h_ diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 463adfdca..501fdf651 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -37,8 +37,6 @@ #ifdef HAVE_XORG_CONFIG_H #include -#elif HAVE_DIX_CONFIG_H -#include #endif #include "xf86str.h" diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h index d5be0e8b6..a6b5d87c9 100644 --- a/hw/xquartz/X11Controller.h +++ b/hw/xquartz/X11Controller.h @@ -31,10 +31,6 @@ #ifndef X11CONTROLLER_H #define X11CONTROLLER_H 1 -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #if __OBJC__ #include "sanitizedCocoa.h" diff --git a/include/client.h b/include/client.h index d71dc8d05..0f32a97f0 100644 --- a/include/client.h +++ b/include/client.h @@ -26,10 +26,6 @@ #ifndef CLIENT_H #define CLIENT_H -#ifdef HAVE_DIX_CONFIG_H -#include -#endif /* HAVE_DIX_CONFIG_H */ - struct _Client; typedef struct _ClientId *ClientIdPtr; diff --git a/include/displaymode.h b/include/displaymode.h index 561087717..c97a11eb7 100644 --- a/include/displaymode.h +++ b/include/displaymode.h @@ -1,7 +1,3 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _DISMODEPROC_H_ #define _DISMODEPROC_H_ diff --git a/include/probes.h b/include/probes.h index b7d69f57c..b940b4d4d 100644 --- a/include/probes.h +++ b/include/probes.h @@ -24,10 +24,6 @@ #ifndef XORG_PROBES_H #define XORG_PROBES_H -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - /* definitions needed to include Dtrace probes in a source file */ #ifdef XSERVER_DTRACE diff --git a/mi/miinitext.h b/mi/miinitext.h index a1ceb9aa8..82179a4ee 100644 --- a/mi/miinitext.h +++ b/mi/miinitext.h @@ -71,10 +71,6 @@ SOFTWARE. * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef MIINITEXT_H #define MIINITEXT_H diff --git a/mi/miscanfill.h b/mi/miscanfill.h index 7fba199de..da20db1c4 100644 --- a/mi/miscanfill.h +++ b/mi/miscanfill.h @@ -25,11 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SCANFILLINCLUDED #define SCANFILLINCLUDED /* diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 525b2db5d..649144f3e 100644 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -19,11 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _DAMAGE_H_ #define _DAMAGE_H_ diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 5517d24e0..412dec62e 100644 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -20,10 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _DAMAGESTR_H_ #define _DAMAGESTR_H_ diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index 9fdb98e40..b489ecf60 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -27,11 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 80c2f6d8a..c5fd76b91 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -27,10 +27,6 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H diff --git a/miext/sync/misync.h b/miext/sync/misync.h index 4748fa4ae..b9d06cf34 100644 --- a/miext/sync/misync.h +++ b/miext/sync/misync.h @@ -21,10 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _MISYNC_H_ #define _MISYNC_H_ diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h index 21cb0b257..0ed3b290c 100644 --- a/miext/sync/misyncstr.h +++ b/miext/sync/misyncstr.h @@ -21,10 +21,6 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _MISYNCSTR_H_ #define _MISYNCSTR_H_ diff --git a/randr/randrstr.h b/randr/randrstr.h index 658edc453..efd7f6a94 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -25,11 +25,6 @@ * Author: Jim Gettys, Hewlett-Packard Company, Inc. * Keith Packard, Intel Corporation */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _RANDRSTR_H_ #define _RANDRSTR_H_