FHAC-18: Fixed dependency management for Common Types