Fix includes right throughout the Xserver tree:

change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.

32 files changed, 69 insertions, 69 deletions

diff --git a/mi/mi.h b/mi/mi.h
index cbb158121..5d284cab1 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -49,7 +49,7 @@ SOFTWARE.
 
 #ifndef MI_H
 #define MI_H
-#include "X11/X.h"
+#include <X11/X.h>
 #include "region.h"
 #include "validate.h"
 #include "window.h"
diff --git a/mi/miarc.c b/mi/miarc.c
index 1c37551e3..ee2a03840 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.1.4.3 2003/12/20 00:28:31 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miarc.c,v 1.2 2004/04/23 19:54:26 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
 /***********************************************************
 
@@ -58,8 +58,8 @@ SOFTWARE.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "misc.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
@@ -68,7 +68,7 @@ SOFTWARE.
 #include "mifpoly.h"
 #include "mi.h"
 #include "mifillarc.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 static double miDsin(double a);
 static double miDcos(double a);
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index 452727455..5d3a9da70 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -48,8 +48,8 @@ SOFTWARE.
 /* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */
 /* Author: Todd Newman  (aided and abetted by Mr. Drewry) */
 
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 
 #include "misc.h"
 #include "gcstruct.h"
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "mi.h"
 #include "regionstr.h"
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "servermd.h"
 
 #ifndef HAS_FFS
diff --git a/mi/mibstore.c b/mi/mibstore.c
index 1cd35c4dd..aae3bcfa9 100644
--- a/mi/mibstore.c
+++ b/mi/mibstore.c
@@ -45,9 +45,9 @@ implied warranty.
 /* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */
 
 #define NEED_EVENTS
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "regionstr.h"
 #include "scrnintstr.h"
diff --git a/mi/miclipn.c b/mi/miclipn.c
index 456ad08c4..e9f43ab2a 100644
--- a/mi/miclipn.c
+++ b/mi/miclipn.c
@@ -28,7 +28,7 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "windowstr.h"
 #include "scrnintstr.h"
 #include "mi.h"
diff --git a/mi/micmap.c b/mi/micmap.c
index 2018a093a..1f3c67dae 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -36,8 +36,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "resource.h"
diff --git a/mi/midispcur.c b/mi/midispcur.c
index 08c9f9216..2c3cfced4 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */
 
 #define NEED_EVENTS
-# include   "X.h"
+# include   <X11/X.h>
 # include   "misc.h"
 # include   "input.h"
 # include   "cursorstr.h"
diff --git a/mi/mieq.c b/mi/mieq.c
index 1c13c6004..37662625e 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group.
  */
 
 # define NEED_EVENTS
-# include   "X.h"
-# include   "Xmd.h"
-# include   "Xproto.h"
+# include   <X11/X.h>
+# include   <X11/Xmd.h>
+# include   <X11/Xproto.h>
 # include   "misc.h"
 # include   "windowstr.h"
 # include   "pixmapstr.h"
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 897c680b3..6ff2afd36 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.2 2004/04/23 19:54:26 eich Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */
 /***********************************************************
 
@@ -76,10 +76,10 @@ Equipment Corporation.
 
 /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS
-#include "Xproto.h"
-#include "Xprotostr.h"
+#include <X11/Xproto.h>
+#include <X11/Xprotostr.h>
 
 #include "misc.h"
 #include "regionstr.h"
@@ -91,7 +91,7 @@ Equipment Corporation.
 
 #include "dixstruct.h"
 #include "mi.h"
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 #include "globals.h"
 
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index c8b901c85..d49ae1d92 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -30,8 +30,8 @@ Author:  Bob Scheifler, MIT X Consortium
 /* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
 #include <math.h>
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
index 31219869e..d74aa2466 100644
--- a/mi/mifillrct.c
+++ b/mi/mifillrct.c
@@ -47,8 +47,8 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */
 
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmap.h"
diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c
index ae41cf6f6..d659c7967 100644
--- a/mi/mifpolycon.c
+++ b/mi/mifpolycon.c
@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
 #include <math.h>
-#include "X.h"
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
diff --git a/mi/miglblt.c b/mi/miglblt.c
index f2a748db6..b1ae60250 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -48,9 +48,9 @@ SOFTWARE.
 
 /* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
 
-#include	"X.h"
-#include	"Xmd.h"
-#include	"Xproto.h"
+#include	<X11/X.h>
+#include	<X11/Xmd.h>
+#include	<X11/Xproto.h>
 #include	"misc.h"
 #include	"fontstruct.h"
 #include	"dixfontstr.h"
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 06ed7ad29..4cfc818b1 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.15 2004/12/08 05:48:16 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.16 2005/03/19 20:51:34 gisburn Exp $ */
 /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
 /***********************************************************
 
@@ -214,38 +214,38 @@ typedef void (*InitExtension)(INITARGS);
 
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include "shmstr.h"
+#include <X11/extensions/shmstr.h>
 #endif
 #ifdef XTEST
 #define _XTEST_SERVER_
-#include "XTest.h"
+#include <X11/extensions/XTest.h>
 #endif
 #ifdef XKB
-#include "XKB.h"
+#include <X11/extensions/XKB.h>
 #endif
 #ifdef LBX
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #endif
 #ifdef XPRINT
 #include "Print.h"
 #endif
 #ifdef XAPPGROUP
 #define _XAG_SERVER_
-#include "Xagstr.h"
+#include <X11/extensions/Xagstr.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "securstr.h"
+#include <X11/extensions/securstr.h>
 #endif
 #ifdef PANORAMIX
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #endif
 #ifdef XF86BIGFONT
 #include "xf86bigfstr.h"
 #endif
 #ifdef RES
-#include "XResproto.h"
+#include <X11/extensions/XResproto.h>
 #endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 74cd18022..dfdfdecd7 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "validate.h"
 #include "windowstr.h"
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 2e4ee607b..85474f692 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -31,9 +31,9 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */
 
 # define NEED_EVENTS
