hopefully removing the XK_* workaround forcing you to change things in /usr/include/…