Pull in a few #defines from libxkbfile and lower kbproto requirement