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.

17 files changed, 52 insertions, 52 deletions

diff --git a/os/WaitFor.c b/os/WaitFor.c
index fe4b81ce7..a4b95cba2 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -59,10 +59,10 @@ SOFTWARE.
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
-#include "Xos.h"			/* for strings, fcntl, time */
+#include <X11/Xos.h>			/* for strings, fcntl, time */
 #include <errno.h>
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 
 #ifdef __UNIXOS2__
@@ -111,7 +111,7 @@ mffs(fd_mask mask)
 
 #ifdef DPMSExtension
 #define DPMS_SERVER
-#include "dpms.h"
+#include <X11/extensions/dpms.h>
 #endif
 
 #ifdef XTESTEXT1
diff --git a/os/access.c b/os/access.c
index d687e3515..727fa26f0 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1,5 +1,5 @@
 /* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.6 2004/10/17 10:46:14 herrb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.7 2004/11/15 15:06:50 ago Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -63,10 +63,10 @@ SOFTWARE.
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <X11/Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
 #include <X11/Xauth.h>
-#include <X.h>
-#include <Xproto.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "site.h"
 #include <errno.h>
@@ -197,7 +197,7 @@ SOFTWARE.
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "extensions/security.h"
+#include <X11/extensions/security.h>
 #endif
 
 #ifndef PATH_MAX
diff --git a/os/auth.c b/os/auth.c
index 40f34ffff..c186ea848 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -45,7 +45,7 @@ from The Open Group.
 # include   <sys/stat.h>
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-# include   "extensions/security.h"
+# include   <X11/extensions/security.h>
 #endif
 #ifdef WIN32
 #include "Xw32defs.h"
diff --git a/os/connection.c b/os/connection.c
index 3ec64c099..81134a840 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -66,9 +66,9 @@ SOFTWARE.
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
-#include "X.h"
-#include "Xproto.h"
-#include <X11/Xtrans.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xtrans/Xtrans.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
@@ -141,11 +141,11 @@ extern __const__ int _nfiles;
 #include "opaque.h"
 #include "dixstruct.h"
 #ifdef XAPPGROUP
-#include "extensions/Xagsrv.h"
+#include <X11/extensions/Xagsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "extensions/security.h"
+#include <X11/extensions/security.h>
 #endif
 #ifdef LBX
 #include "colormapst.h"
diff --git a/os/io.c b/os/io.c
index 1da494254..5fa95962f 100644
--- a/os/io.c
+++ b/os/io.c
@@ -62,8 +62,8 @@ SOFTWARE.
 #include <X11/Xwinsock.h>
 #endif
 #include <stdio.h>
-#include <X11/Xtrans.h>
-#include "Xmd.h"
+#include <X11/Xtrans/Xtrans.h>
+#include <X11/Xmd.h>
 #include <errno.h>
 #if !defined(__UNIXOS2__) && !defined(WIN32)
 #ifndef Lynx
@@ -72,12 +72,12 @@ SOFTWARE.
 #include <uio.h>
 #endif
 #endif
-#include "X.h"
+#include <X11/X.h>
 #define NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "os.h"
 #include "osdep.h"
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "opaque.h"
 #include "dixstruct.h"
 #include "misc.h"
@@ -121,7 +121,7 @@ OsCommPtr AvailableInput = (OsCommPtr)NULL;
 			      lswaps((req)->length) : (req)->length)
 
 #ifdef BIGREQS
-#include "bigreqstr.h"
+#include <X11/extensions/bigreqstr.h>
 
 #define get_big_req_len(req,cli) ((cli)->swapped ? \
 				  lswapl(((xBigReq *)(req))->length) : \
diff --git a/os/k5auth.c b/os/k5auth.c
index 3726df6ba..876e04222 100644
--- a/os/k5auth.c
+++ b/os/k5auth.c
@@ -50,11 +50,11 @@ from The Open Group.
 #undef BITS32
 #undef xfree
 #include <krb5/los-proto.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
-#include "Xproto.h"
-#include "Xfuncs.h"
+#include <X11/Xproto.h>
+#include <X11/Xfuncs.h>
 #include "dixstruct.h"
 #include <com_err.h>
 #include "Xauth.h"
diff --git a/os/lbxio.c b/os/lbxio.c
index 86ed58800..c44389010 100644
--- a/os/lbxio.c
+++ b/os/lbxio.c
@@ -50,8 +50,8 @@ SOFTWARE.
 /* $Xorg: lbxio.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
 #include <stdio.h>
-#include <X11/Xtrans.h>
-#include "Xmd.h"
+#include <X11/Xtrans/Xtrans.h>
+#include <X11/Xmd.h>
 #include <errno.h>
 #ifndef Lynx
 #include <sys/param.h>
@@ -61,10 +61,10 @@ SOFTWARE.
 #else
 #include <uio.h>
 #endif
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "os.h"
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "osdep.h"
 #include "opaque.h"
 #include "dixstruct.h"
diff --git a/os/log.c b/os/log.c
index 1608fb72e..dc7642af2 100644
--- a/os/log.c
+++ b/os/log.c
@@ -78,7 +78,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 /* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/stat.h>
diff --git a/os/mitauth.c b/os/mitauth.c
index 97f88b232..6ad0c3467 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -33,7 +33,7 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"
diff --git a/os/osinit.c b/os/osinit.c
index 1a5ff0501..76938ce43 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -48,10 +48,10 @@ SOFTWARE.
 /* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
-#include "Xos.h"
+#include <X11/Xos.h>
 
 #ifdef SMART_SCHEDULE
 #include "dixstruct.h"
diff --git a/os/rpcauth.c b/os/rpcauth.c
index f0693f599..6b0cf816c 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -36,7 +36,7 @@ from The Open Group.
 
 #ifdef SECURE_RPC
 
-#include "X.h"
+#include <X11/X.h>
 #include "Xauth.h"
 #include "misc.h"
 #include "os.h"
diff --git a/os/secauth.c b/os/secauth.c
index 8c30eaafb..4daeba1a5 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -26,7 +26,7 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */
 
