[cvs-nhc98] patch applied (hat): Hbc has a bug that it needs explicit imports for type definitions