[cvs-nhc98] patch applied (hat): Fix more foreign imports to mention the appropriate header file.