Unable to compile and generate Xcode project

Looks like SR-10998 / this PR will fix my build issues.

Related thread.