Reorg imports

src/abi.rs

@@ -3,6 +3,8 @@ use core::ops;
 
 use crate::util::*;
 
+#[cfg(not(feature = "unwinder"))]
+use crate::arch::Arch;
 #[cfg(feature = "unwinder")]
 pub use crate::unwinder::*;
 

src/unwinder/find_fde/phdr.rs

@@ -1,7 +1,6 @@
 use super::FDESearchResult;
 use crate::util::*;
 
-use core::ffi::c_void;
 use core::mem;
 use core::slice;
 use gimli::{BaseAddresses, EhFrame, EhFrameHdr, NativeEndian, UnwindSection};
@@ -49,6 +48,7 @@ fn search_aux_phdr(pc: usize) -> Option<FDESearchResult> {
 
 #[cfg(feature = "fde-phdr-dl")]
 fn search_dl_phdr(pc: usize) -> Option<FDESearchResult> {
+    use core::ffi::c_void;
     use libc::{dl_iterate_phdr, dl_phdr_info};
 
     struct CallbackData {