This will surely break things. Let's see just what we need to replace.
#include "alias.h"
#include "keycodes.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
static void
HandleCollision(AliasInfo * old, AliasInfo * new)
#include "keycodes.h"
#include "alias.h"
-#include "X11/extensions/XKBgeom.h"
+#include <X11/extensions/XKBgeomcommon.h>
#define DFLT_FONT "helvetica"
#define DFLT_SLANT "r"
#include "parseutils.h"
#include "misc.h"
#include "tokens.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#define lowbit(x) ((x) & (-(x)))
#include <X11/keysym.h>
#include "parseutils.h"
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
/***====================================================================***/
#include "parseutils.h"
#include "xkbpath.h"
#include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#include <X11/Xalloca.h>
XkbFile *rtrnValue;
#include "misc.h"
#include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
+#include <X11/extensions/XKBstrcommon.h>
#include "vmod.h"
#define DEBUG_VAR debugFlags
#endif
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-
#include "utils.h"
#include <X11/extensions/XKM.h>
-#include <X11/extensions/XKBfile.h>
extern char *scanFile;
#define DEBUG_VAR parseDebug
#include "parseutils.h"
#include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#include <stdlib.h>
unsigned int parseDebug;
#define DEBUG_VAR parseDebug
#include "parseutils.h"
#include <X11/keysym.h>
-#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBgeomcommon.h>
#include <stdlib.h>
unsigned int parseDebug;
********************************************************/
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-
#define DEBUG_VAR debugFlags
#include "utils.h"
#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
#include "tokens.h"
#define DEBUG_VAR scanDebug