diff --git a/crates/irtt-cli/src/cmd/mod.rs b/crates/irtt-cli/src/cmd/mod.rs
index be2ce65..2ce5c54 100644
--- a/crates/irtt-cli/src/cmd/mod.rs
+++ b/crates/irtt-cli/src/cmd/mod.rs
@@ -1,3 +1,7 @@
+#[cfg(feature = "client")]
 pub mod client;
 #[cfg(feature = "tui")]
 pub mod tui;
+
+// Future command applets, such as a server applet, belong here behind their
+// own feature gate.
diff --git a/crates/irtt-cli/src/lib.rs b/crates/irtt-cli/src/lib.rs
index b63e8bb..313549e 100644
--- a/crates/irtt-cli/src/lib.rs
+++ b/crates/irtt-cli/src/lib.rs
@@ -1,27 +1,6 @@
 #![forbid(unsafe_code)]
 
 pub mod applet;
-pub mod signal;
-
-#[cfg(feature = "client")]
-pub mod shared;
-
-#[cfg(feature = "client")]
 pub mod cmd;
-
-#[cfg(feature = "stats")]
-pub use cmd::client::summary;
-#[cfg(feature = "client")]
-pub use cmd::client::{
-    format_event, format_human_event, format_human_event_with_options, ClientArgs, HumanEventStats,
-    HumanIpdvPair, HumanOutputOptions, OutputMode,
-};
-#[cfg(feature = "tui")]
-pub use cmd::tui::TuiArgs;
-#[cfg(feature = "client")]
-pub use shared::client::{
-    parse_dscp, parse_duration, parse_length, parse_server_fill, parse_test_duration, parse_ttl,
-    ClockArg, CommonClientArgs, ReceivedStatsArg, TimestampArg,
-};
-#[cfg(feature = "client")]
-pub type CliArgs = ClientArgs;
+pub mod shared;
+pub mod signal;
diff --git a/crates/irtt-cli/src/shared/mod.rs b/crates/irtt-cli/src/shared/mod.rs
index b9babe5..2433a61 100644
--- a/crates/irtt-cli/src/shared/mod.rs
+++ b/crates/irtt-cli/src/shared/mod.rs
@@ -1 +1,2 @@
+#[cfg(feature = "client")]
 pub mod client;