diff --git a/saa/saa.c b/saa/saa.c index 953f934..262b8e8 100644 --- a/saa/saa.c +++ b/saa/saa.c @@ -28,10 +28,6 @@ * memory management. */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #include "saa_priv.h" diff --git a/saa/saa.h b/saa/saa.h index 19c5749..99b12fe 100644 --- a/saa/saa.h +++ b/saa/saa.h @@ -32,14 +32,9 @@ #ifndef _SAA_H_ #define _SAA_H_ -#ifdef HAVE_CONFIG_H #include -#endif -#ifdef HAVE_DIX_CONFIG_H -#include -#else #include -#endif + #include #include #include diff --git a/saa/saa_priv.h b/saa/saa_priv.h index b0d8763..a512980 100644 --- a/saa/saa_priv.h +++ b/saa/saa_priv.h @@ -30,14 +30,10 @@ #ifndef _SAA_PRIV_H #define _SAA_PRIV_H -#ifdef HAVE_CONFIG_H #include -#endif -#ifdef HAVE_DIX_CONFIG_H -#include -#else + #include -#endif + #include "xf86.h" #include "saa.h" diff --git a/src/bits2pixels.c b/src/bits2pixels.c index e3801c5..0264762 100644 --- a/src/bits2pixels.c +++ b/src/bits2pixels.c @@ -8,9 +8,7 @@ char rcsId_bits2pixels[] = "Id: bits2pixels.c,v 1.6 2001/01/26 23:32:15 yoel Exp #define FILECODE "F(814)" #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * bits2pixels.c -- diff --git a/src/vmware.c b/src/vmware.c index ecf91c6..36f0aaf 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -7,9 +7,7 @@ char rcsId_vmware[] = "Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $"; #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* * TODO: support the vmware linux kernel fb driver (Option "UseFBDev"). diff --git a/src/vmware.h b/src/vmware.h index 72cebc9..8a19e87 100644 --- a/src/vmware.h +++ b/src/vmware.h @@ -6,10 +6,7 @@ #ifndef VMWARE_H #define VMWARE_H - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_XORG_SERVER_1_1_0 #include diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c index dfa46d7..0f43cd2 100644 --- a/src/vmware_bootstrap.c +++ b/src/vmware_bootstrap.c @@ -25,9 +25,7 @@ * Author: Unknown at vmware * Author: Thomas Hellstrom */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xf86.h" #include "compiler.h" diff --git a/src/vmware_common.c b/src/vmware_common.c index 6ef7ca6..1315460 100644 --- a/src/vmware_common.c +++ b/src/vmware_common.c @@ -24,9 +24,7 @@ * * Author: Unknown at vmware */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "vmware_common.h" diff --git a/src/vmwarectrl.c b/src/vmwarectrl.c index c390a7d..bae75fb 100644 --- a/src/vmwarectrl.c +++ b/src/vmwarectrl.c @@ -31,11 +31,7 @@ * The implementation of the VMWARE_CTRL protocol extension that * allows X clients to communicate with the driver. */ - - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "dixstruct.h" #include "extnsionst.h" diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c index 63b4425..f033c88 100644 --- a/src/vmwarecurs.c +++ b/src/vmwarecurs.c @@ -7,9 +7,7 @@ char rcsId_vmwarecurs[] = "Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $"; #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "vmware.h" #include "vmware_common.h" diff --git a/src/vmwaremodes.c b/src/vmwaremodes.c index ace1323..6a8aeee 100644 --- a/src/vmwaremodes.c +++ b/src/vmwaremodes.c @@ -31,9 +31,8 @@ * Provide additional modes for the driver. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif + #include "xf86.h" #ifdef HAVE_XORG_SERVER_1_2_0 #include diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c index e8611bc..935069d 100644 --- a/src/vmwarevideo.c +++ b/src/vmwarevideo.c @@ -32,11 +32,7 @@ * See http://www.xfree86.org/current/DESIGN16.html * */ - - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "vmware.h" #include "vmware_common.h" diff --git a/src/vmwarexinerama.c b/src/vmwarexinerama.c index 29a0022..d76f708 100644 --- a/src/vmwarexinerama.c +++ b/src/vmwarexinerama.c @@ -30,11 +30,7 @@ * * The implementation of the Xinerama protocol extension. */ - - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c index d06acb2..77232bd 100644 --- a/vmwgfx/vmwgfx_crtc.c +++ b/vmwgfx/vmwgfx_crtc.c @@ -28,9 +28,7 @@ * Author: Jakob Bornecrantz * Author: Thomas Hellstrom */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/vmwgfx/vmwgfx_ctrl.c b/vmwgfx/vmwgfx_ctrl.c index 9d71949..ea137de 100644 --- a/vmwgfx/vmwgfx_ctrl.c +++ b/vmwgfx/vmwgfx_ctrl.c @@ -31,9 +31,7 @@ * The implementation of the VMWARE_CTRL protocol extension that * allows X clients to communicate with the driver. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "dixstruct.h" diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c index 92e2c67..c975108 100644 --- a/vmwgfx/vmwgfx_dri2.c +++ b/vmwgfx/vmwgfx_dri2.c @@ -29,9 +29,7 @@ * Author: Thomas Hellstrom * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include "xf86.h" diff --git a/vmwgfx/vmwgfx_dri3.c b/vmwgfx/vmwgfx_dri3.c index 7fb52ee..c76b638 100644 --- a/vmwgfx/vmwgfx_dri3.c +++ b/vmwgfx/vmwgfx_dri3.c @@ -25,9 +25,7 @@ * Author: Thomas Hellstrom * */ -#ifdef _HAVE_CONFIG_H_ #include "config.h" -#endif #include diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index 02ef3f3..4118993 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -28,10 +28,7 @@ * Author: Jakob Bornecrantz * Author: Thomas Hellstrom */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c index a602103..ec26129 100644 --- a/vmwgfx/vmwgfx_drmi.c +++ b/vmwgfx/vmwgfx_drmi.c @@ -25,10 +25,7 @@ * Author: Jakob Bornecrantz * Author: Thomas Hellstrom */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/vmwgfx/vmwgfx_hosted.c b/vmwgfx/vmwgfx_hosted.c index 8fa7394..95c3099 100644 --- a/vmwgfx/vmwgfx_hosted.c +++ b/vmwgfx/vmwgfx_hosted.c @@ -24,10 +24,7 @@ * * Author: Thomas Hellstrom */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "vmwgfx_hosted.h" diff --git a/vmwgfx/vmwgfx_layout.c b/vmwgfx/vmwgfx_layout.c index 55a53be..33edb10 100644 --- a/vmwgfx/vmwgfx_layout.c +++ b/vmwgfx/vmwgfx_layout.c @@ -23,10 +23,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. * **************************************************************************/ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIBUDEV #include "vmwgfx_driver.h" diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c index f589226..5b0882a 100644 --- a/vmwgfx/vmwgfx_output.c +++ b/vmwgfx/vmwgfx_output.c @@ -27,9 +27,7 @@ * Author: Jakob Bornecrantz * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "xorg-server.h" #include diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c index 7d956a0..e0f4654 100644 --- a/vmwgfx/vmwgfx_overlay.c +++ b/vmwgfx/vmwgfx_overlay.c @@ -33,10 +33,7 @@ * See http://www.xfree86.org/current/DESIGN16.html * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif - #include "xorg-server.h" #include "xf86xv.h" diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c index db94ad5..0fd8998 100644 --- a/vmwgfx/vmwgfx_tex_video.c +++ b/vmwgfx/vmwgfx_tex_video.c @@ -25,9 +25,7 @@ * Author: Thomas Hellstrom * Author: Zack Rusin */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "vmwgfx_driver.h" #include "vmwgfx_drmi.h" diff --git a/vmwgfx/vmwgfx_xa_composite.c b/vmwgfx/vmwgfx_xa_composite.c index 32246e8..1b4e455 100644 --- a/vmwgfx/vmwgfx_xa_composite.c +++ b/vmwgfx/vmwgfx_xa_composite.c @@ -28,10 +28,7 @@ * The code in this file translates XRender PICT composite stuff * to fit the libxatracker API. */ - -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c index 708a320..5820f07 100644 --- a/vmwgfx/vmwgfx_xa_surface.c +++ b/vmwgfx/vmwgfx_xa_surface.c @@ -24,9 +24,7 @@ * * Author: Thomas Hellstrom */ -#ifdef _HAVE_CONFIG_H_ #include "config.h" -#endif #include #include "vmwgfx_saa_priv.h"