This is in prepreparation of the gcc-2.95 upgrade. Also seems I was -I'ing several GCC directories I did not need to.