... and remove all huc.h references