Remove use of dix-config and xorg-config.h from public headers.

44 files changed, 0 insertions, 170 deletions

diff --git a/include/XIstubs.h b/include/XIstubs.h
index 940604887..e005493c4 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef XI_STUBS_H
 #define XI_STUBS_H 1
 
diff --git a/include/bstore.h b/include/bstore.h
index 22dd02828..098abcd86 100644
--- a/include/bstore.h
+++ b/include/bstore.h
@@ -15,10 +15,6 @@
  * -- 1997.10.27  Marc Aurele La France (tsi@xfree86.org)
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _BSTORE_H_
 #define _BSTORE_H_
 
diff --git a/include/bstorestr.h b/include/bstorestr.h
index 8452396d0..8f21855c4 100644
--- a/include/bstorestr.h
+++ b/include/bstorestr.h
@@ -15,10 +15,6 @@
  * -- 1997.10.27  Marc Aurele La France (tsi@xfree86.org)
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _BSTORESTR_H_
 #define _BSTORESTR_H_
 
diff --git a/include/closestr.h b/include/closestr.h
index 64f348448..d70f754b2 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -29,10 +29,6 @@ from The Open Group.
 /* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */
 
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CLOSESTR_H
 #define CLOSESTR_H
 
diff --git a/include/closure.h b/include/closure.h
index b8f21f9d7..839303c96 100644
--- a/include/closure.h
+++ b/include/closure.h
@@ -45,9 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
 
 #ifndef CLOSURE_H
 #define CLOSURE_H 1
diff --git a/include/colormap.h b/include/colormap.h
index baf3dcdb5..1f2c33075 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -47,10 +47,6 @@ SOFTWARE.
 */
 /* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CMAP_H
 #define CMAP_H 1
 
diff --git a/include/colormapst.h b/include/colormapst.h
index 519ead1f0..5ceee9870 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -45,9 +45,6 @@ SOFTWARE.
 
 */
 /* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
 
 #ifndef CMAPSTRUCT_H
 #define CMAPSTRUCT_H 1
diff --git a/include/cursor.h b/include/cursor.h
index 6f8c0a24f..d51cc79e6 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -47,9 +47,6 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
 
 #ifndef CURSOR_H
 #define CURSOR_H 
diff --git a/include/cursorstr.h b/include/cursorstr.h
index b4ce35c6e..c877d6cc9 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef CURSORSTRUCT_H
 #define CURSORSTRUCT_H 
 
diff --git a/include/dix.h b/include/dix.h
index 1ad1cbc8a..1b8fc4265 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DIX_H
 #define DIX_H
 
diff --git a/include/dixevents.h b/include/dixevents.h
index 96ae17149..46a5faef0 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DIXEVENTS_H
 #define DIXEVENTS_H
 
diff --git a/include/dixfont.h b/include/dixfont.h
index 1d249b302..c6b8676da 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -23,10 +23,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DIXFONT_H
 #define DIXFONT_H 1
 
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index ba696c56f..948bf1adb 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -22,10 +22,6 @@ SOFTWARE.
 
 ******************************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DIXFONTSTRUCT_H
 #define DIXFONTSTRUCT_H
 
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index cb07c6d11..042e063db 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DIXGRABS_H
 #define DIXGRABS_H 1
 
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 5c1281ab2..d7d810272 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -23,10 +23,6 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef DIXSTRUCT_H
 #define DIXSTRUCT_H
 
diff --git a/include/exevents.h b/include/exevents.h
index fdd253c85..91c7acb6b 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -28,10 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * Interface of 'exevents.c'
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef EXEVENTS_H
 #define EXEVENTS_H
 
diff --git a/include/extension.h b/include/extension.h
index 7d4e4accb..34750173b 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef EXTENSION_H
 #define EXTENSION_H 
 
diff --git a/include/extinit.h b/include/extinit.h
index 3dcf179e1..37fa9a245 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -28,10 +28,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * Interface of extinit.c
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef EXTINIT_H
 #define EXTINIT_H
 
diff --git a/include/extnsionst.h b/include/extnsionst.h
index b5b02dabe..daf37bf43 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef EXTENSIONSTRUCT_H
 #define EXTENSIONSTRUCT_H 
 
diff --git a/include/gc.h b/include/gc.h
index b4a3b3af2..77c2f20c6 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GC_H
 #define GC_H 
 
diff --git a/include/gcstruct.h b/include/gcstruct.h
index a8f2ad0be..c2226ba17 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -49,10 +49,6 @@ SOFTWARE.
 
 /* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef GCSTRUCT_H
 #define GCSTRUCT_H
 
diff --git a/include/globals.h b/include/globals.h
index 775409183..924608e89 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,10 +1,6 @@
 /* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.6 2005/05/19 18:53:49 ajax Exp $ */
 /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef _XSERV_GLOBAL_H_
 #define _XSERV_GLOBAL_H_
 
