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.

31 files changed, 54 insertions, 54 deletions

diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c
index b07216899..b7ec21dfa 100644
--- a/afb/afbbitblt.c
+++ b/afb/afbbitblt.c
@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */
 
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 
 #include "regionstr.h"
 #include "gcstruct.h"
diff --git a/afb/afbblt.c b/afb/afbblt.c
index 13a56e521..11c791921 100644
--- a/afb/afbblt.c
+++ b/afb/afbblt.c
@@ -33,9 +33,9 @@ Author: Keith Packard
 */
 /* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "afb.h"
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/afb/afbbres.c b/afb/afbbres.c
index d09a47485..87b598a42 100644
--- a/afb/afbbres.c
+++ b/afb/afbbres.c
@@ -49,7 +49,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "afb.h"
 #include "maskbits.h"
diff --git a/afb/afbbresd.c b/afb/afbbresd.c
index 0b0d5d6fe..fd8b88c00 100644
--- a/afb/afbbresd.c
+++ b/afb/afbbresd.c
@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "afb.h"
 #include "maskbits.h"
diff --git a/afb/afbbstore.c b/afb/afbbstore.c
index c3e844d57..050177ecf 100644
--- a/afb/afbbstore.c
+++ b/afb/afbbstore.c
@@ -32,7 +32,7 @@ from the X Consortium.
 */
 
 #include	"afb.h"
-#include	"X.h"
+#include	<X11/X.h>
 #include	"mibstore.h"
 #include	"regionstr.h"
 #include	"scrnintstr.h"
diff --git a/afb/afbclip.c b/afb/afbclip.c
index 3930342d9..2d4385806 100644
--- a/afb/afbclip.c
+++ b/afb/afbclip.c
@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
diff --git a/afb/afbcmap.c b/afb/afbcmap.c
index cfa41aab3..c43725aa4 100644
--- a/afb/afbcmap.c
+++ b/afb/afbcmap.c
@@ -29,8 +29,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/afb/afbfillarc.c b/afb/afbfillarc.c
index e13c7948a..60d7d758c 100644
--- a/afb/afbfillarc.c
+++ b/afb/afbfillarc.c
@@ -28,8 +28,8 @@ in this Software without prior written authorization from the X Consortium.
 
 /* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */
 
-#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/afb/afbfillrct.c b/afb/afbfillrct.c
index b5e6802d2..83863a0a7 100644
--- a/afb/afbfillrct.c
+++ b/afb/afbfillrct.c
@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw 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/afb/afbfillsp.c b/afb/afbfillsp.c
index 647641d7d..3af84e6bf 100644
--- a/afb/afbfillsp.c
+++ b/afb/afbfillsp.c
@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "gcstruct.h"
 #include "window.h"
 #include "pixmapstr.h"
diff --git a/afb/afbfont.c b/afb/afbfont.c
index 5df6691c5..8b1c95783 100644
--- a/afb/afbfont.c
+++ b/afb/afbfont.c
@@ -48,9 +48,9 @@ SOFTWARE.
 */
 /* $XConsortium: afbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "afb.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
diff --git a/afb/afbgc.c b/afb/afbgc.c
index 4ce893902..cfd9abdc9 100644
--- a/afb/afbgc.c
+++ b/afb/afbgc.c
@@ -48,9 +48,9 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "afb.h"
 #include "dixfontstr.h"
 #include "fontstruct.h"
diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c
index 26ed5ba60..051544505 100644
--- a/afb/afbgetsp.c
+++ b/afb/afbgetsp.c
@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 
 #include "misc.h"
 #include "region.h"
diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c
index 3578b2892..6f27c2540 100644
--- a/afb/afbhrzvert.c
+++ b/afb/afbhrzvert.c
@@ -49,7 +49,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "gc.h"
 #include "window.h"
diff --git a/afb/afbimage.c b/afb/afbimage.c
index 52553f55a..c5225cf9b 100644
--- a/afb/afbimage.c
+++ b/afb/afbimage.c
@@ -1,6 +1,6 @@
 /* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "windowstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c
index 8f7509df5..3444b4eec 100644
--- a/afb/afbimggblt.c
+++ b/afb/afbimggblt.c
@@ -49,9 +49,9 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */
 
-#include		"X.h"
-#include		"Xmd.h"
-#include		"Xproto.h"
+#include		<X11/X.h>
+#include		<X11/Xmd.h>
+#include		<X11/Xproto.h>
 #include		"afb.h"
 #include		"fontstruct.h"
 #include		"dixfontstr.h"
