Fix non-unified build errors.