Change all misc.h and os.h references to <X11/foo.h>.

11 files changed, 12 insertions, 12 deletions

diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 75aa396fb..0998b1307 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "servermd.h"
 
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index cea8b60d0..8ba943e91 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "cursor.h"
 #include "cursorstr.h"
 #include "scrnintstr.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 602a6c9b2..51f7f943f 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -19,7 +19,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "servermd.h"
 
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 604499f89..20bcac549 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -19,7 +19,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 259466adc..f78234ea0 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -17,7 +17,7 @@ is" without express or implied warranty.
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "regionstr.h"
 #include "font.h"
 #include "fontstruct.h"
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
index 421234316..b7b22862c 100644
--- a/hw/xnest/GetTime.c
+++ b/hw/xnest/GetTime.c
@@ -32,7 +32,7 @@ from the X Consortium.
 
 
 #include <X11/Xos.h>
-#include "os.h"
+#include <X11/os.h>
 #include <time.h>
 
 CARD32
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 362e9a4b6..3b7ba8e04 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index ba209b732..eaf1f5609 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -18,7 +18,7 @@ is" without express or implied warranty.
 #include <X11/Xproto.h>
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "servermd.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index a65b0ffcd..c63b080ed 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -1,5 +1,5 @@
 /* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.2 2004/04/23 19:54:21 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.4 2005/06/25 21:28:48 ajax Exp $ */
 /*
 
 Copyright 1993 by Davor Matic
@@ -21,7 +21,7 @@ is" without express or implied warranty.
 #include "keysym.h"
 #include "screenint.h"
 #include "inputstr.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "servermd.h"
 
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 7613122be..e02064d6e 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -19,7 +19,7 @@ is" without express or implied warranty.
 #include "screenint.h"
 #include "inputstr.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "servermd.h"
 #include "mipointer.h"
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
index be9299c31..afe0281b1 100644
--- a/hw/xnest/TestExt.c
+++ b/hw/xnest/TestExt.c
@@ -20,7 +20,7 @@ is" without express or implied warranty.
 #undef Bool
 #include "screenint.h"
 #include "input.h"
-#include "misc.h"
+#include <X11/misc.h>
 #include "scrnintstr.h"
 #include "servermd.h"
 #include "mipointer.h"