[cvs-nhc98] Fix some incorrect import specifications, now that the nhc