diff --git a/src/header/common/authorization.rs b/src/header/common/authorization.rs
index f71a4cab..2e74ad9f 100644
--- a/src/header/common/authorization.rs
+++ b/src/header/common/authorization.rs
@@ -1,6 +1,5 @@
 use std::fmt::{mod, Show};
-use std::from_str::FromStr;
-use std::str::from_utf8;
+use std::str::{FromStr, from_utf8};
 use serialize::base64::{ToBase64, FromBase64, Standard, Config};
 use header::{Header, HeaderFormat};
 
diff --git a/src/header/common/connection.rs b/src/header/common/connection.rs
index 98e29b63..3245dab6 100644
--- a/src/header/common/connection.rs
+++ b/src/header/common/connection.rs
@@ -1,7 +1,7 @@
 use header::{Header, HeaderFormat};
 use std::fmt::{mod, Show};
 use super::{from_comma_delimited, fmt_comma_delimited};
-use std::from_str::FromStr;
+use std::str::FromStr;
 
 /// The `Connection` header.
 #[deriving(Clone, PartialEq, Show)]
diff --git a/src/header/common/cookie.rs b/src/header/common/cookie.rs
index 7974a4c0..efd8db46 100644
--- a/src/header/common/cookie.rs
+++ b/src/header/common/cookie.rs
@@ -1,7 +1,6 @@
 use header::{Header, HeaderFormat};
 use std::fmt::{mod, Show};
-use std::str::from_utf8;
-use std::from_str::from_str;
+use std::str::{from_utf8, from_str};
 
 use cookie::Cookie;
 use cookie::CookieJar;
diff --git a/src/header/common/date.rs b/src/header/common/date.rs
index 5a403830..ab540456 100644
--- a/src/header/common/date.rs
+++ b/src/header/common/date.rs
@@ -1,7 +1,7 @@
 use header::{Header, HeaderFormat};
 use std::fmt::{mod, Show};
 use super::util::from_one_raw_str;
-use std::from_str::FromStr;
+use std::str::FromStr;
 use time::{Tm, strptime};
 
 // Egh, replace as soon as something better than time::Tm exists.
diff --git a/src/header/common/mod.rs b/src/header/common/mod.rs
index c7013954..5d6f00c6 100644
--- a/src/header/common/mod.rs
+++ b/src/header/common/mod.rs
@@ -22,8 +22,7 @@ pub use self::server::Server;
 pub use self::set_cookie::SetCookie;
 
 use std::fmt::{mod, Show};
-use std::from_str::FromStr;
-use std::str::from_utf8;
+use std::str::{FromStr, from_utf8};
 
 macro_rules! bench_header(
     ($name:ident, $ty:ty, $value:expr) => {
diff --git a/src/header/common/transfer_encoding.rs b/src/header/common/transfer_encoding.rs
index 6f86963a..d5e83792 100644
--- a/src/header/common/transfer_encoding.rs
+++ b/src/header/common/transfer_encoding.rs
@@ -1,6 +1,6 @@
 use header::{Header, HeaderFormat};
 use std::fmt;
-use std::from_str::FromStr;
+use std::str::FromStr;
 use super::{from_comma_delimited, fmt_comma_delimited};
 
 /// The `Transfer-Encoding` header.
@@ -86,4 +86,3 @@ impl HeaderFormat for TransferEncoding {
 
 bench_header!(normal, TransferEncoding, { vec![b"chunked, gzip".to_vec()] })
 bench_header!(ext, TransferEncoding, { vec![b"ext".to_vec()] })
-
diff --git a/src/header/common/upgrade.rs b/src/header/common/upgrade.rs
index b64fc9a6..ba96a2f7 100644
--- a/src/header/common/upgrade.rs
+++ b/src/header/common/upgrade.rs
@@ -1,7 +1,7 @@
 use header::{Header, HeaderFormat};
 use std::fmt::{mod, Show};
 use super::{from_comma_delimited, fmt_comma_delimited};
-use std::from_str::FromStr;
+use std::str::FromStr;
 
 /// The `Upgrade` header.
 #[deriving(Clone, PartialEq, Show)]
@@ -52,4 +52,3 @@ impl HeaderFormat for Upgrade {
 }
 
 bench_header!(bench, Upgrade, { vec![b"HTTP/2.0, RTA/x11, websocket".to_vec()] })
-
diff --git a/src/header/common/util.rs b/src/header/common/util.rs
index f332e946..e17de12a 100644
--- a/src/header/common/util.rs
+++ b/src/header/common/util.rs
@@ -1,7 +1,6 @@
 //! Utility functions for Header implementations.
 
-use std::from_str::FromStr;
-use std::str::from_utf8;
+use std::str::{FromStr, from_utf8};
 
 /// Utility function that reads a single raw string when parsing a header
 pub fn from_one_raw_str<T: FromStr>(raw: &[Vec<u8>]) -> Option<T> {
diff --git a/src/header/mod.rs b/src/header/mod.rs
index 412149b6..adbd2dfa 100644
--- a/src/header/mod.rs
+++ b/src/header/mod.rs
@@ -457,7 +457,7 @@ mod tests {
         }
         fn parse_header(raw: &[Vec<u8>]) -> Option<CrazyLength> {
             use std::str::from_utf8;
-            use std::from_str::FromStr;
+            use std::str::FromStr;
 
             if raw.len() != 1 {
                 return None;
@@ -551,4 +551,3 @@ mod tests {
         assert_eq!(headers.len(), 0);
     }
 }
-
diff --git a/src/method.rs b/src/method.rs
index fc1141ef..59901884 100644
--- a/src/method.rs
+++ b/src/method.rs
@@ -1,6 +1,6 @@
 //! The HTTP request method
 use std::fmt;
-use std::from_str::FromStr;
+use std::str::FromStr;
 
 /// The Request Method (VERB)
 ///