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>.

miext/rootless/accel/rlAccel.c

@@ -35,6 +35,10 @@
  * underneath this layer besides fb will get called.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "rootless.h"
 #include "rlAccel.h"
 

miext/rootless/accel/rlAccel.h

@@ -28,6 +28,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 
 /*

miext/rootless/accel/rlBlt.c

@@ -28,6 +28,10 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 #include "rootlessCommon.h"
 #include "rlAccel.h"

miext/rootless/accel/rlCopy.c

@@ -24,6 +24,10 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 #include "rlAccel.h"
 

miext/rootless/accel/rlFill.c

@@ -24,6 +24,10 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 #include "rlAccel.h"
 

miext/rootless/accel/rlFillRect.c

@@ -24,6 +24,10 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 #include "rlAccel.h"
 

miext/rootless/accel/rlFillSpans.c

@@ -24,6 +24,10 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 #include "rlAccel.h"
 

miext/rootless/accel/rlGlyph.c

@@ -24,8 +24,12 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "rlAccel.h"
 

miext/rootless/accel/rlSolid.c

@@ -28,6 +28,10 @@
  */
 /* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "fb.h"
 #include "rootlessCommon.h"
 

miext/rootless/rootless.h

@@ -29,6 +29,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.7 2004/07/02 01:30:33 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _ROOTLESS_H
 #define _ROOTLESS_H
 

miext/rootless/rootlessCommon.c

@@ -30,6 +30,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.6 2004/07/02 01:30:33 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "rootlessCommon.h"
 
 unsigned int rootless_CopyBytes_threshold = 0;

miext/rootless/rootlessCommon.h

@@ -29,6 +29,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.5 2004/07/02 01:30:33 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _ROOTLESSCOMMON_H
 #define _ROOTLESSCOMMON_H
 

miext/rootless/rootlessConfig.h

@@ -28,6 +28,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _ROOTLESSCONFIG_H
 #define _ROOTLESSCONFIG_H
 

miext/rootless/rootlessGC.c

@@ -30,6 +30,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "mi.h"
 #include "scrnintstr.h"
 #include "gcstruct.h"

miext/rootless/rootlessScreen.c

@@ -31,6 +31,10 @@
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */
 
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "mi.h"
 #include "scrnintstr.h"
 #include "gcstruct.h"

miext/rootless/rootlessValTree.c

@@ -90,6 +90,10 @@ 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"
 #include    "validate.h"

miext/rootless/rootlessWindow.c

@@ -31,6 +31,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.12 2004/07/02 01:30:33 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "rootlessCommon.h"
 #include "rootlessWindow.h"
 

miext/rootless/rootlessWindow.h

@@ -28,6 +28,10 @@
  */
 /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _ROOTLESSWINDOW_H
 #define _ROOTLESSWINDOW_H