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.

10 files changed, 13 insertions, 13 deletions

diff --git a/include/closestr.h b/include/closestr.h
index fcd64ed45..d70f754b2 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -33,7 +33,7 @@ from The Open Group.
 #define CLOSESTR_H
 
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "closure.h"
 #include "dix.h"
 #include "misc.h"
diff --git a/include/colormap.h b/include/colormap.h
index e8b235529..1f2c33075 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -50,7 +50,7 @@ SOFTWARE.
 #ifndef CMAP_H
 #define CMAP_H 1
 
-#include "X11/Xproto.h"
+#include <X11/Xproto.h>
 #include "screenint.h"
 #include "window.h"
 
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index d1d0449dc..757b8bbc4 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -30,7 +30,7 @@ SOFTWARE.
 #include "fontstruct.h"
 #include "closure.h"
 #define NEED_REPLIES
-#include "X11/Xproto.h" /* for xQueryFontReply */
+#include <X11/Xproto.h> /* for xQueryFontReply */
 
 #define FONTCHARSET(font)	  (font)
 #define FONTMAXBOUNDS(font,field) (font)->info.maxbounds.field
diff --git a/include/gc.h b/include/gc.h
index 2288e8491..77c2f20c6 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -50,9 +50,9 @@ SOFTWARE.
 #ifndef GC_H
 #define GC_H 
 
-#include "X11/X.h"	/* for GContext, Mask */
-#include "Xdefs.h"	/* for Bool */
-#include "X11/Xproto.h"
+#include <X11/X.h>	/* for GContext, Mask */
+#include <X11/Xdefs.h>	/* for Bool */
+#include <X11/Xproto.h>
 #include "screenint.h"	/* for ScreenPtr */
 #include "pixmap.h"	/* for DrawablePtr */
 
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 6feff51f5..c2226ba17 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "region.h"
 #include "pixmap.h"
 #include "screenint.h"
-#include "Xprotostr.h"
+#include <X11/Xprotostr.h>
 
 /*
  * functions which modify the state of the GC
diff --git a/include/input.h b/include/input.h
index 9bcdd9f58..bcaa01e6f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -52,8 +52,8 @@ SOFTWARE.
 
 #include "misc.h"
 #include "screenint.h"
-#include "X11/Xmd.h"
-#include "X11/Xproto.h"
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
 #include "window.h"     /* for WindowPtr */
 
 #define DEVICE_INIT	0
diff --git a/include/miscstruct.h b/include/miscstruct.h
index f0ff25b28..6a16007b7 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -51,7 +51,7 @@ SOFTWARE.
 #define MISCSTRUCT_H 1
 
 #include "misc.h"
-#include "X11/Xprotostr.h"
+#include <X11/Xprotostr.h>
 #include "gc.h"
 
 typedef xPoint DDXPointRec;
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index edd14c12f..ef9358689 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -56,7 +56,7 @@ SOFTWARE.
 #include "colormap.h"
 #include "cursor.h"
 #include "validate.h"
-#include "X11/Xproto.h"
+#include <X11/Xproto.h>
 #include "dix.h"
 
 typedef struct _PixmapFormat {
diff --git a/include/window.h b/include/window.h
index 1a2845f90..7c3fce092 100644
--- a/include/window.h
+++ b/include/window.h
@@ -53,7 +53,7 @@ SOFTWARE.
 #include "misc.h"
 #include "region.h"
 #include "screenint.h"
-#include "X11/Xproto.h"
+#include <X11/Xproto.h>
 
 #define TOTALLY_OBSCURED 0
 #define UNOBSCURED 1
diff --git a/include/windowstr.h b/include/windowstr.h
index c89c7b18e..bce01ba97 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -58,7 +58,7 @@ SOFTWARE.
 #include "resource.h"	/* for ROOT_WINDOW_ID_BASE */
 #include "dix.h"
 #include "miscstruct.h"
-#include "X11/Xprotostr.h"
+#include <X11/Xprotostr.h>
 #include "opaque.h"
 
 #define GuaranteeNothing	0