XCode includes/fixes for MacOS