diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index a2a34537085..7c295a824d3 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -1,3 +1,6 @@
+import std::map;
+import rustc::syntax::ast;
+
 export parse_fn;
 
 fn parse_fn(
diff --git a/src/rustdoc/doc.rs b/src/rustdoc/doc.rs
index b1324713e11..71e3bf030e7 100644
--- a/src/rustdoc/doc.rs
+++ b/src/rustdoc/doc.rs
@@ -1,3 +1,5 @@
+import std::map;
+
 type ast_id = int;
 
 type cratedoc = ~{
diff --git a/src/rustdoc/gen.rs b/src/rustdoc/gen.rs
index e7abf6a4339..f39db545031 100644
--- a/src/rustdoc/gen.rs
+++ b/src/rustdoc/gen.rs
@@ -1,3 +1,8 @@
+import std::io;
+import std::io::writer_util;
+import rustc::syntax::ast;
+import rustc::syntax::print::pprust;
+
 type ctxt = {
     ps: pprust::ps,
     w: io::writer
diff --git a/src/rustdoc/parse.rs b/src/rustdoc/parse.rs
index 2969c423b73..a55694d55e5 100644
--- a/src/rustdoc/parse.rs
+++ b/src/rustdoc/parse.rs
@@ -1,3 +1,8 @@
+import rustc::driver::diagnostic;
+import rustc::syntax::ast;
+import rustc::syntax::codemap;
+import rustc::syntax::parse::parser;
+
 export from_file, from_str;
 
 fn new_parse_sess() -> parser::parse_sess {
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index 46ccf087b7e..fb1c105547b 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -5,18 +5,6 @@
 use std;
 use rustc;
 
-import option;
-import option::{some, none};
-import rustc::driver::diagnostic;
-import rustc::syntax::ast;
-import rustc::syntax::codemap;
-import rustc::syntax::parse::parser;
-import rustc::syntax::print::pprust;
-import rustc::syntax::visit;
-import std::io;
-import io::writer_util;
-import std::map;
-
 #[doc(
   brief = "Main function.",
   desc = "Command-line arguments:
@@ -27,7 +15,7 @@ import std::map;
 fn main(argv: [str]) {
 
     if vec::len(argv) != 2u {
-        io::println(#fmt("usage: %s <input>", argv[0]));
+        std::io::println(#fmt("usage: %s <input>", argv[0]));
         ret;
     }
 
@@ -35,5 +23,5 @@ fn main(argv: [str]) {
     let default_name = source_file;
     let crate = parse::from_file(source_file);
     let doc = extract::extract(crate, default_name);
-    gen::write_markdown(doc, crate, io::stdout());
+    gen::write_markdown(doc, crate, std::io::stdout());
 }