-import DriverUtil ( getFileSuffix )
-#ifdef darwin_TARGET_OS
-import DriverState ( v_Cmdline_frameworks, v_Framework_paths )
-#endif
-import Finder ( findModule, findLinkable, FindResult(..) )
+import Util ( getFileSuffix )
+import Finder ( findModule, findObjectLinkableMaybe, FindResult(..) )