diff --git a/include/input.h b/include/input.h
index f51dc44f0..bcaa01e6f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef INPUT_H
 #define INPUT_H
 
diff --git a/include/inputstr.h b/include/inputstr.h
index 9d0bf4057..b54e8a1d5 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -48,10 +48,6 @@ SOFTWARE.
 
 /* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef INPUTSTRUCT_H
 #define INPUTSTRUCT_H
 
diff --git a/include/miscstruct.h b/include/miscstruct.h
index f58b678c6..6a16007b7 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef MISCSTRUCT_H
 #define MISCSTRUCT_H 1
 
diff --git a/include/opaque.h b/include/opaque.h
index 277ca61ac..ca29afdc0 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -28,10 +28,6 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef OPAQUE_H
 #define OPAQUE_H
 
diff --git a/include/pixmap.h b/include/pixmap.h
index 64702fa29..6cea329ec 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86$ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef PIXMAP_H
 #define PIXMAP_H
 
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 465e7bcb7..22a1f1025 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86$ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
 #include "pixmap.h"
diff --git a/include/property.h b/include/property.h
index 6b8988112..21a38d51c 100644
--- a/include/property.h
+++ b/include/property.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef PROPERTY_H
 #define PROPERTY_H 
 
diff --git a/include/propertyst.h b/include/propertyst.h
index daac37e13..177fca171 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef PROPERTYSTRUCT_H
 #define PROPERTYSTRUCT_H 
 #include "misc.h"
diff --git a/include/region.h b/include/region.h
index 0c67fe9ee..0340b0db6 100644
--- a/include/region.h
+++ b/include/region.h
@@ -45,9 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
 
 #ifndef REGION_H
 #define REGION_H
diff --git a/include/regionstr.h b/include/regionstr.h
index dfee705a9..0af87bde8 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -48,10 +48,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
 
diff --git a/include/resource.h b/include/resource.h
index 260c7ebb0..49c189869 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
 #include "misc.h"
diff --git a/include/rgb.h b/include/rgb.h
index 45f44d738..5741a4efa 100644
--- a/include/rgb.h
+++ b/include/rgb.h
@@ -46,10 +46,6 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef RGB_H
 #define RGB_H
 typedef struct _RGB {
diff --git a/include/screenint.h b/include/screenint.h
index c3a7204e1..74d5e14a0 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -46,9 +46,6 @@ SOFTWARE.
 
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
 
 #ifndef SCREENINT_H
 #define SCREENINT_H
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index a0e103a4e..ef9358689 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SCREENINTSTRUCT_H
 #define SCREENINTSTRUCT_H
 
diff --git a/include/selection.h b/include/selection.h
index fa6abca65..9e6edfbd9 100644
--- a/include/selection.h
+++ b/include/selection.h
@@ -1,7 +1,4 @@
 /* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
 
 #ifndef SELECTION_H
 #define SELECTION_H 1
diff --git a/include/servermd.h b/include/servermd.h
index 73f339b99..99b8c4c6e 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -48,10 +48,6 @@ SOFTWARE.
 /* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */
 /* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SERVERMD_H
 #define SERVERMD_H 1
 
diff --git a/include/site.h b/include/site.h
index 5b0c69381..be8c003da 100644
--- a/include/site.h
+++ b/include/site.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SITE_H
 #define SITE_H
 /*
diff --git a/include/swaprep.h b/include/swaprep.h
index cd04164be..2c026c659 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SWAPREP_H
 #define SWAPREP_H 1
 
diff --git a/include/swapreq.h b/include/swapreq.h
index b8455086d..9c59bbf84 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -24,10 +24,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef SWAPREQ_H
 #define SWAPREQ_H 1
 
diff --git a/include/validate.h b/include/validate.h
index 7d30b94a9..467533d22 100644
--- a/include/validate.h
+++ b/include/validate.h
@@ -26,10 +26,6 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef VALIDATE_H
 #define VALIDATE_H
 
diff --git a/include/window.h b/include/window.h
index e22e571e5..7c3fce092 100644
--- a/include/window.h
+++ b/include/window.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86$ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef WINDOW_H
 #define WINDOW_H
 
diff --git a/include/windowstr.h b/include/windowstr.h
index 8e4b4e096..89e3ee10b 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -47,10 +47,6 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #ifndef WINDOWSTRUCT_H
 #define WINDOWSTRUCT_H