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.

16 files changed, 31 insertions, 31 deletions

diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index 86e27c2bc..e6fb781d0 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -29,11 +29,11 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.4 2004/08/11 23:53:36 torrey Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.5 2004/09/22 23:38:32 torrey Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "os.h"
 #include "servermd.h"
 #include "inputstr.h"
@@ -49,8 +49,8 @@
 #include "dix.h"
 
 #ifdef XINPUT
-# include "XI.h"
-# include "XIproto.h"
+# include <X11/extensions/XI.h>
+# include <X11/extensions/XIproto.h>
 # include "exevents.h"
 # include "extinit.h"
 #endif
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 337706b3f..4f4e9b91f 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -31,7 +31,7 @@
 #include <IOKit/IOTypes.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
-#include "extensions/XKB.h"
+#include <X11/extensions/XKB.h>
 
 typedef struct {
     void                *framebuffer;
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index 6bfda00d4..61100d9b3 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.6 2004/03/31 22:29:09 torrey 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/hw/darwin/darwinXinput.c b/hw/darwin/darwinXinput.c
index aab10981c..d3716a1d4 100644
--- a/hw/darwin/darwinXinput.c
+++ b/hw/darwin/darwinXinput.c
@@ -55,11 +55,11 @@ SOFTWARE.
 /* $XFree86: xc/programs/Xserver/hw/darwin/darwinXinput.c,v 1.1 2004/05/28 07:44:00 torrey Exp $ */
 
 #define	 NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 
 /***********************************************************************
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index fc43cf8a5..bcc430e58 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,11 +33,11 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2004/04/23 19:15:17 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2004/07/30 17:37:09 torrey Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "os.h"
 #include "servermd.h"
 #include "inputstr.h"
diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h
index 1e03cdf80..288063da1 100644
--- a/hw/darwin/iokit/xfIOKit.h
+++ b/hw/darwin/iokit/xfIOKit.h
@@ -35,7 +35,7 @@
 
 #include <pthread.h>
 #include <IOKit/graphics/IOFramebufferShared.h>
-#include "X11/Xproto.h"
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "darwin.h"
 
diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h
index 707c24029..ec8ec7d49 100644
--- a/hw/darwin/quartz/XServer.h
+++ b/hw/darwin/quartz/XServer.h
@@ -29,11 +29,11 @@
  * sale, use or other dealings in this Software without prior written
  * authorization.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.2 2004/04/23 19:15:17 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */
 
 #define BOOL xBOOL
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #undef BOOL
 
 #import <Cocoa/Cocoa.h>
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index 040b57680..d79df4cee 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "servermd.h"
 #include "swaprep.h"
 #include "propertyst.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "darwin.h"
 #define _APPLEWM_SERVER_
 #include "applewmstr.h"
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index 9f71eae89..71093f5fb 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -39,7 +39,7 @@ Equipment Corporation.
 #include "extnsionst.h"
 #include "dixstruct.h"
 #include "window.h"
-#include "panoramiXproto.h"
+#include <X11/extensions/panoramiXproto.h>
 #include "globals.h"
 
 extern int ProcPanoramiXQueryVersion (ClientPtr client);
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c
index 15df9e07b..2106dfad4 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@@ -44,7 +44,7 @@
 #include <pthread.h>
 
 #include "inputstr.h"
-#include "extensions/XI.h"
+#include <X11/extensions/XI.h>
 
 void NSBeep();
 
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c
index e9f9d6698..536dcc336 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@@ -33,7 +33,7 @@
 
 #include "quartzPasteboard.h"
 
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "windowstr.h"
 #include "propertyst.h"
 #include "scrnintstr.h"
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 0eba61cb2..d4cd27b8f 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -38,8 +38,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index 25934c746..e8e49f965 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -45,8 +45,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h
index 1951e7dcb..f826167f6 100644
--- a/hw/darwin/quartz/xpr/dri.h
+++ b/hw/darwin/quartz/xpr/dri.h
@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _DRI_H_
 #define _DRI_H_
 
-#include "Xdefs.h"
+#include <X11/Xdefs.h>
 #include "scrnintstr.h"
 #define _APPLEDRI_SERVER_
 #include "appledri.h"
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index a5186d5f6..2db6a2432 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -33,7 +33,7 @@
 #include "applewmExt.h"
 #include "rootless.h"
 #include "Xplugin.h"
-#include "X.h"
+#include <X11/X.h>
 
 
 static int xprSetWindowLevel(
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 98df1d3f3..235028ff0 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -27,7 +27,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.
  */
-/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2004/04/23 19:16:52 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.3 2004/10/08 00:35:05 torrey Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */
 
 #include "xpr.h"
@@ -39,7 +39,7 @@
 
 #include "propertyst.h"
 #include "dix.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "windowstr.h"
 
 #include <pthread.h>