Fix --enable-xorg configure help string
Fix ordering of <xorg-server.h> include.

Fixes failure to build when os.h tries to redefine strnlen