#ifndef XKBCOMP_H
#define XKBCOMP_H 1
-#include "utils.h"
-
-#include "xkbcommon/xkbcommon.h"
-#include "XKBcommonint.h"
-#include "xkbmisc.h"
+#include "xkb-priv.h"
#define TypeUnknown 0
#define TypeBoolean 1
} XkbFile;
extern struct xkb_keymap *
-CompileKeymap(struct xkb_context *context, XkbFile *file);
+CompileKeymap(struct xkb_ctx *ctx, XkbFile *file);
extern bool
-CompileKeycodes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
+CompileKeycodes(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
extern bool
-CompileKeyTypes(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
+CompileKeyTypes(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
typedef struct _LEDInfo *LEDInfoPtr;
extern bool
-CompileCompatMap(XkbFile *file, struct xkb_keymap * xkb, unsigned merge,
+CompileCompatMap(XkbFile *file, struct xkb_keymap *keymap, unsigned merge,
LEDInfoPtr *unboundLEDs);
extern bool
-CompileSymbols(XkbFile *file, struct xkb_keymap * xkb, unsigned merge);
-
-extern bool
-UpdateModifiersFromCompat(struct xkb_keymap *xkb);
+CompileSymbols(XkbFile *file, struct xkb_keymap *keymap, unsigned merge);
#endif /* XKBCOMP_H */