-use rustc::hir;
-use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::middle::cstore::{self, NativeLibrary};
use rustc::session::Session;
use rustc::ty::TyCtxt;
-use rustc::util::nodemap::FxHashSet;
+use rustc_data_structures::fx::FxHashSet;
+use rustc_hir as hir;
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_span::source_map::Span;
+use rustc_span::symbol::{kw, sym, Symbol};
use rustc_target::spec::abi::Abi;
use syntax::attr;
use syntax::feature_gate::feature_err;
-use syntax::source_map::Span;
-use syntax::symbol::{kw, sym, Symbol};
use syntax::{span_err, struct_span_err};
use rustc_error_codes::*;