4 files changed, 2 insertions, 8 deletions
diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs
index 1215875f..70dd89c1 100644
--- a/ffi-macros/src/lib.rs
+++ b/ffi-macros/src/lib.rs
@@ -707,8 +707,8 @@ fn derive_serialize(span: proc_macro2::Span, prefix: &str, name: &str,
         #[::ffi_catch_abort] #[no_mangle] pub extern "system"
         fn #ident (errp: Option<&mut *mut ::error::Error>,
                    tsk: *const #wrapper,
-                   writer: *mut Box<Write>)
-                   -> Status {
+                   writer: *mut Box<::std::io::Write>)
+                   -> ::error::Status {
             let writer = ffi_param_ref_mut!(writer);
             tsk.ref_raw().serialize(writer).move_into_raw(errp)
         }
diff --git a/openpgp-ffi/src/packet_pile.rs b/openpgp-ffi/src/packet_pile.rs
index 6691bd17..853e77fa 100644
--- a/openpgp-ffi/src/packet_pile.rs
+++ b/openpgp-ffi/src/packet_pile.rs
@@ -5,16 +5,12 @@
 //!
 //! [`sequoia-openpgp::PacketPile`]: ../../sequoia_openpgp/struct.PacketPile.html
 
-use std::io::Write;
-
 extern crate sequoia_openpgp as openpgp;
 use self::openpgp::{
     parse::Parse,
     serialize::Serialize,
 };
 
-use ::error::Status;
-
 /// A `PacketPile` holds a deserialized sequence of OpenPGP messages.
 ///
 /// Wraps [`sequoia-openpgp::PacketPile`].
diff --git a/openpgp-ffi/src/tpk.rs b/openpgp-ffi/src/tpk.rs
index 1ddf9b8f..e10d07bf 100644
--- a/openpgp-ffi/src/tpk.rs
+++ b/openpgp-ffi/src/tpk.rs
@@ -7,7 +7,6 @@
 
 use std::ptr;
 use std::slice;
-use std::io::Write;
 use libc::{c_char, c_int, size_t, time_t};
 
 extern crate sequoia_openpgp as openpgp;
diff --git a/openpgp-ffi/src/tsk.rs b/openpgp-ffi/src/tsk.rs
index ea17ade6..8c4d989a 100644
--- a/openpgp-ffi/src/tsk.rs
+++ b/openpgp-ffi/src/tsk.rs
@@ -5,7 +5,6 @@
 //! [`sequoia-openpgp::TSK`]: ../../sequoia_openpgp/struct.TSK.html
 
 use failure;
-use std::io::Write;
 use libc::c_char;
 
 extern crate sequoia_openpgp as openpgp;