diff --git a/serde2/src/json/de.rs b/serde2/src/json/de.rs
index 3bdc52d7..8e38eeb9 100644
--- a/serde2/src/json/de.rs
+++ b/serde2/src/json/de.rs
@@ -1,6 +1,6 @@
 use std::char;
 use std::num::Float;
-use std::str::ScalarValue;
+use unicode::str::Utf16Item;
 use std::str;
 
 use de;
@@ -337,8 +337,8 @@ impl<Iter: Iterator<u8>> Parser<Iter> {
                                 }
 
                                 let buf = &[n1, try!(self.decode_hex_escape())];
-                                match str::utf16_items(buf.as_slice()).next() {
-                                    Some(ScalarValue(c)) => c,
+                                match ::unicode::str::utf16_items(buf.as_slice()).next() {
+                                    Some(Utf16Item::ScalarValue(c)) => c,
                                     _ => {
                                         return Err(self.error(ErrorCode::LoneLeadingSurrogateInHexEscape));
                                     }
diff --git a/serde2/src/lib.rs b/serde2/src/lib.rs
index 655d4798..b8a5da00 100644
--- a/serde2/src/lib.rs
+++ b/serde2/src/lib.rs
@@ -1,5 +1,7 @@
 #![feature(macro_rules)]
 
+extern crate unicode;
+
 pub use ser::{Serialize, Serializer};
 //pub use ser::{Visitor, VisitorState};
 //pub use ser::GatherTokens;