update headers to compile on Mac

Also update the Xcode project to Xcode 6.