diff --git a/src/lib.rs b/src/lib.rs
index 0ac1df6..e834664 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,7 +90,7 @@ extern crate ref_slice;
 extern crate serde;
 
 #[macro_use]
-#[cfg(test)]
+#[cfg(all(test, feature = "typed"))]
 extern crate serde_derive;
 
 #[cfg(feature = "typed")]
@@ -105,7 +105,7 @@ pub mod error;
 #[allow(unused_imports)]
 use error::{Error, Result};
 
-#[cfg(feature = "typed")]
+#[cfg(all(feature = "typed", feature = "use_std"))]
 pub mod typed;
 
 // ## use statements
diff --git a/src/typed.rs b/src/typed.rs
index dce34ee..063b5ba 100644
--- a/src/typed.rs
+++ b/src/typed.rs
@@ -1,4 +1,6 @@
 //! Sending and receiving structs serialized with serde.
+//!
+//! This module currently requires `std`, the standard library.
 
 use error::{Result};
 use serde::Serialize;