xserver: use own copy of XKBstr.h header

nx-X11/programs/Xserver/hw/nxagent/Keyboard.c

@@ -75,7 +75,6 @@ is" without express or implied warranty.
 
 #define XKBSRV_NEED_FILE_FUNCS
 #include <nx-X11/extensions/XKBsrv.h>
-#include <nx-X11/extensions/XKBstr.h>
 #include <nx-X11/extensions/XKBconfig.h>
 
 #include <nx-X11/extensions/XKBrules.h>

nx-X11/programs/Xserver/include/xkbsrv.h

@@ -64,8 +64,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XkbUpdateActionVirtualMods	SrvXkbUpdateActionVirtualMods
 #define XkbUpdateKeyTypeVirtualMods	SrvXkbUpdateKeyTypeVirtualMods
 
-#include <nx-X11/extensions/XKBstr.h>
 #include <nx-X11/extensions/XKBproto.h>
+#include "xkbstr.h"
 #include "inputstr.h"
 
 #ifdef NXAGENT_SERVER

nx-X11/programs/Xserver/xkb/maprules.c

@@ -63,7 +63,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 

nx-X11/programs/Xserver/xkb/xkbSwap.c

@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include "extnsionst.h"
 #include "xkb.h"
 

nx-X11/programs/Xserver/xkb/xkbfmisc.c

@@ -54,7 +54,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>

nx-X11/programs/Xserver/xkb/xkbout.c

@@ -52,7 +52,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 

nx-X11/programs/Xserver/xkb/xkbtext.c

@@ -52,7 +52,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>

nx-X11/programs/Xserver/xkb/xkmread.c

@@ -54,7 +54,7 @@
 #include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define	 XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>