3 files changed, 8 insertions, 1 deletions
diff --git a/src/libstd/old_path/mod.rs b/src/libstd/old_path/mod.rs
index 01eec230d21..3f9cfbd2a07 100644
--- a/src/libstd/old_path/mod.rs
+++ b/src/libstd/old_path/mod.rs
@@ -72,6 +72,7 @@ use iter::IteratorExt;
 use option::Option;
 use option::Option::{None, Some};
 use str;
+#[cfg(stage0)]
 use str::StrExt;
 use string::{String, CowString};
 use slice::SliceExt;
diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs
index 8d5765e1ffe..790dd87ae91 100644
--- a/src/libstd/old_path/posix.rs
+++ b/src/libstd/old_path/posix.rs
@@ -21,7 +21,10 @@ use marker::Sized;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
 use slice::{AsSlice, Split, SliceExt, SliceConcatExt};
+#[cfg(stage0)]
 use str::{self, FromStr, StrExt};
+#[cfg(not(stage0))]
+use str::{self, FromStr};
 use vec::Vec;
 
 use super::{BytesContainer, GenericPath, GenericPathUnsafe};
@@ -448,7 +451,7 @@ mod tests {
     use option::Option::{self, Some, None};
     use old_path::GenericPath;
     use slice::{AsSlice, SliceExt};
-    use str::{self, Str, StrExt};
+    use str::{self, Str};
     use string::ToString;
     use vec::Vec;
 
diff --git a/src/libstd/old_path/windows.rs b/src/libstd/old_path/windows.rs
index 1387d531001..4e36befefe8 100644
--- a/src/libstd/old_path/windows.rs
+++ b/src/libstd/old_path/windows.rs
@@ -28,7 +28,10 @@ use mem;
 use option::Option::{self, Some, None};
 use result::Result::{self, Ok, Err};
 use slice::{SliceExt, SliceConcatExt};
+#[cfg(stage0)]
 use str::{SplitTerminator, FromStr, StrExt};
+#[cfg(not(stage0))]
+use str::{SplitTerminator, FromStr};
 use string::{String, ToString};
 use vec::Vec;