Fixing a bunch of weird header problems. Upgrading Xcode project.