update to upstream - fix up to the X11/X.h halt again.