diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index c66e0bdc833..c44af3dd523 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -80,11 +80,10 @@ mod test {
 
     fn parse_attributes(source: str) -> [ast::attribute] {
         import rustc::syntax::parse::parser;
-        // FIXME: Uncommenting this results in rustc bugs
-        //import rustc::syntax::codemap;
+        import rustc::syntax::codemap;
         import rustc::driver::diagnostic;
 
-        let cm = rustc::syntax::codemap::new_codemap();
+        let cm = codemap::new_codemap();
         let handler = diagnostic::mk_handler(none);
         let parse_sess = @{
             cm: cm,
diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs
index 667bb5d8580..dc9849028d7 100644
--- a/src/rustdoc/fold.rs
+++ b/src/rustdoc/fold.rs
@@ -1,6 +1,3 @@
-// FIXME: Random import to solve the mystery resolve bug
-import std;
-
 export fold;
 export fold_crate, fold_mod, fold_fn;
 export default_seq_fold;