-#include "X.h"
+#include <X11/X.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"
@@ -34,7 +34,7 @@ from The Open Group.
 
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "extensions/security.h"
+#include <X11/extensions/security.h>
 #endif
 
 static char InvalidPolicyReason[] = "invalid policy specification";
diff --git a/os/utils.c b/os/utils.c
index b7ef37ee5..a8e1b49c6 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.11 2004/11/25 12:48:21 ago Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.12 2005/03/23 19:58:45 gisburn Exp $ */
 /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
 /*
 
@@ -60,11 +60,11 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #if defined(WIN32) && !defined(__CYGWIN__)
 #include <X11/Xwinsock.h>
 #endif
-#include "Xos.h"
+#include <X11/Xos.h>
 #include <stdio.h>
 #include "misc.h"
-#include "X.h"
-#include <X11/Xtrans.h>
+#include <X11/X.h>
+#include <X11/Xtrans/Xtrans.h>
 #include "input.h"
 #include "dixfont.h"
 #include "osdep.h"
@@ -112,11 +112,11 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #ifdef XKB
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER
-#include "security.h"
+#include <X11/extensions/security.h>
 #endif
 
 #ifdef RENDER
diff --git a/os/xalloc.c b/os/xalloc.c
index 6740e89cb..ad606b2a2 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -35,9 +35,9 @@ Pascal Haible.
 
 #include <stdlib.h>	/* for malloc() etc. */
 
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "misc.h"
-#include "X.h"
+#include <X11/X.h>
 
 #ifdef XALLOC_LOG
 #include <stdio.h>
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 4ec7265dd..1d4a7d2c3 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -36,8 +36,8 @@ from The Open Group.
  */
 
 #include <stdio.h>
-#include "X.h"
-#include "Xtrans.h"
+#include <X11/X.h>
+#include <X11/Xtrans/Xtrans.h>
 #include "os.h"
 #include "osdep.h"
 #include "dixstruct.h"
@@ -47,7 +47,7 @@ from The Open Group.
 static Bool authFromXDMCP;
 
 #ifdef XDMCP
-#include "Xmd.h"
+#include <X11/Xmd.h>
 #undef REQUEST
 #include "Xdmcp.h"
 
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 6cf792937..82e2f297c 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.3 2004/07/20 15:15:13 ago Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/xdmcp.c,v 1.4 2004/11/15 15:06:50 ago Exp $ */
 /* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */
 /*
  * Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
@@ -20,7 +20,7 @@
 #include <Xwinsock.h>
 #endif
 
-#include "Xos.h"
+#include <X11/Xos.h>
 
 #if !defined(WIN32)
 #ifndef Lynx
@@ -35,10 +35,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
 #include "misc.h"
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
 #include "osdep.h"
 #include "input.h"
 #include "dixstruct.h"
diff --git a/os/xprintf.c b/os/xprintf.c
index ee5d7daf6..cb9f1460a 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -26,7 +26,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-#include "Xos.h"
+#include <X11/Xos.h>
 #include "os.h"
 #include <stdarg.h>
 #include <stdio.h>