diff --git a/afb/afbline.c b/afb/afbline.c
index 9e9065705..6d59ee3b6 100644
--- a/afb/afbline.c
+++ b/afb/afbline.c
@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/afb/afbmisc.c b/afb/afbmisc.c
index 4928a84d3..31d3a6a75 100644
--- a/afb/afbmisc.c
+++ b/afb/afbmisc.c
@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "cursor.h"
 #include "scrnintstr.h"
diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
index 23b51d539..3d1245125 100644
--- a/afb/afbpixmap.c
+++ b/afb/afbpixmap.c
@@ -54,7 +54,7 @@ SOFTWARE.
    on a monchrome device, a pixmap is a bitmap.
 */
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "maskbits.h"
diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c
index 3156b0617..d1c714753 100644
--- a/afb/afbply1rct.c
+++ b/afb/afbply1rct.c
@@ -28,7 +28,7 @@ in this Software without prior written authorization from the X Consortium.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "gcstruct.h"
 #include "windowstr.h"
diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c
index 26d87868a..774f83799 100644
--- a/afb/afbplygblt.c
+++ b/afb/afbplygblt.c
@@ -49,9 +49,9 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */
 
-#include		"X.h"
-#include		"Xmd.h"
-#include		"Xproto.h"
+#include		<X11/X.h>
+#include		<X11/Xmd.h>
+#include		<X11/Xproto.h>
 #include		"afb.h"
 #include		"fontstruct.h"
 #include		"dixfontstr.h"
diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c
index c552b388a..ab3031b92 100644
--- a/afb/afbpntarea.c
+++ b/afb/afbpntarea.c
@@ -49,7 +49,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "windowstr.h"
 #include "regionstr.h"
diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
index bb84e676a..ee652b244 100644
--- a/afb/afbpntwin.c
+++ b/afb/afbpntwin.c
@@ -49,7 +49,7 @@ SOFTWARE.
 
 ******************************************************************/
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "windowstr.h"
 #include "regionstr.h"
diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c
index f1ff5bb41..8ae40e091 100644
--- a/afb/afbpolypnt.c
+++ b/afb/afbpolypnt.c
@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw 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/afb/afbpushpxl.c b/afb/afbpushpxl.c
index 026d09c21..c8b123b95 100644
--- a/afb/afbpushpxl.c
+++ b/afb/afbpushpxl.c
@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c
index d947825e2..6e82c9d60 100644
--- a/afb/afbscrinit.c
+++ b/afb/afbscrinit.c
@@ -48,9 +48,9 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */
 
-#include "X.h"
-#include "Xproto.h"		/* for xColorItem */
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>		/* for xColorItem */
+#include <X11/Xmd.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "windowstr.h"
diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c
index a4ea4d3ac..0410606f3 100644
--- a/afb/afbsetsp.c
+++ b/afb/afbsetsp.c
@@ -49,8 +49,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */
 
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 
 #include "misc.h"
 #include "regionstr.h"
diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c
index a544f9aa9..5159cda8f 100644
--- a/afb/afbtegblt.c
+++ b/afb/afbtegblt.c
@@ -49,9 +49,9 @@ SOFTWARE.
 
 ******************************************************************/
 
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "afb.h"
 #include "fontstruct.h"
 #include "dixfontstr.h"
diff --git a/afb/afbtile.c b/afb/afbtile.c
index b4376d18c..3dc543dbe 100644
--- a/afb/afbtile.c
+++ b/afb/afbtile.c
@@ -49,7 +49,7 @@ SOFTWARE.
 ******************************************************************/
 /* $XConsortium: afbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 
 #include "windowstr.h"
 #include "regionstr.h"
diff --git a/afb/afbwindow.c b/afb/afbwindow.c
index b6037d8cb..678c8f1b9 100644
--- a/afb/afbwindow.c
+++ b/afb/afbwindow.c
@@ -49,7 +49,7 @@ SOFTWARE.
 
 ******************************************************************/
 
-#include "X.h"
+#include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "afb.h"
diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c
index ae9136f70..645ac8f4c 100644
--- a/afb/afbzerarc.c
+++ b/afb/afbzerarc.c
@@ -34,8 +34,8 @@ in this Software without prior written authorization from the X Consortium.
  * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289
  */
 
-#include "X.h"
-#include "Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xprotostr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"