Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.

Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.

44 files changed, 179 insertions, 3 deletions

diff --git a/include/XIstubs.h b/include/XIstubs.h
index e005493c4..940604887 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -24,6 +24,10 @@ 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 098abcd86..22dd02828 100644
--- a/include/bstore.h
+++ b/include/bstore.h
@@ -15,6 +15,10 @@
  * -- 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 8f21855c4..8452396d0 100644
--- a/include/bstorestr.h
+++ b/include/bstorestr.h
@@ -15,6 +15,10 @@
  * -- 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 0102a737f..3ef8de48f 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -29,6 +29,10 @@ 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 d80388bf4..b8f21f9d7 100644
--- a/include/closure.h
+++ b/include/closure.h
@@ -45,6 +45,10 @@ 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 1f2c33075..baf3dcdb5 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -47,6 +47,10 @@ 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 b176f7dc3..519ead1f0 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -45,6 +45,10 @@ 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 5f9467a2b..dc776bb1a 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -47,6 +47,10 @@ 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 c877d6cc9..b4ce35c6e 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -47,6 +47,10 @@ 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 1b8fc4265..1ad1cbc8a 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -47,6 +47,10 @@ 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 46a5faef0..96ae17149 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -24,6 +24,10 @@ 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 d3bb69b0a..1d249b302 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -23,13 +23,17 @@ 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
 
 #include "dix.h"
-#include "font.h"
+#include <X11/fonts/font.h>
 #include "closure.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 
 #define NullDIXFontProp ((DIXFontPropPtr)0)
 
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index 757b8bbc4..ba696c56f 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -22,12 +22,16 @@ SOFTWARE.
 
 ******************************************************************/
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef DIXFONTSTRUCT_H
 #define DIXFONTSTRUCT_H
 
 #include "servermd.h"
 #include "dixfont.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "closure.h"
 #define NEED_REPLIES
 #include <X11/Xproto.h> /* for xQueryFontReply */
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 042e063db..cb07c6d11 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -24,6 +24,10 @@ 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 d7d810272..5c1281ab2 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -23,6 +23,10 @@ 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 91c7acb6b..fdd253c85 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -28,6 +28,10 @@ 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 34750173b..7d4e4accb 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -47,6 +47,10 @@ 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 37fa9a245..3dcf179e1 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -28,6 +28,10 @@ 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 5ed009958..f830d03e2 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -47,6 +47,10 @@ 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 77c2f20c6..b4a3b3af2 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -47,6 +47,10 @@ 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 c2226ba17..a8f2ad0be 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -49,6 +49,10 @@ 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 924608e89..775409183 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,6 +1,10 @@
 /* $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 97adf6fb3..8cda1964b 100644
--- a/include/input.h
+++ b/include/input.h
@@ -47,6 +47,10 @@ 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 b54e8a1d5..9d0bf4057 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -48,6 +48,10 @@ 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 0ba871bc0..ec90dfb29 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -47,6 +47,10 @@ 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 09a3570f9..8d7408f8a 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -28,6 +28,10 @@ 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 1777b2407..dc0655ffc 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -47,6 +47,10 @@ 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 22a1f1025..465e7bcb7 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -47,6 +47,10 @@ 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 21a38d51c..6b8988112 100644
--- a/include/property.h
+++ b/include/property.h
@@ -47,6 +47,10 @@ 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 24eed070e..57759933d 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -47,6 +47,10 @@ 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 <X11/misc.h>
diff --git a/include/region.h b/include/region.h
index 64f0ff444..0c67fe9ee 100644
--- a/include/region.h
+++ b/include/region.h
@@ -45,6 +45,10 @@ 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 0af87bde8..dfee705a9 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -48,6 +48,10 @@ 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 ebd32e359..e896bf076 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -47,6 +47,10 @@ 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 <X11/misc.h>
diff --git a/include/rgb.h b/include/rgb.h
index 5741a4efa..45f44d738 100644
--- a/include/rgb.h
+++ b/include/rgb.h
@@ -46,6 +46,10 @@ 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 aaa8086fb..edd875e94 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -46,6 +46,10 @@ 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 ef9358689..a0e103a4e 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -47,6 +47,10 @@ 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 520cfd4aa..fa6abca65 100644
--- a/include/selection.h
+++ b/include/selection.h
@@ -1,4 +1,8 @@
 /* $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 66fe14034..e21eecf8c 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -48,6 +48,10 @@ 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 be8c003da..5b0c69381 100644
--- a/include/site.h
+++ b/include/site.h
@@ -47,6 +47,10 @@ 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 2c026c659..cd04164be 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -24,6 +24,10 @@ 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 9c59bbf84..b8455086d 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -24,6 +24,10 @@ 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 467533d22..7d30b94a9 100644
--- a/include/validate.h
+++ b/include/validate.h
@@ -26,6 +26,10 @@ 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 2ffcab370..1265727d5 100644
--- a/include/window.h
+++ b/include/window.h
@@ -47,6 +47,10 @@ 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 89e3ee10b..8e4b4e096 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -47,6 +47,10 @@ 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