diff --git a/round-based/src/lib.rs b/round-based/src/lib.rs
index f434dc4..a653be1 100644
--- a/round-based/src/lib.rs
+++ b/round-based/src/lib.rs
@@ -50,9 +50,6 @@
 #![forbid(unused_crate_dependencies, missing_docs)]
 #![no_std]
 
-#[cfg(feature = "std")]
-extern crate std;
-
 extern crate alloc;
 
 #[doc(no_inline)]
diff --git a/round-based/src/rounds_router/mod.rs b/round-based/src/rounds_router/mod.rs
index 44a6b2e..ad52299 100644
--- a/round-based/src/rounds_router/mod.rs
+++ b/round-based/src/rounds_router/mod.rs
@@ -551,7 +551,7 @@ pub mod errors {
         #[error("mismatched error type")]
         MismatchedErrorType,
         #[error("take round result")]
-        TakeRoundResult(#[cfg_attr(feature = "std", source)] TakeOutputError),
+        TakeRoundResult(#[source] TakeOutputError),
     }
 
     impl<ProcessErr, IoErr> CompleteRoundError<ProcessErr, IoErr> {
@@ -625,8 +625,9 @@ mod tests {
 
     #[tokio::test]
     async fn complete_round_that_expects_no_messages() {
-        let incomings =
-            futures::stream::pending::<Result<crate::Incoming<FakeProtocolMsg>, std::io::Error>>();
+        let incomings = futures::stream::pending::<
+            Result<crate::Incoming<FakeProtocolMsg>, core::convert::Infallible>,
+        >();
 
         let mut rounds = super::RoundsRouter::builder();
         let round1 = rounds.add_round(Store);