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

10 files changed, 12 insertions, 12 deletions

diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c
index 70c10e202..c5e32d0b7 100644
--- a/xkb/ddxConfig.c
+++ b/xkb/ddxConfig.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include "os.h"
+#include <X11/os.h>
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <X11/extensions/XKBsrv.h>
 #include <X11/extensions/XKBconfig.h>
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index cfadb2d62..93b58bd04 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.3 2005/04/20 12:25:48 daniels Exp $ */
 /* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xkb/xkb.c b/xkb/xkb.c
index ce3164c10..ee478a365 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	NEED_EVENTS
 #define	NEED_REPLIES
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <X11/extensions/XKBsrv.h>
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index f45dd818f..9198825df 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1,5 +1,5 @@
 /* $Xorg: xkbActions.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XdotOrg: $ */
+/* $XdotOrg: xc/programs/Xserver/xkb/xkbActions.c,v 1.4 2005/05/22 01:12:49 alanc Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 #include "xkb.h"
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 506b5458e..35f9415d1 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -1,5 +1,5 @@
 /* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XdotOrg: xc/programs/Xserver/xkb/xkbInit.c,v 1.2 2004/04/23 19:54:30 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/xkb/xkbInit.c,v 1.3 2005/04/20 12:25:48 daniels Exp $ */
 /************************************************************
 Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
 
@@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 #include "opaque.h"
 #include "property.h"
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index 7cdd21ae3..212048ac8 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define NEED_EVENTS 1
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 
 #include <X11/extensions/XI.h>
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 175f7ff22..71cc3e403 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 #include <ctype.h>
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index 08af172b7..1e2773f64 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -32,7 +32,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 520885515..635329445 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	NEED_EVENTS
 #define	NEED_REPLIES
 #include <X11/Xproto.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 #include <X11/extensions/XKBsrv.h>
 #include <X11/extensions/XKBstr.h>
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 61585ebdb..c4ff1ca3f 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xproto.h>
 #define	XK_CYRILLIC
 #include <X11/keysym.h>
-#include "misc.h"
+#include <X11/misc.h>
 #include "inputstr.h"
 
 #define	XKBSRV_NEED_FILE_FUNCS