Reviewed-by: mschoene, prr, jgodinez

Reviewed-by: darcy, weijun

Summary: Recent changes to X11's header structure break the build
Reviewed-by: prr, flar