GrayScale enum value conflicts with #define from X.h

x11proto's X.h #define's GrayScale, but QtGui/qpixelformat.h has an enum value named GrayScale as well. The result is that, if an application includes both of these headers, one gets a compile error.