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.

13 files changed, 21 insertions, 21 deletions

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 0dd43d724..69bdbdc6a 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -39,7 +39,7 @@ from The Open Group.
 #include <mntent.h>
 #endif
 #if defined(XKB) && defined(WIN32)
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 #ifdef RELOCATE_PROJECTROOT
 #include <shlobj.h>
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index c332087ad..8175081e5 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -152,10 +152,10 @@
 #endif /* MAP_FILE */
 #endif /* HAS_MMAP */
 
-#include "X11/X.h"
-#include "X11/Xproto.h"
-#include "X11/Xos.h"
-#include "X11/Xprotostr.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
+#include <X11/Xprotostr.h>
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "pixmap.h"
diff --git a/hw/xwin/winauth.c b/hw/xwin/winauth.c
index 155ed4add..596c08eb4 100644
--- a/hw/xwin/winauth.c
+++ b/hw/xwin/winauth.c
@@ -34,8 +34,8 @@
 /* Includes for authorization */
 #include "X11/Xauth.h"
 #define _SECURITY_SERVER
-#include "X11/extensions/security.h"
-#include "X11/extensions/securstr.h"
+#include <X11/extensions/security.h>
+#include <X11/extensions/securstr.h>
 
 
 /*
diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h
index 559409a81..445c01b27 100644
--- a/hw/xwin/winclipboard.h
+++ b/hw/xwin/winclipboard.h
@@ -46,13 +46,13 @@
 #include <pthread.h>
 
 /* X headers */
-#include "X11/X.h"
-#include "X11/Xatom.h"
+#include <X11/X.h>
+#include <X11/Xatom.h>
 /* NOTE: For some unknown reason, including Xproto.h solves
  * tons of problems with including windows.h.  Unknowns reasons
  * are usually bad, so someone should investigate this.
  */
-#include "X11/Xproto.h"
+#include <X11/Xproto.h>
 #include "X11/Xutil.h"
 #include "X11/Xlocale.h"
 
diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index 910699dc3..c990e7ec7 100755
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -30,7 +30,7 @@
 
 #include "win.h"
 #include "dixstruct.h"
-#include "X11/Xatom.h"
+#include <X11/Xatom.h>
 
 
 /*
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 047e33b02..1764dd3d5 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -36,7 +36,7 @@
 
 #ifdef XKB
 #define XKB_IN_SERVER
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 
 #ifdef XWIN_XF86CONFIG
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index cfca00efc..bdd48c83f 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -40,7 +40,7 @@
 
 #ifdef XKB
 #define XKB_IN_SERVER
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 #endif
 
 static Bool g_winKeyState[NUM_KEYCODES];
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c
index ddbbf143a..96dc26f0e 100755
--- a/hw/xwin/winmultiwindowclass.c
+++ b/hw/xwin/winmultiwindowclass.c
@@ -29,7 +29,7 @@
  */
 /* $XFree86$ */
 
-#include "X11/Xatom.h"
+#include <X11/Xatom.h>
 #include "propertyst.h"
 #include "windowstr.h"
 #include "winmultiwindowclass.h"
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index 6d9cc93c2..5230b16e0 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -32,7 +32,7 @@
 /* $XFree86: $ */
 
 /* Need Bool */
-#include "Xdefs.h"
+#include <X11/Xdefs.h>
 /* Need TRUE */
 #include "misc.h"
 
diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c
index 9d7072e83..e73cecbd2 100644
--- a/hw/xwin/winpushpxl.c
+++ b/hw/xwin/winpushpxl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-#include "X.h"
+#include <X11/X.h>
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "pixmapstr.h"
diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c
index 23e982638..4e1b65979 100755
--- a/hw/xwin/winvideo.c
+++ b/hw/xwin/winvideo.c
@@ -29,8 +29,8 @@
  */
 
 #include "win.h"
-#include "Xv.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
 
 void
 winInitVideo (ScreenPtr pScreen);
@@ -63,7 +63,7 @@ winInitVideo (ScreenPtr pScreen)
 #include "../xfree86/common/xf86.h"
 #include "../Xext/xvdix.h"
 #include "../xfree86/common/xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #endif
 
 #include "win.h"
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index 4a065f4f9..1fa77b208 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -39,7 +39,7 @@
 #include "dixevents.h"
 #include "winmultiwindowclass.h"
 #include "winprefs.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 
 
 /*
diff --git a/hw/xwin/winwin32rootlesswndproc.c b/hw/xwin/winwin32rootlesswndproc.c
index 20fbcd630..4a59aef8c 100755
--- a/hw/xwin/winwin32rootlesswndproc.c
+++ b/hw/xwin/winwin32rootlesswndproc.c
@@ -35,7 +35,7 @@
 #include "windowswmstr.h"
 #include "dixevents.h"
 #include "propertyst.h"
-#include "Xatom.h"
+#include <X11/Xatom.h>
 #include "winmultiwindowclass.h"
 #include "winmsg.h"