diff --git a/zebra-network/src/lib.rs b/zebra-network/src/lib.rs
index e31f0aaf..d040df5e 100644
--- a/zebra-network/src/lib.rs
+++ b/zebra-network/src/lib.rs
@@ -53,12 +53,18 @@ mod peer_set;
 mod protocol;
 mod timestamp_collector;
 
-pub use config::Config;
-pub use meta_addr::MetaAddr;
-pub use network::Network;
-pub use peer_set::{init, BoxedZebraService};
-pub use protocol::internal::{Request, Response};
-pub use timestamp_collector::TimestampCollector;
+pub use crate::{
+    config::Config,
+    peer_set::{init, BoxedZebraService},
+    protocol::internal::{Request, Response},
+    // XXX replace with `AddressBook`
+    timestamp_collector::TimestampCollector,
+};
+
+/// Types used in the definition of [`Request`] and [`Response`] messages.
+pub mod types {
+    pub use crate::{meta_addr::MetaAddr, network::Network, protocol::types::PeerServices};
+}
 
 /// This will be removed when we finish encapsulation
 pub mod should_be_private {
diff --git a/zebra-network/src/peer/connector.rs b/zebra-network/src/peer/connector.rs
index 66682e6e..aa069a96 100644
--- a/zebra-network/src/peer/connector.rs
+++ b/zebra-network/src/peer/connector.rs
@@ -19,7 +19,7 @@ use crate::{
     constants,
     protocol::{codec::*, internal::*, message::*, types::*},
     timestamp_collector::{PeerLastSeen, TimestampCollector},
-    BoxedStdError, Config, Network,
+    BoxedStdError, Config, types::Network,
 };
 
 use super::{error::ErrorSlot, server::ServerState, HandshakeError, PeerClient, PeerServer};
diff --git a/zebra-network/src/protocol/codec.rs b/zebra-network/src/protocol/codec.rs
index 07a6cb7e..aebb2646 100644
--- a/zebra-network/src/protocol/codec.rs
+++ b/zebra-network/src/protocol/codec.rs
@@ -17,7 +17,7 @@ use zebra_chain::{
     types::{BlockHeight, Sha256dChecksum},
 };
 
-use crate::{constants, Network};
+use crate::{constants, types::Network};
 
 use super::{inv::InventoryHash, message::Message, types::*};