use super::object_safety;
use super::util;
-use middle::def_id::DefId;
+use hir::def_id::DefId;
use infer;
use infer::{InferCtxt, InferOk, TypeFreshener, TypeOrigin};
use ty::subst::{Subst, Substs, TypeSpace};
use std::fmt;
use std::rc::Rc;
use syntax::abi::Abi;
-use rustc_front::hir;
+use hir;
use util::common::ErrorReported;
use util::nodemap::FnvHashMap;