Sorry, I was up late working with XCB, but here are the fixes I've got that get the X server building again. Review welcome; after these are merged, I'm going to cut an RC2 and try to get everything else released today as well. Also, sleep would be nice. -keith