Alterating hcd.h to remove more legacy #ifndef