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.

15 files changed, 58 insertions, 58 deletions

diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c
index 5c2c062b3..077a95a6e 100644
--- a/lbx/lbxcmap.c
+++ b/lbx/lbxcmap.c
@@ -30,9 +30,9 @@ from The Open Group.
 #include <sys/types.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "Xos.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -41,9 +41,9 @@ from The Open Group.
 #include "colormapst.h"
 #include "propertyst.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "lbxserve.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #include <stdio.h>
 
 static int lbxScreenPrivIndex;		/* lbx screen private index */
diff --git a/lbx/lbxdata.h b/lbx/lbxdata.h
index d5240f7ea..8b5343bfd 100644
--- a/lbx/lbxdata.h
+++ b/lbx/lbxdata.h
@@ -25,10 +25,10 @@
 #ifndef _LBXDATA_H_
 #define _LBXDATA_H_
 #define NEED_REPLIES
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "dixfontstr.h"
 
 extern int  lbx_font_private;
diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c
index c392e6415..ac1d7bc8d 100644
--- a/lbx/lbxdix.c
+++ b/lbx/lbxdix.c
@@ -54,8 +54,8 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -68,13 +68,13 @@ in this Software without prior written authorization from The Open Group.
 #include "windowstr.h"
 #include "propertyst.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "lbxserve.h"
 #include "lbxtags.h"
 #include "lbxdata.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #ifdef XAPPGROUP
-#include "Xagsrv.h"
+#include <X11/extensions/Xagsrv.h>
 #endif
 #include "swaprep.h"
 
diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c
index 7ae70ebde..433482f4f 100644
--- a/lbx/lbxexts.c
+++ b/lbx/lbxexts.c
@@ -23,18 +23,18 @@
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "colormapst.h"
 #include "propertyst.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "lbxserve.h"
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "extensions/security.h"
+#include <X11/extensions/security.h>
 #endif
 
 typedef struct _lbxext {
diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c
index 5a468ecbf..8da2fd4eb 100644
--- a/lbx/lbxgfx.c
+++ b/lbx/lbxgfx.c
@@ -29,8 +29,8 @@
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -39,11 +39,11 @@
 #include "windowstr.h"
 #include "scrnintstr.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "lbxserve.h"
 #include "lbxtags.h"
-#include "Xfuncproto.h"
-#include "lbximage.h"
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/lbximage.h>
 #include "lbxsrvopts.h"
 
 #define DrawableCache(client)	(LbxClient(client)->drawableCache)
diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c
index 443bb0414..ac2de78f2 100644
--- a/lbx/lbxmain.c
+++ b/lbx/lbxmain.c
@@ -50,9 +50,9 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/types.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "Xos.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -64,13 +64,13 @@ in this Software without prior written authorization from The Open Group.
 #include "extnsionst.h"
 #include "servermd.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
-#include "lbxdeltastr.h"
+#include <X11/extensions/lbxstr.h>
+#include <X11/extensions/lbxdeltastr.h>
 #include "lbxserve.h"
-#include "lbximage.h"
+#include <X11/extensions/lbximage.h>
 #include "lbxsrvopts.h"
 #include "lbxtags.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #include <errno.h>
 #ifndef Lynx
 #include <sys/uio.h>
diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c
index fdef2db7c..abaf2f395 100644
--- a/lbx/lbxopts.c
+++ b/lbx/lbxopts.c
@@ -26,18 +26,18 @@
 #ifdef OPTDEBUG
 #include <stdio.h>
 #endif
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "colormapst.h"
 #include "propertyst.h"
 #include "lbxserve.h"
-#include "lbxstr.h"
-#include "lbximage.h"
-#include "lbxopts.h"
+#include <X11/extensions/lbxstr.h>
+#include <X11/extensions/lbximage.h>
+#include <X11/extensions/lbxopts.h>
 #include "lbxsrvopts.h"
 #ifndef NO_ZLIB
-#include "lbxzlib.h"
+#include <X11/extensions/lbxzlib.h>
 #endif /* NO_ZLIB */
 
 static int LbxProxyDeltaOpt ( LbxNegOptsPtr pno, unsigned char *popt, 
diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c
index 9082250d6..cdf48f586 100644
--- a/lbx/lbxprop.c
+++ b/lbx/lbxprop.c
@@ -54,8 +54,8 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -65,13 +65,13 @@ in this Software without prior written authorization from The Open Group.
 #include "colormapst.h"
 #include "windowstr.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "lbxserve.h"
 #include "lbxtags.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "extensions/security.h"
+#include <X11/extensions/security.h>
 #endif
 #include "swaprep.h"
 
diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h
index eeff64804..ed82f5aee 100644
--- a/lbx/lbxserve.h
+++ b/lbx/lbxserve.h
@@ -54,9 +54,9 @@ in this Software without prior written authorization from The Open Group.
 
 #define _LBXSERVE_H_
 #define _XLBX_SERVER_
-#include "lbxstr.h"
-#include "lbxdeltastr.h"
-#include "lbxopts.h"
+#include <X11/extensions/lbxstr.h>
+#include <X11/extensions/lbxdeltastr.h>
+#include <X11/extensions/lbxopts.h>
 
 #define MAX_LBX_CLIENTS	MAXCLIENTS
 #define	MAX_NUM_PROXIES	(MAXCLIENTS >> 1)
diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c
index f3dc13163..b27b4a5fb 100644
--- a/lbx/lbxsquish.c
+++ b/lbx/lbxsquish.c
@@ -49,15 +49,15 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "Xos.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
 #include "misc.h"
 #include "colormapst.h"
 #include "propertyst.h"
 #include "lbxserve.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 
 /* handles server-side protocol squishing */
 
diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h
index ea7f2420e..8b0420452 100644
--- a/lbx/lbxsrvopts.h
+++ b/lbx/lbxsrvopts.h
@@ -26,7 +26,7 @@
 #ifndef _LBX_SRVOPTS_H_
 #define _LBX_SRVOPTS_H_
 
-#include "lbxopts.h"
+#include <X11/extensions/lbxopts.h>
 
 typedef struct _LbxNegOpts {
     int		nopts;
diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c
index 23fdd30f7..474d12f71 100644
--- a/lbx/lbxswap.c
+++ b/lbx/lbxswap.c
@@ -50,9 +50,9 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/types.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "Xos.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -62,9 +62,9 @@ in this Software without prior written authorization from The Open Group.
 #include "swaprep.h"
 #include "propertyst.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "lbxserve.h"
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 #include <stdio.h>
 
diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c
index 6fdc4d5a2..0c98731fe 100644
--- a/lbx/lbxtags.c
+++ b/lbx/lbxtags.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "lbxdata.h"
 #include "resource.h"
@@ -56,7 +56,7 @@ in this Software without prior written authorization from The Open Group.
 #include "propertyst.h"
 #include "lbxtags.h"
 #define _XLBX_SERVER_
-#include "lbxstr.h"
+#include <X11/extensions/lbxstr.h>
 #include "propertyst.h"
 
 static RESTYPE TagResType;
diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h
index 376a4cc27..aef093448 100644
--- a/lbx/lbxtags.h
+++ b/lbx/lbxtags.h
@@ -55,8 +55,8 @@ in this Software without prior written authorization from The Open Group.
 #include	"os.h"
 #include	"opaque.h"
 #include	"resource.h"
-#include	"X.h"
-#include	"Xproto.h"
+#include	<X11/X.h>
+#include	<X11/Xproto.h>
 
 typedef struct _tagdata {
     XID         tid;
diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c
index 20d58b37b..7ca126c25 100644
--- a/lbx/lbxzerorep.c
+++ b/lbx/lbxzerorep.c
@@ -36,7 +36,7 @@ from The Open Group.
  */
 
 #define NEED_REPLIES
-#include "X.h"
+#include <X11/X.h>
 #include <X11/Xproto.h>
 
 void