Fixed the Xcode project and fixed some includes.