It is up to you, but there is already plenty of X11 related undefs in X11Gui.h and I think we should keep it in one place.
BTW. I have similar problem with "t_" definition (some external library has t_ function). Is it possible to replace definition of t_ with inline function? I tried to do this, but I couldn't resolve name space problems.