Adjusted imports to newish XCode 4.5 style