xkbcomp: handle XKB file include's better