FYI: the new tree has some attempts in it to keep the Xserver specific
stuff, somewhat localized.
I originally did this with the idea of supporting some commercial Xservers,
instead of just Xfree.
However, perhaps there may be another FREE Xserver we may want to support
in the future: