xserver: use own copy of XKBgeom.h header

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include "Xlibint.h"
 #include "XKBlibint.h"
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include <nx-X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
 
@@ -47,7 +47,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #endif /* XKB_IN_SERVER */
 

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

@@ -35,7 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include "Xlibint.h"
 #include "XKBlibint.h"
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include <nx-X11/extensions/XKBproto.h>
 
 #else 
@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #endif /* XKB_IN_SERVER */
 

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

@@ -47,7 +47,7 @@
 #include <nx-X11/Xatom.h>
 #include <nx-X11/keysym.h>
 #include <nx-X11/XKBlib.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 #include "XKBrules.h"

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

@@ -3880,7 +3880,7 @@ ProcXkbSetNames(ClientPtr client)
 
 /***====================================================================***/
 
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)
 

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

@@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "scrnintstr.h"
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include <nx-X11/extensions/XKMformat.h>
 #include "xkbfile.h"
 #include "xkb.h"

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

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

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

@@ -42,7 +42,7 @@
 #include <nx-X11/Xlib.h>
 #include <nx-X11/keysym.h>
 #include <nx-X11/XKBlib.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
@@ -57,7 +57,7 @@
 #include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "xkb.h"
 
 #endif

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

@@ -39,7 +39,7 @@
 
 #include <nx-X11/Xlib.h>
 #include <nx-X11/XKBlib.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
@@ -56,7 +56,7 @@
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "xkbfile.h"
 
 #endif

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

@@ -40,7 +40,7 @@
 
 #include <nx-X11/Xlib.h>
 #include <nx-X11/XKBlib.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #include "XKMformat.h"
 #include "XKBfileInt.h"
@@ -55,7 +55,7 @@
 #include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #endif
 

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

@@ -43,7 +43,7 @@
 
 #include <nx-X11/XKBlib.h>
 
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "XKMformat.h"
 #include "XKBfileInt.h"
 
@@ -57,7 +57,7 @@
 #include "xkbstr.h"
 #define	 XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 Atom
 XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)