Fixed building with X/Open style header locations.