Undefined intrusive X11 defines
Merged FreeBSD and OS X branches