-# include   "X.h"
-# include   "Xmd.h"
-# include   "Xproto.h"
+# include   <X11/X.h>
+# include   <X11/Xmd.h>
+# include   <X11/Xproto.h>
 # include   "misc.h"
 # include   "windowstr.h"
 # include   "pixmapstr.h"
diff --git a/mi/mipoly.c b/mi/mipoly.c
index 2c420b250..138552d14 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -56,7 +56,7 @@ SOFTWARE.
  *  to the appropriate routine to actually scan convert the
  *  polygon.
  */
-#include "X.h"
+#include <X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/mi/mipolygen.c b/mi/mipolygen.c
index 484a29798..d63dfaec2 100644
--- a/mi/mipolygen.c
+++ b/mi/mipolygen.c
@@ -46,7 +46,7 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "miscanfill.h"
 #include "mipoly.h"
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index f88545cfd..eec246df5 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -46,8 +46,8 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "pixmapstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index 07964cf82..6976f7d3c 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -46,8 +46,8 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"
diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c
index fe4993914..bb9259450 100644
--- a/mi/mipolyseg.c
+++ b/mi/mipolyseg.c
@@ -46,8 +46,8 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmap.h"
diff --git a/mi/mipolytext.c b/mi/mipolytext.c
index a3f64a086..d36fbd22a 100644
--- a/mi/mipolytext.c
+++ b/mi/mipolytext.c
@@ -55,9 +55,9 @@ SOFTWARE.
  * Date:	Thu Feb  5 1987
  */
 
-#include	"X.h"
-#include	"Xmd.h"
-#include	"Xproto.h"
+#include	<X11/X.h>
+#include	<X11/Xmd.h>
+#include	<X11/Xproto.h>
 #include	"misc.h"
 #include	"gcstruct.h"
 #include	"fontstruct.h"
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index 019ba437e..49409a247 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -46,7 +46,7 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
-#include "X.h"
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/mi/miregion.c b/mi/miregion.c
index 2057deb62..ddb59fc2d 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -78,7 +78,7 @@ Equipment Corporation.
 ******************************************************************/
 
 #include "regionstr.h"
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 #include "gc.h"
 #include "mi.h"
 #include "mispans.h"
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 7f8ee48ad..ecf934d54 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -28,7 +28,7 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "servermd.h"
 #include "misc.h"
 #include "mi.h"
@@ -38,7 +38,7 @@ from The Open Group.
 #include "miline.h"
 #ifdef MITSHM
 #define _XSHM_SERVER_
-#include "XShm.h"
+#include <X11/extensions/XShm.h>
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to
diff --git a/mi/misprite.c b/mi/misprite.c
index df19784e0..64fd04eb5 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi Exp $ */
 
-# include   "X.h"
-# include   "Xproto.h"
+# include   <X11/X.h>
+# include   <X11/Xproto.h>
 # include   "misc.h"
 # include   "pixmapstr.h"
 # include   "input.h"
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 6036f6057..415d5a63a 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -1,5 +1,5 @@
 /* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.2.2.1 2004/07/30 06:54:42 anholt Exp $ */
+/* $XdotOrg: xc/programs/Xserver/mi/mivaltree.c,v 1.3 2004/07/31 08:24:14 anholt Exp $ */
 /*
  * mivaltree.c --
  *	Functions for recalculating window clip lists. Main function
@@ -92,7 +92,7 @@ Equipment Corporation.
   *		Bob Scheifler -- avoid miComputeClips for unmapped windows,
   *				 valdata changes
   */
-#include    "X.h"
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 20bef031b..606ccd43a 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -43,7 +43,7 @@ from The Open Group.
 #include <math.h>
 #undef _XOPEN_SOURCE
 #endif
-#include "X.h"
+#include <X11/X.h>
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "regionstr.h"
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 545fb3307..1ebb0cee2 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -46,7 +46,7 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-#include "X.h"
+#include <X11/X.h>
 #include "regionstr.h"
 #include "region.h"
 #include "mi.h"
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index e36b2f3f0..282bf6df8 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -36,8 +36,8 @@ Author:  Bob Scheifler, MIT X Consortium
  */
 
 #include <math.h>
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/mi/mizerclip.c b/mi/mizerclip.c
index 304f525ae..26335dfb5 100644
--- a/mi/mizerclip.c
+++ b/mi/mizerclip.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-#include "X.h"
+#include <X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/mi/mizerline.c b/mi/mizerline.c
index 4672f6bd3..d04780aa2 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -46,7 +46,7 @@ SOFTWARE.
 
 ******************************************************************/
 /* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */
-#include "X.h"
+#include <X11/X.h>
 
 #include "misc.h"
 #include "scrnintstr.h"