diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 72319227ccb..d75a4495a0e 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -136,6 +136,11 @@ pub mod middle {
     pub mod weak_lang_items;
 }
 
+pub mod mir {
+    pub mod repr;
+    pub mod tcx;
+}
+
 pub mod session;
 
 pub mod lint;
diff --git a/src/librustc_mir/repr.rs b/src/librustc/mir/repr.rs
similarity index 99%
rename from src/librustc_mir/repr.rs
rename to src/librustc/mir/repr.rs
index dad8961a788..d5d8da248e0 100644
--- a/src/librustc_mir/repr.rs
+++ b/src/librustc/mir/repr.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc::middle::const_eval::ConstVal;
-use rustc::middle::def_id::DefId;
-use rustc::middle::subst::Substs;
-use rustc::middle::ty::{AdtDef, ClosureSubsts, FnOutput, Region, Ty};
+use middle::const_eval::ConstVal;
+use middle::def_id::DefId;
+use middle::subst::Substs;
+use middle::ty::{AdtDef, ClosureSubsts, FnOutput, Region, Ty};
 use rustc_back::slice;
 use rustc_front::hir::InlineAsm;
 use syntax::ast::Name;
diff --git a/src/librustc_mir/tcx/mod.rs b/src/librustc/mir/tcx.rs
similarity index 98%
rename from src/librustc_mir/tcx/mod.rs
rename to src/librustc/mir/tcx.rs
index 4d034ae23b4..45cc0b8b413 100644
--- a/src/librustc_mir/tcx/mod.rs
+++ b/src/librustc/mir/tcx.rs
@@ -13,9 +13,9 @@
  * building is complete.
  */
 
-use repr::*;
-use rustc::middle::subst::Substs;
-use rustc::middle::ty::{self, AdtDef, Ty};
+use mir::repr::*;
+use middle::subst::Substs;
+use middle::ty::{self, AdtDef, Ty};
 use rustc_front::hir;
 
 #[derive(Copy, Clone, Debug)]
diff --git a/src/librustc_mir/build/block.rs b/src/librustc_mir/build/block.rs
index 21a77bbd232..5f7f87cb862 100644
--- a/src/librustc_mir/build/block.rs
+++ b/src/librustc_mir/build/block.rs
@@ -10,7 +10,7 @@
 
 use build::{BlockAnd, Builder};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 use rustc_front::hir;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
diff --git a/src/librustc_mir/build/cfg.rs b/src/librustc_mir/build/cfg.rs
index e44e3936885..d28724c30aa 100644
--- a/src/librustc_mir/build/cfg.rs
+++ b/src/librustc_mir/build/cfg.rs
@@ -14,7 +14,7 @@
 //! Routines for manipulating the control-flow graph.
 
 use build::CFG;
