6 files changed, 7 insertions, 8 deletions
diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs
index 8a3a39f1..15027dd5 100644
--- a/ffi-macros/src/lib.rs
+++ b/ffi-macros/src/lib.rs
@@ -732,6 +732,7 @@ fn derive_parse(span: proc_macro2::Span, prefix: &str, name: &str,
         fn #from_reader(errp: Option<&mut *mut ::error::Error>,
                         reader: *mut super::io::Reader)
                         -> ::Maybe<#wrapper> {
+            use ::sequoia_openpgp::parse::Parse;
             use ::RefMutRaw;
             use ::MoveResultIntoRaw;
             #wrapped::from_reader(reader.ref_mut_raw()).move_into_raw(errp)
@@ -742,6 +743,7 @@ fn derive_parse(span: proc_macro2::Span, prefix: &str, name: &str,
         fn #from_file(errp: Option<&mut *mut ::error::Error>,
                       filename: *const ::libc::c_char)
                       -> ::Maybe<#wrapper> {
+            use ::sequoia_openpgp::parse::Parse;
             use ::MoveResultIntoRaw;
             let filename =
                 ffi_param_cstr!(filename).to_string_lossy().into_owned();
@@ -753,6 +755,7 @@ fn derive_parse(span: proc_macro2::Span, prefix: &str, name: &str,
         fn #from_bytes(errp: Option<&mut *mut ::error::Error>,
                        b: *const ::libc::uint8_t, len: ::libc::size_t)
                        -> ::Maybe<#wrapper> {
+            use ::sequoia_openpgp::parse::Parse;
             use ::MoveResultIntoRaw;
             assert!(!b.is_null());
             let buf = unsafe {
@@ -778,6 +781,7 @@ fn derive_serialize(span: proc_macro2::Span, prefix: &str, name: &str,
                    this: *const #wrapper,
                    writer: *mut super::io::Writer)
                    -> ::error::Status {
+            use ::sequoia_openpgp::serialize::Serialize;
             use ::RefRaw;
             use ::RefMutRaw;
             use ::MoveResultIntoRaw;
diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs
index 2a75e89d..7bf95e6f 100644
--- a/ffi/src/lib.rs
+++ b/ffi/src/lib.rs
@@ -119,6 +119,7 @@ use sequoia_ffi_macros::{
     ffi_catch_abort,
     ffi_wrapper_type,
 };
+extern crate sequoia_openpgp;
 extern crate sequoia_core;
 extern crate sequoia_net;
 extern crate sequoia_store;
diff --git a/openpgp-ffi/src/lib.rs b/openpgp-ffi/src/lib.rs
index 6572b2be..49e73f91 100644
--- a/openpgp-ffi/src/lib.rs
+++ b/openpgp-ffi/src/lib.rs
@@ -325,4 +325,6 @@ use sequoia_ffi_macros::{
     ffi_wrapper_type,
 };
 
+extern crate sequoia_openpgp;
+
 include!("common.rs");
diff --git a/openpgp-ffi/src/packet_pile.rs b/openpgp-ffi/src/packet_pile.rs
index 853e77fa..2bb1660b 100644
--- a/openpgp-ffi/src/packet_pile.rs
+++ b/openpgp-ffi/src/packet_pile.rs
@@ -6,10 +6,6 @@
 //! [`sequoia-openpgp::PacketPile`]: ../../sequoia_openpgp/struct.PacketPile.html
 
 extern crate sequoia_openpgp as openpgp;
-use self::openpgp::{
-    parse::Parse,
-    serialize::Serialize,
-};
 
 /// A `PacketPile` holds a deserialized sequence of OpenPGP messages.
 ///
diff --git a/openpgp-ffi/src/tpk.rs b/openpgp-ffi/src/tpk.rs
index ed2847c3..daf87a04 100644
--- a/openpgp-ffi/src/tpk.rs
+++ b/openpgp-ffi/src/tpk.rs
@@ -18,8 +18,6 @@ use self::openpgp::{
     constants::ReasonForRevocation,
     packet::{self, Signature},
     parse::PacketParserResult,
-    parse::Parse,
-    serialize::Serialize,
     tpk::{
         CipherSuite,
         KeyIter,
diff --git a/openpgp-ffi/src/tsk.rs b/openpgp-ffi/src/tsk.rs
index 1eb20969..ea2cf5b0 100644
--- a/openpgp-ffi/src/tsk.rs
+++ b/openpgp-ffi/src/tsk.rs
@@ -10,8 +10,6 @@ use libc::c_char;
 extern crate sequoia_openpgp as openpgp;
 use self::openpgp::{
     packet::Signature,
-    parse::Parse,
-    serialize::Serialize,
 };
 
 use super::tpk::TPK;