[cvs-nhc98] Fix imports for hbc.