Fix unified build after CT reorg