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.

3 files changed, 6 insertions, 6 deletions

diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index 28f8b6fc7..d73c04300 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -24,8 +24,8 @@
 /* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */
 
 
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "windowstr.h"
 #include "compiler.h"
 #include "mipointer.h"
@@ -36,7 +36,7 @@
 #include "xf86_ansic.h"
 
 #define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
 #include "dgaproc.h"
 
 
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index 1ede4e731..e1ee6f27c 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -12,7 +12,7 @@
 
 #define _NEED_SYSI86
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 
 #include "xf86.h"
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index 2874c2cfb..c200aee9a 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -14,7 +14,7 @@
 #ifndef _VGAHW_H
 #define _VGAHW_H
 
-#include "X.h"
+#include <X11/X.h>
 #include "misc.h"
 #include "input.h"
 #include "scrnintstr.h"
@@ -27,7 +27,7 @@
 
 #include "globals.h"
 #define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 extern int vgaHWGetIndex(void);