repair bad merge and add imports to OakPasteboardChooser.mm