-use repr::*;
+use rustc::mir::repr::*;
 use syntax::codemap::Span;
 
 impl<'tcx> CFG<'tcx> {
diff --git a/src/librustc_mir/build/expr/as_constant.rs b/src/librustc_mir/build/expr/as_constant.rs
index b362f981764..6f186b8ada4 100644
--- a/src/librustc_mir/build/expr/as_constant.rs
+++ b/src/librustc_mir/build/expr/as_constant.rs
@@ -12,7 +12,7 @@
 
 use build::Builder;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr`, yielding a compile-time constant. Assumes that
diff --git a/src/librustc_mir/build/expr/as_lvalue.rs b/src/librustc_mir/build/expr/as_lvalue.rs
index d93304f034d..697799efd14 100644
--- a/src/librustc_mir/build/expr/as_lvalue.rs
+++ b/src/librustc_mir/build/expr/as_lvalue.rs
@@ -10,10 +10,10 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::Category;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr`, yielding an lvalue that we can move from etc.
diff --git a/src/librustc_mir/build/expr/as_operand.rs b/src/librustc_mir/build/expr/as_operand.rs
index 6b2c487d0f5..7738ebca26b 100644
--- a/src/librustc_mir/build/expr/as_operand.rs
+++ b/src/librustc_mir/build/expr/as_operand.rs
@@ -10,10 +10,10 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::Category;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr` into a value that can be used as an operand.
diff --git a/src/librustc_mir/build/expr/as_rvalue.rs b/src/librustc_mir/build/expr/as_rvalue.rs
index 3f3bceef1eb..7f69b9a521f 100644
--- a/src/librustc_mir/build/expr/as_rvalue.rs
+++ b/src/librustc_mir/build/expr/as_rvalue.rs
@@ -12,10 +12,10 @@
 
 use rustc_data_structures::fnv::FnvHashMap;
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::{Category, RvalueFunc};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr`, yielding an rvalue.
diff --git a/src/librustc_mir/build/expr/as_temp.rs b/src/librustc_mir/build/expr/as_temp.rs
index f0bbc6fb67e..53f8090ad0f 100644
--- a/src/librustc_mir/build/expr/as_temp.rs
+++ b/src/librustc_mir/build/expr/as_temp.rs
@@ -10,10 +10,10 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::Category;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     /// Compile `expr` into a fresh temporary. This is used when building
diff --git a/src/librustc_mir/build/expr/into.rs b/src/librustc_mir/build/expr/into.rs
index 7d79e90b3f1..ac3e87e6b62 100644
--- a/src/librustc_mir/build/expr/into.rs
+++ b/src/librustc_mir/build/expr/into.rs
@@ -10,12 +10,12 @@
 
 //! See docs in build/expr/mod.rs
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::expr::category::{Category, RvalueFunc};
 use build::scope::LoopScope;
 use hair::*;
-use repr::*;
 use rustc::middle::region::CodeExtent;
+use rustc::mir::repr::*;
 use syntax::codemap::Span;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
diff --git a/src/librustc_mir/build/into.rs b/src/librustc_mir/build/into.rs
index c6f1b777d66..66d6c49ef12 100644
--- a/src/librustc_mir/build/into.rs
+++ b/src/librustc_mir/build/into.rs
@@ -14,9 +14,9 @@
 //! wrapped up as expressions (e.g. blocks). To make this ergonomic, we use this
 //! latter `EvalInto` trait.
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 pub trait EvalInto<'tcx> {
     fn eval_into<'a>(self,
diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs
index cc6155844bc..0248f2fc49a 100644
--- a/src/librustc_mir/build/matches/mod.rs
+++ b/src/librustc_mir/build/matches/mod.rs
@@ -13,12 +13,12 @@
 //! includes the high-level algorithm, the submodules contain the
 //! details.
 
-use build::{BlockAnd, Builder};
-use repr::*;
+use build::{BlockAnd, BlockAndExtension, Builder};
 use rustc_data_structures::fnv::FnvHashMap;
 use rustc::middle::const_eval::ConstVal;
 use rustc::middle::region::CodeExtent;
 use rustc::middle::ty::{AdtDef, Ty};
+use rustc::mir::repr::*;
 use hair::*;
 use syntax::ast::{Name, NodeId};
 use syntax::codemap::Span;
diff --git a/src/librustc_mir/build/matches/simplify.rs b/src/librustc_mir/build/matches/simplify.rs
index b9637addccf..2c8e1c1ccf6 100644
--- a/src/librustc_mir/build/matches/simplify.rs
+++ b/src/librustc_mir/build/matches/simplify.rs
@@ -22,10 +22,10 @@
 //! sort of test: for example, testing which variant an enum is, or
 //! testing a value against a constant.
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::matches::{Binding, MatchPair, Candidate};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 use std::mem;
 
diff --git a/src/librustc_mir/build/matches/test.rs b/src/librustc_mir/build/matches/test.rs
index dffd83f1c41..968514cd05c 100644
--- a/src/librustc_mir/build/matches/test.rs
+++ b/src/librustc_mir/build/matches/test.rs
@@ -18,10 +18,10 @@
 use build::Builder;
 use build::matches::{Candidate, MatchPair, Test, TestKind};
 use hair::*;
-use repr::*;
 use rustc_data_structures::fnv::FnvHashMap;
 use rustc::middle::const_eval::ConstVal;
 use rustc::middle::ty::{self, Ty};
+use rustc::mir::repr::*;
 use syntax::codemap::Span;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
diff --git a/src/librustc_mir/build/matches/util.rs b/src/librustc_mir/build/matches/util.rs
index 18dde5537da..dbb00a13cd3 100644
--- a/src/librustc_mir/build/matches/util.rs
+++ b/src/librustc_mir/build/matches/util.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use build::matches::MatchPair;
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 use std::u32;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
diff --git a/src/librustc_mir/build/misc.rs b/src/librustc_mir/build/misc.rs
index 41274f3f373..bdcb183c0ac 100644
--- a/src/librustc_mir/build/misc.rs
+++ b/src/librustc_mir/build/misc.rs
@@ -13,8 +13,8 @@
 
 use build::Builder;
 use hair::*;
-use repr::*;
 use rustc::middle::ty::Ty;
+use rustc::mir::repr::*;
 use std::u32;
 use syntax::codemap::Span;
 
diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs
index f67c2920ba3..45368b5a68d 100644
--- a/src/librustc_mir/build/mod.rs
+++ b/src/librustc_mir/build/mod.rs
@@ -11,9 +11,10 @@
 use hair::cx::Cx;
 use rustc::middle::region::CodeExtent;
 use rustc::middle::ty::{FnOutput, Ty};
+use rustc::mir::repr::*;
 use rustc_data_structures::fnv::FnvHashMap;
 use rustc_front::hir;
-use repr::*;
+
 use syntax::ast;
 use syntax::codemap::Span;
 
@@ -41,7 +42,12 @@ struct CFG<'tcx> {
 #[must_use] // if you don't use one of these results, you're leaving a dangling edge
 struct BlockAnd<T>(BasicBlock, T);
 
-impl BasicBlock {
+trait BlockAndExtension {
+    fn and<T>(self, v: T) -> BlockAnd<T>;
+    fn unit(self) -> BlockAnd<()>;
+}
+
+impl BlockAndExtension for BasicBlock {
     fn and<T>(self, v: T) -> BlockAnd<T> {
         BlockAnd(self, v)
     }
diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs
index 1f3b6ad7bce..4d136d265e5 100644
--- a/src/librustc_mir/build/scope.rs
+++ b/src/librustc_mir/build/scope.rs
@@ -86,10 +86,10 @@ should go to.
 
 */
 
-use build::{BlockAnd, Builder, CFG};
-use repr::*;
+use build::{BlockAnd, BlockAndExtension, Builder, CFG};
 use rustc::middle::region::CodeExtent;
 use rustc::middle::ty::Ty;
+use rustc::mir::repr::*;
 use syntax::codemap::Span;
 
 pub struct Scope<'tcx> {
diff --git a/src/librustc_mir/build/stmt.rs b/src/librustc_mir/build/stmt.rs
index ac6b2a3c531..c70b22893ae 100644
--- a/src/librustc_mir/build/stmt.rs
+++ b/src/librustc_mir/build/stmt.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use build::{BlockAnd, Builder};
+use build::{BlockAnd, BlockAndExtension, Builder};
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 impl<'a,'tcx> Builder<'a,'tcx> {
     pub fn stmts(&mut self, mut block: BasicBlock, stmts: Vec<StmtRef<'tcx>>) -> BlockAnd<()> {
diff --git a/src/librustc_mir/graphviz/mod.rs b/src/librustc_mir/graphviz/mod.rs
index 9da05a27e89..f8cec83dc31 100644
--- a/src/librustc_mir/graphviz/mod.rs
+++ b/src/librustc_mir/graphviz/mod.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use dot;
-use repr::*;
+use rustc::mir::repr::*;
 use std::borrow::IntoCow;
 
 #[derive(Copy, Clone, PartialEq, Eq)]
diff --git a/src/librustc_mir/hair/cx/expr.rs b/src/librustc_mir/hair/cx/expr.rs
index 3380b3a6c14..24091d7dc37 100644
--- a/src/librustc_mir/hair/cx/expr.rs
+++ b/src/librustc_mir/hair/cx/expr.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use hair::*;
-use repr::*;
 use rustc_data_structures::fnv::FnvHashMap;
 use hair::cx::Cx;
 use hair::cx::block;
@@ -19,6 +18,7 @@ use rustc::middle::def;
 use rustc::middle::region::CodeExtent;
 use rustc::middle::pat_util;
 use rustc::middle::ty::{self, VariantDef, Ty};
+use rustc::mir::repr::*;
 use rustc_front::hir;
 use rustc_front::util as hir_util;
 use syntax::ext::mtwt;
diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs
index cb04df91042..8c19e620e46 100644
--- a/src/librustc_mir/hair/cx/mod.rs
+++ b/src/librustc_mir/hair/cx/mod.rs
@@ -16,7 +16,7 @@
  */
 
 use hair::*;
-use repr::*;
+use rustc::mir::repr::*;
 
 use rustc::middle::const_eval::{self, ConstVal};
 use rustc::middle::def_id::DefId;
diff --git a/src/librustc_mir/hair/cx/pattern.rs b/src/librustc_mir/hair/cx/pattern.rs
index 3d5cb831975..bea7950c33a 100644
--- a/src/librustc_mir/hair/cx/pattern.rs
+++ b/src/librustc_mir/hair/cx/pattern.rs
@@ -10,13 +10,13 @@
 
 use hair::*;
 use hair::cx::Cx;
-use repr::*;
 use rustc_data_structures::fnv::FnvHashMap;
 use rustc::middle::const_eval;
 use rustc::middle::def;
 use rustc::middle::pat_util::{pat_is_resolved_const, pat_is_binding};
 use rustc::middle::subst::Substs;
 use rustc::middle::ty::{self, Ty};
+use rustc::mir::repr::*;
 use rustc_front::hir;
 use syntax::ast;
 use syntax::ext::mtwt;
diff --git a/src/librustc_mir/hair/mod.rs b/src/librustc_mir/hair/mod.rs
index d2d7faac627..9a774ff3f57 100644
--- a/src/librustc_mir/hair/mod.rs
+++ b/src/librustc_mir/hair/mod.rs
@@ -14,7 +14,7 @@
 //! unit-tested and separated from the Rust source and compiler data
 //! structures.
 
-use repr::{BinOp, BorrowKind, Field, Literal, Mutability, UnOp};
+use rustc::mir::repr::{BinOp, BorrowKind, Field, Literal, Mutability, UnOp};
 use rustc::middle::def_id::DefId;
 use rustc::middle::region::CodeExtent;
 use rustc::middle::subst::Substs;
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index c391a01960f..a3110df9ae4 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -32,9 +32,7 @@ extern crate syntax;
 pub mod build;
 pub mod mir_map;
 mod hair;
-pub mod repr;
 mod graphviz;
 pub mod transform;
-pub mod tcx;
 pub mod visit;
 
diff --git a/src/librustc_mir/mir_map.rs b/src/librustc_mir/mir_map.rs
index 34ef7c3487f..39a315f3c41 100644
--- a/src/librustc_mir/mir_map.rs
+++ b/src/librustc_mir/mir_map.rs
@@ -23,7 +23,7 @@ extern crate rustc_front;
 use build;
 use dot;
 use transform::*;
-use repr::Mir;
+use rustc::mir::repr::Mir;
 use hair::cx::Cx;
 use std::fs::File;
 
diff --git a/src/librustc_mir/transform/erase_regions.rs b/src/librustc_mir/transform/erase_regions.rs
index e156fbf004f..1eb3bfd7e02 100644
--- a/src/librustc_mir/transform/erase_regions.rs
+++ b/src/librustc_mir/transform/erase_regions.rs
@@ -12,8 +12,8 @@
 //! We want to do this once just before trans, so trans does not have to take
 //! care erasing regions all over the place.
 
-use repr::*;
 use rustc::middle::ty;
+use rustc::mir::repr::*;
 use transform::MirPass;
 use mir_map::MirMap;
 
diff --git a/src/librustc_mir/transform/mod.rs b/src/librustc_mir/transform/mod.rs
index 9bec934143f..174718f7b16 100644
--- a/src/librustc_mir/transform/mod.rs
+++ b/src/librustc_mir/transform/mod.rs
@@ -12,7 +12,7 @@ pub mod simplify_cfg;
 pub mod erase_regions;
 mod util;
 
-use repr::Mir;
+use rustc::mir::repr::Mir;
 
 pub trait MirPass<'tcx> {
     fn run_on_mir(&mut self, mir: &mut Mir<'tcx>);
diff --git a/src/librustc_mir/transform/simplify_cfg.rs b/src/librustc_mir/transform/simplify_cfg.rs
index ee9dcbf1203..558276a13a8 100644
--- a/src/librustc_mir/transform/simplify_cfg.rs
+++ b/src/librustc_mir/transform/simplify_cfg.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use repr::*;
 use rustc::middle::const_eval::ConstVal;
+use rustc::mir::repr::*;
 use std::mem;
 use transform::util;
 use transform::MirPass;
diff --git a/src/librustc_mir/transform/util.rs b/src/librustc_mir/transform/util.rs
index e45cfa83954..95102694544 100644
--- a/src/librustc_mir/transform/util.rs
+++ b/src/librustc_mir/transform/util.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use repr::*;
+use rustc::mir::repr::*;
 
 /// Update basic block ids in all terminators using the given replacements,
 /// useful e.g. after removal of several basic blocks to update all terminators
diff --git a/src/librustc_mir/visit.rs b/src/librustc_mir/visit.rs
index b3ec2f10cf6..bef1850d3c5 100644
--- a/src/librustc_mir/visit.rs
+++ b/src/librustc_mir/visit.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use rustc::middle::ty::Region;
-use repr::*;
+use rustc::mir::repr::*;
 
 pub trait Visitor<'tcx> {
     // Override these, and call `self.super_xxx` to revert back to the
diff --git a/src/librustc_trans/trans/common.rs b/src/librustc_trans/trans/common.rs
index 275f4628788..fa500ab9355 100644
--- a/src/librustc_trans/trans/common.rs
+++ b/src/librustc_trans/trans/common.rs
@@ -40,7 +40,7 @@ use middle::traits;
 use middle::ty::{self, HasTypeFlags, Ty};
 use middle::ty::fold::{TypeFolder, TypeFoldable};
 use rustc_front::hir;
-use rustc_mir::repr::Mir;
+use rustc::mir::repr::Mir;
 use util::nodemap::{FnvHashMap, NodeMap};
 
 use arena::TypedArena;
@@ -1223,4 +1223,4 @@ pub fn get_static_val<'a, 'tcx>(ccx: &CrateContext<'a, 'tcx>,
     } else {
         base::get_extern_const(ccx, did, ty)
     }
-}
\ No newline at end of file
+}
diff --git a/src/librustc_trans/trans/mir/analyze.rs b/src/librustc_trans/trans/mir/analyze.rs
index fc76d1e787d..c3e6e0ff56b 100644
--- a/src/librustc_trans/trans/mir/analyze.rs
+++ b/src/librustc_trans/trans/mir/analyze.rs
@@ -12,7 +12,7 @@
 //! which do not.
 
 use rustc_data_structures::fnv::FnvHashSet;
-use rustc_mir::repr as mir;
+use rustc::mir::repr as mir;
 use rustc_mir::visit::{Visitor, LvalueContext};
 use trans::common::{self, Block};
 use super::rvalue;
diff --git a/src/librustc_trans/trans/mir/block.rs b/src/librustc_trans/trans/mir/block.rs
index 181a03790ee..3ce08fb2f60 100644
--- a/src/librustc_trans/trans/mir/block.rs
+++ b/src/librustc_trans/trans/mir/block.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use llvm::BasicBlockRef;
-use rustc_mir::repr as mir;
+use rustc::mir::repr as mir;
 use trans::base;
 use trans::build;
 use trans::common::Block;
diff --git a/src/librustc_trans/trans/mir/constant.rs b/src/librustc_trans/trans/mir/constant.rs
index 9af5bb43318..176cc298f96 100644
--- a/src/librustc_trans/trans/mir/constant.rs
+++ b/src/librustc_trans/trans/mir/constant.rs
@@ -10,7 +10,7 @@
 
 use middle::ty::{Ty, HasTypeFlags};
 use rustc::middle::const_eval::ConstVal;
-use rustc_mir::repr as mir;
+use rustc::mir::repr as mir;
 use trans::consts::{self, TrueConst};
 use trans::common::{self, Block};
 use trans::common::{C_bool, C_bytes, C_floating_f64, C_integral, C_str_slice};
diff --git a/src/librustc_trans/trans/mir/lvalue.rs b/src/librustc_trans/trans/mir/lvalue.rs
index 1f39a2aa048..5d9a1e44ac1 100644
--- a/src/librustc_trans/trans/mir/lvalue.rs
+++ b/src/librustc_trans/trans/mir/lvalue.rs
@@ -10,8 +10,8 @@
 
 use llvm::ValueRef;
 use rustc::middle::ty::{self, Ty, HasTypeFlags};
-use rustc_mir::repr as mir;
-use rustc_mir::tcx::LvalueTy;
+use rustc::mir::repr as mir;
+use rustc::mir::tcx::LvalueTy;
 use trans::adt;
 use trans::base;
 use trans::build;
diff --git a/src/librustc_trans/trans/mir/mod.rs b/src/librustc_trans/trans/mir/mod.rs
index c8eef7ff448..27c9feaad35 100644
--- a/src/librustc_trans/trans/mir/mod.rs
+++ b/src/librustc_trans/trans/mir/mod.rs
@@ -10,8 +10,8 @@
 
 use libc::c_uint;
 use llvm::{self, ValueRef};
-use rustc_mir::repr as mir;
-use rustc_mir::tcx::LvalueTy;
+use rustc::mir::repr as mir;
+use rustc::mir::tcx::LvalueTy;
 use trans::base;
 use trans::build;
 use trans::common::{self, Block};
diff --git a/src/librustc_trans/trans/mir/operand.rs b/src/librustc_trans/trans/mir/operand.rs
index 75d7b574382..106c1d05ab7 100644
--- a/src/librustc_trans/trans/mir/operand.rs
+++ b/src/librustc_trans/trans/mir/operand.rs
@@ -10,7 +10,7 @@
 
 use llvm::ValueRef;
 use rustc::middle::ty::{Ty, HasTypeFlags};
-use rustc_mir::repr as mir;
+use rustc::mir::repr as mir;
 use trans::base;
 use trans::common::{self, Block};
 use trans::datum;
diff --git a/src/librustc_trans/trans/mir/rvalue.rs b/src/librustc_trans/trans/mir/rvalue.rs
index cce71b25702..17e4ec8e827 100644
--- a/src/librustc_trans/trans/mir/rvalue.rs
+++ b/src/librustc_trans/trans/mir/rvalue.rs
@@ -10,7 +10,7 @@
 
 use llvm::ValueRef;
 use rustc::middle::ty::{self, Ty};
-use rustc_mir::repr as mir;
+use rustc::mir::repr as mir;
 
 use trans::asm;
 use trans::base;
diff --git a/src/librustc_trans/trans/mir/statement.rs b/src/librustc_trans/trans/mir/statement.rs
index 95ff049836e..9894626e284 100644
--- a/src/librustc_trans/trans/mir/statement.rs
+++ b/src/librustc_trans/trans/mir/statement.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use rustc::middle::ty::LvaluePreference;
-use rustc_mir::repr as mir;
+use rustc::mir::repr as mir;
 use trans::common::Block;
 use trans::debuginfo::DebugLoc;
 use trans::glue;