Fix Xcode 4 building, bring it back to one file.