Build error with latest git LibX11/LibXi

[Colin Harrison]

Hi,

I just reverted Xos.h and kept the rest of the x11proto changes.

Lazily, did not check back through all the #if defs changes as too many make
me go cross-eyed :)

Thanks
Colin