diff --git a/src/rustc/metadata.rs b/src/rustc/metadata.rs
index b161fd0b248d..5248b9e0cc83 100644
--- a/src/rustc/metadata.rs
+++ b/src/rustc/metadata.rs
@@ -45,8 +45,6 @@ mod back {
 mod driver {
     import session = driver_::session;
     export session;
-    import diagnostic = syntax::diagnostic;
-    export diagnostic;
 }
 
 mod util {
diff --git a/src/rustc/metadata/astencode.rs b/src/rustc/metadata/astencode.rs
index f59bb55b43d9..080a5431faa9 100644
--- a/src/rustc/metadata/astencode.rs
+++ b/src/rustc/metadata/astencode.rs
@@ -31,7 +31,7 @@ import c = common;
 import e = encoder;
 
 // used in testing:
-import driver::diagnostic;
+import syntax::diagnostic;
 import syntax::codemap;
 import syntax::parse;
 import syntax::print::pprust;