Removed unused macros and removed X11 options from the options string unless X11...