[cvs-nhc98] patch applied (hat): Fix imports for hbc.