Convert more files to pure Objective-C