Cleanup X11/X13 options

Call X11 compiler options from X13 compiler options to avoid changing
stuff in multiple locations later on.