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.

18 files changed, 26 insertions, 26 deletions

diff --git a/Xprint/Init.c b/Xprint/Init.c
index 3bfc62ee8..6ebc220dd 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -65,9 +65,9 @@ copyright holders.
 #include <sys/sysmacros.h>
 #endif
 
-#include "X.h"
+#include <X11/X.h>
 #define NEED_EVENTS 1
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include <servermd.h>
 
 #include "screenint.h"
diff --git a/Xprint/Oid.h b/Xprint/Oid.h
index 70bd8d3e5..40bf79d07 100644
--- a/Xprint/Oid.h
+++ b/Xprint/Oid.h
@@ -34,7 +34,7 @@ copyright holders.
 #ifndef _Xp_Oid_h
 #define _Xp_Oid_h
 
-#include <Xproto.h>
+#include <X11/Xproto.h>
 
 /*
  * include the auto-generated XpOid enum definition
diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c
index 983e5c1c4..4b5aba2a8 100644
--- a/Xprint/ValTree.c
+++ b/Xprint/ValTree.c
@@ -32,7 +32,7 @@ copyright holders.
 */
 /* $XFree86$ */
 
-#include    "X.h"
+#include    <X11/X.h>
 #include    "scrnintstr.h"
 #include    "validate.h"
 #include    "windowstr.h"
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 5abc5f5d7..b015d648d 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -45,7 +45,7 @@ copyright holders.
 ** 
 ********************************************************************/
 
-#include <Xproto.h>
+#include <X11/Xproto.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/wait.h>
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 6214c4ae5..2bbdde3ae 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -31,9 +31,9 @@ dealings in this Software without prior written authorization from said
 copyright holders.
 */
 
-#include "X.h"
-#include "Xos.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xos.h>
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "servermd.h"
 #include "DiPrint.h"
@@ -283,8 +283,8 @@ ddxProcessArgument (
 
 #ifdef XINPUT
 
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 
 extern  int     BadDevice;
diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c
index 12482b281..ea5000451 100644
--- a/Xprint/mediaSizes.c
+++ b/Xprint/mediaSizes.c
@@ -55,7 +55,7 @@ copyright holders.
 #include <string.h>
 #include <locale.h>
 
-#include "X.h"
+#include <X11/X.h>
 #include "dixstruct.h"
 #include "screenint.h"
 #include "misc.h"
diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c
index f48ece041..3d0a731ac 100644
--- a/Xprint/pcl/PclInit.c
+++ b/Xprint/pcl/PclInit.c
@@ -86,7 +86,7 @@ copyright holders.
 #include "Pcl.h"
 
 #include "cfb.h"
-#include "Xos.h"	/* for unlink() */
+#include <X11/Xos.h>	/* for unlink() */
 
 #include "attributes.h"
 #include "DiPrint.h"
diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c
index 63caa0fe5..9405a4e78 100644
--- a/Xprint/pcl/PclMisc.c
+++ b/Xprint/pcl/PclMisc.c
@@ -50,7 +50,7 @@ copyright holders.
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
+#include <X11/Xos.h>	/* for SIGCLD on pre-POSIX systems */
 #include "Pcl.h"
 
 #include "cursor.h"
diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c
index 70c788eac..663086266 100644
--- a/Xprint/pcl/PclPrint.c
+++ b/Xprint/pcl/PclPrint.c
@@ -54,7 +54,7 @@ copyright holders.
 #include <X11/Xprotostr.h>
 
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
 
 #include "Pcl.h"
diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c
index 9ef4c505f..a7f37be56 100644
--- a/Xprint/pcl/PclText.c
+++ b/Xprint/pcl/PclText.c
@@ -54,7 +54,7 @@ copyright holders.
 
 #include "Pcl.h"
 #include "migc.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 
 #include "PclSFonts.h"
 
diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c
index 86d862ce1..a4c585f0d 100644
--- a/Xprint/ps/PsMisc.c
+++ b/Xprint/ps/PsMisc.c
@@ -74,7 +74,7 @@ in this Software without prior written authorization from The Open Group.
 ** 
 ********************************************************************/
 
-#include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
+#include <X11/Xos.h>	/* for SIGCLD on pre-POSIX systems */
 #include <stdio.h>
 #include "Ps.h"
 
diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c
index f0356d705..721e430ae 100644
--- a/Xprint/ps/PsPrint.c
+++ b/Xprint/ps/PsPrint.c
@@ -84,7 +84,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xprotostr.h>
 
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
 
 #include "Ps.h"
diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c
index 914e2e57b..9db8d49ec 100644
--- a/Xprint/ps/psout_ft.c
+++ b/Xprint/ps/psout_ft.c
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include FT_FREETYPE_H
 #include FT_TYPE1_TABLES_H
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "font.h"
 #include "fontstruct.h"
 #include "fntfilst.h"
diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c
index a9b0cfe86..1d2f49ac7 100644
--- a/Xprint/ps/psout_ftpstype1.c
+++ b/Xprint/ps/psout_ftpstype1.c
@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "font.h"
 #include "fontstruct.h"
 #include "fntfilst.h"
diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c
index bceb1d479..74494ab9a 100644
--- a/Xprint/ps/psout_ftpstype3.c
+++ b/Xprint/ps/psout_ftpstype3.c
@@ -58,7 +58,7 @@ THE SOFTWARE.
 #include FT_INTERNAL_OBJECTS_H
 #endif /* USE_FT_INTERNALS */
 
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "font.h"
 #include "fontstruct.h"
 #include "fntfilst.h"
diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c
index c8dfad1e3..2d16e3791 100644
--- a/Xprint/raster/Raster.c
+++ b/Xprint/raster/Raster.c
@@ -56,12 +56,12 @@ copyright holders.
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "X.h"
-#include "Xos.h"	/* for SIGCLD on pre-POSIX systems */
+#include <X11/X.h>
+#include <X11/Xos.h>	/* for SIGCLD on pre-POSIX systems */
 #define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef NEED_EVENTS
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "scrnintstr.h"
diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h
index 9b335743f..4819dcb8b 100644
--- a/Xprint/raster/Raster.h
+++ b/Xprint/raster/Raster.h
@@ -58,7 +58,7 @@ typedef char *XPointer;
 #define True 1
 #define False 0
 #include "misc.h"
-#include <Xfuncproto.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xresource.h>
 #include "attributes.h"
 
diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c
index 4527ba8db..86ab1d41b 100644
--- a/Xprint/raster/RasterAttVal.c
+++ b/Xprint/raster/RasterAttVal.c
@@ -33,7 +33,7 @@ copyright holders.
 /* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "scrnintstr.h"