diff --git a/cfdp-core/src/lib.rs b/cfdp-core/src/lib.rs
index 57b717d..1bb5b64 100644
--- a/cfdp-core/src/lib.rs
+++ b/cfdp-core/src/lib.rs
@@ -4,6 +4,9 @@ pub mod pdu;
 
 pub mod transaction;
 
+// re-exported for convenience and compatibility with the Primitives.
+pub use tokio::sync::oneshot;
+
 // this import is necessary for the template macro in rstest_reuse as of v0.5.0
 #[cfg(test)]
 #[cfg_attr(test, allow(clippy::single_component_path_imports))]
diff --git a/cfdp-daemon/src/lib.rs b/cfdp-daemon/src/lib.rs
index 9249af3..dec8a97 100644
--- a/cfdp-daemon/src/lib.rs
+++ b/cfdp-daemon/src/lib.rs
@@ -12,7 +12,7 @@ use error::DaemonResult;
 use log::{error, info, warn};
 use tokio::{select, task::JoinHandle, time::MissedTickBehavior};
 
-// Re-exported for convenience
+// Re-exported for convenience and compatibility.
 pub use tokio::sync::{
     mpsc::{channel, Receiver, Sender},
     oneshot,