8 files changed, 8 insertions, 8 deletions
diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs
index 38212934..74e2b8ba 100644
--- a/openpgp/src/armor.rs
+++ b/openpgp/src/armor.rs
@@ -37,7 +37,7 @@ use quickcheck::{Arbitrary, Gen};
 
 use crate::packet::prelude::*;
 use crate::packet::BodyLength;
-use crate::packet::ctb::{CTBNew, CTBOld};
+use crate::packet::header::ctb::{CTBNew, CTBOld};
 use crate::serialize::SerializeInto;
 
 /// The encoded output stream must be represented in lines of no more
diff --git a/openpgp/src/packet/ctb.rs b/openpgp/src/packet/header/ctb.rs
index 50705c6f..50705c6f 100644
--- a/openpgp/src/packet/ctb.rs
+++ b/openpgp/src/packet/header/ctb.rs
diff --git a/openpgp/src/packet/header/mod.rs b/openpgp/src/packet/header/mod.rs
index 776d83eb..680d34e5 100644
--- a/openpgp/src/packet/header/mod.rs
+++ b/openpgp/src/packet/header/mod.rs
@@ -6,7 +6,8 @@ use crate::{
 };
 use crate::packet::tag::Tag;
 pub use crate::packet::BodyLength;
-pub use crate::packet::ctb::{self, CTB};
+pub mod ctb;
+pub use self::ctb::CTB;
 
 /// An OpenPGP packet's header.
 #[derive(Clone, Debug)]
diff --git a/openpgp/src/packet/mod.rs b/openpgp/src/packet/mod.rs
index 23fa16c0..1f5dae54 100644
--- a/openpgp/src/packet/mod.rs
+++ b/openpgp/src/packet/mod.rs
@@ -16,8 +16,7 @@ use crate::Packet;
 
 pub mod prelude;
 
-pub mod ctb;
-use self::ctb::PacketLengthType;
+use self::header::ctb::PacketLengthType;
 use crate::crypto::KeyPair;
 
 use buffered_reader::BufferedReader;
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index cc11e0d9..2d6f0a70 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -27,7 +27,7 @@ use crate::{
     },
     packet::{
         BodyLength,
-        ctb::CTB,
+        header::CTB,
         key,
         Key,
         Literal,
diff --git a/openpgp/src/serialize/padding.rs b/openpgp/src/serialize/padding.rs
index 23c72038..b11666a3 100644
--- a/openpgp/src/serialize/padding.rs
+++ b/openpgp/src/serialize/padding.rs
@@ -42,7 +42,7 @@ use crate::{
     Result,
     packet::prelude::*,
 };
-use crate::packet::ctb::CTB;
+use crate::packet::header::CTB;
 use super::{
     PartialBodyFilter,
     Serialize,
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index 28864b89..21055184 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -31,7 +31,7 @@ use crate::{
     },
     TPK,
 };
-use crate::packet::ctb::CTB;
+use crate::packet::header::CTB;
 use crate::packet::BodyLength;
 use super::{
     PartialBodyFilter,
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index 5077ae66..a9b11cfe 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -7,7 +7,7 @@ use self::openpgp::conversions::hex;
 use self::openpgp::crypto::mpis;
 use self::openpgp::{Packet, Result};
 use self::openpgp::packet::prelude::*;
-use self::openpgp::packet::ctb::CTB;
+use self::openpgp::packet::header::CTB;
 use self::openpgp::packet::{Header, BodyLength, Signature};
 use self::openpgp::packet::signature::subpacket::{Subpacket, SubpacketValue};
 use self::openpgp::crypto::{SessionKey, s2k::S2K};