Re-apply NO_X11 patch. Apply patch to let it use gcc's include dir if built with gcc. Bug #132232 r=bryner a=asa