Log Message:
Stop messing with X11/Xmos_r.h, just replace it with a direct include
of X11/Xos_r.h and assume that has all the magic. If it is really
necessary to hack around limitations of other platforms, we can do
that later in a more specialised fashion. Bump revision.