diff --git a/crates/tor-circmgr/src/lib.rs b/crates/tor-circmgr/src/lib.rs
index 6b9d2d431..0fa9b483a 100644
--- a/crates/tor-circmgr/src/lib.rs
+++ b/crates/tor-circmgr/src/lib.rs
@@ -46,7 +46,7 @@ use tor_netdir::{DirEvent, NetDir, NetDirProvider, Timeliness};
 use tor_proto::circuit::{CircParameters, ClientCirc, UniqId};
 use tor_rtcompat::Runtime;
 
-#[cfg(feature = "specific-relay")]
+#[cfg(any(feature = "specific-relay", feature = "hs-common"))]
 use tor_linkspec::IntoOwnedChanTarget;
 
 use futures::task::SpawnExt;
diff --git a/crates/tor-circmgr/src/usage.rs b/crates/tor-circmgr/src/usage.rs
index 654fb7518..7565c2bc9 100644
--- a/crates/tor-circmgr/src/usage.rs
+++ b/crates/tor-circmgr/src/usage.rs
@@ -15,7 +15,10 @@ use tor_netdoc::types::policy::PortPolicy;
 use tor_rtcompat::Runtime;
 
 #[cfg(feature = "specific-relay")]
-use tor_linkspec::{HasChanMethod, HasRelayIds, OwnedChanTarget};
+use tor_linkspec::{HasChanMethod, HasRelayIds};
+
+#[cfg(any(feature = "specific-relay", feature = "hs-common"))]
+use tor_linkspec::OwnedChanTarget;
 
 use crate::isolation::{IsolationHelper, StreamIsolation};
 use crate::mgr::{abstract_spec_find_supported, AbstractCirc, OpenEntry, RestrictionFailed};
diff --git a/crates/tor-proto/src/stream/data.rs b/crates/tor-proto/src/stream/data.rs
index fdd85a386..f2e105a02 100644
--- a/crates/tor-proto/src/stream/data.rs
+++ b/crates/tor-proto/src/stream/data.rs
@@ -23,7 +23,10 @@ use std::pin::Pin;
 
 use educe::Educe;
 
-use crate::circuit::{ClientCirc, StreamTarget};
+#[cfg(feature = "experimental-api")]
+use crate::circuit::ClientCirc;
+
+use crate::circuit::StreamTarget;
 use crate::stream::StreamReader;
 use tor_basic_utils::skip_fmt;
 use tor_cell::relaycell::msg::Data;