xserver: use own copy of XKBsrv.h header

nx-X11/programs/Xserver/dix/devices.c

@@ -63,7 +63,7 @@ SOFTWARE.
 #include "site.h"
 #define	XKB_IN_SERVER
 #ifdef XKB
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER

nx-X11/programs/Xserver/dix/dispatch.c

@@ -111,7 +111,7 @@ int ProcInitialConnection();
 #ifdef XKB
 #define XKB_IN_SERVER
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #endif
 
 #define mskcnt ((MAXCLIENTS + 31) / 32)

nx-X11/programs/Xserver/dix/events.c

@@ -129,7 +129,7 @@ of the copyright holder.
 #include "globals.h"
 
 #ifdef XKB
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
 #endif
 

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

@@ -75,6 +75,7 @@ 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/os/utils.c

@@ -141,7 +141,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 
 #ifdef XKB
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #endif
 #ifdef XCSECURITY
 #define _SECURITY_SERVER

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

@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 
 #endif /* XKB_IN_SERVER */

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

@@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 
 #endif /* XKB_IN_SERVER */

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

@@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include <nx-X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 
 #endif /* XKB_IN_SERVER */
 

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

@@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include <nx-X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 
 #endif /* XKB_IN_SERVER */
 

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 #if (defined(__osf__) && defined(__alpha))

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

@@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "windowstr.h"
 #include "os.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBconfig.h>
 
 Bool

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 void

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 #include <nx-X11/extensions/XIproto.h>
 

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

@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 void

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 #ifdef PANORAMIX

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

@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 int

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

@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 void

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

@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 #ifdef XF86DDXACTIONS

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

@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 void

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

@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 #ifndef PATH_MAX

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

@@ -50,7 +50,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 #include "xkb.h"
 

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

@@ -11,7 +11,7 @@
 #include <nx-X11/X.h>
 #include "windowstr.h"
 #define XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 
 #ifdef XF86DDXACTIONS
 #include "xf86.h"

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

@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
 #ifdef XF86DDXACTIONS

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

@@ -65,7 +65,7 @@
 #include "dix.h"
 #include <nx-X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 
 #endif
 

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

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

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

@@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/Xproto.h>
 #include <nx-X11/keysym.h>
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/time.h>
 #endif

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include "xkb.h"
 #include <ctype.h>
 

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/extensions/XI.h>
 #include "inputstr.h"
 #include "windowstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include "xkb.h"
 
 /***====================================================================***/

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

@@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "property.h"
 #include "scrnintstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 #include <nx-X11/extensions/XKMformat.h>
 #include <nx-X11/extensions/XKBfile.h>

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

@@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 
 #include <nx-X11/extensions/XI.h>
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include "xkb.h"
 
 /***====================================================================***/

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <ctype.h>
 
 

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

@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 
 #include <nx-X11/extensions/XI.h>
 #include <nx-X11/extensions/XIproto.h>

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

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

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

@@ -39,7 +39,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 #include "xkb.h"
 

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

@@ -55,7 +55,7 @@
 #include "inputstr.h"
 #include "dix.h"
 #define	XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #endif
 
 #include <nx-X11/extensions/XKBconfig.h>

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

@@ -56,7 +56,7 @@
 #include "dix.h"
 #include <nx-X11/extensions/XKBstr.h>
 #define XKBSRV_NEED_FILE_FUNCS	1
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 #include "xkb.h"
 

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

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

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

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

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

@@ -56,7 +56,7 @@
 #include "inputstr.h"
 #include <nx-X11/extensions/XKBstr.h>
 #define	 XKBSRV_NEED_FILE_FUNCS
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 
 Atom