use std::io::Cursor;
use std::io::prelude::*;
-use middle::def_id::DefId;
+use rustc::hir::def_id::DefId;
use middle::region;
use rustc::ty::subst;
use rustc::ty::subst::VecPerParamSpace;
use rustc::ty::{self, Ty, TyCtxt};
use rustc::util::nodemap::FnvHashMap;
-use rustc_front::hir;
+use rustc::hir;
use syntax::abi::Abi;
use syntax::ast;