Test fixes and rebase conflicts

2 files changed, 2 insertions, 1 deletions

diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs
index 23cae2443c3..ec6eef07c95 100644
--- a/src/libstd/dynamic_lib.rs
+++ b/src/libstd/dynamic_lib.rs
@@ -286,6 +286,7 @@ pub mod dl {
     use os;
     use ptr;
     use result::{Ok, Err, Result};
+    use slice::ImmutableSlice;
     use str::StrSlice;
     use str;
     use string::String;
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 6e1eb82768c..d4e6251cebe 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -144,7 +144,7 @@ pub mod windows {
     use option::{None, Option};
     use option;
     use os::TMPBUF_SZ;
-    use slice::MutableSlice;
+    use slice::{MutableSlice, ImmutableSlice};
     use string::String;
     use str::StrSlice;
     use vec::Vec;