[cvs-nhc98] patch applied (hat): Check import directories in a different order: first the -I flags,