3 files changed, 3 insertions, 3 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index 6d423239..e7372f11 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -4,7 +4,7 @@ use clap;
 
 extern crate sequoia_openpgp as openpgp;
 use crate::openpgp::{Packet, Result};
-use crate::openpgp::cert::components::{Amalgamation, ValidAmalgamation};
+use crate::openpgp::cert::prelude::*;
 use openpgp::packet::key::PublicParts;
 use crate::openpgp::parse::{Parse, PacketParserResult};
 use crate::openpgp::policy::Policy;
diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs
index afca59f1..b463214e 100644
--- a/tool/src/commands/key.rs
+++ b/tool/src/commands/key.rs
@@ -5,7 +5,7 @@ use itertools::Itertools;
 use std::time::{SystemTime, Duration};
 
 use crate::openpgp::Packet;
-use crate::openpgp::cert::{CertBuilder, CipherSuite};
+use crate::openpgp::cert::prelude::*;
 use crate::openpgp::types::KeyFlags;
 use crate::openpgp::armor::{Writer, Kind};
 use crate::openpgp::serialize::Serialize;
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index dfb1dfdd..a925d362 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -11,9 +11,9 @@ use sequoia_core::Context;
 use crate::openpgp::types::{
     CompressionAlgorithm,
 };
+use crate::openpgp::cert::prelude::*;
 use crate::openpgp::crypto;
 use crate::openpgp::{Cert, KeyID, Result};
-use crate::openpgp::cert::components::Amalgamation;
 use crate::openpgp::packet::prelude::*;
 use crate::openpgp::parse::{
     Parse,