10 files changed, 25 insertions, 25 deletions
diff --git a/compiler/GHC/Iface/Binary.hs b/compiler/GHC/Iface/Binary.hs
index af0e9bfac6..c5850f1eaf 100644
--- a/compiler/GHC/Iface/Binary.hs
+++ b/compiler/GHC/Iface/Binary.hs
@@ -38,10 +38,10 @@ import GhcPrelude
 import TcRnMonad
 import PrelInfo   ( isKnownKeyName, lookupKnownKeyName )
 import GHC.Iface.Env
-import HscTypes
+import GHC.Driver.Types
 import Module
 import Name
-import DynFlags
+import GHC.Driver.Session
 import UniqFM
 import UniqSupply
 import Panic
diff --git a/compiler/GHC/Iface/Env.hs b/compiler/GHC/Iface/Env.hs
index fcb1e2dcfb..687989f0a6 100644
--- a/compiler/GHC/Iface/Env.hs
+++ b/compiler/GHC/Iface/Env.hs
@@ -25,7 +25,7 @@ module GHC.Iface.Env (
 import GhcPrelude
 
 import TcRnMonad
-import HscTypes
+import GHC.Driver.Types
 import Type
 import Var
 import Name
diff --git a/compiler/GHC/Iface/Ext/Ast.hs b/compiler/GHC/Iface/Ext/Ast.hs
index 690aa323c9..edeeaf651e 100644
--- a/compiler/GHC/Iface/Ext/Ast.hs
+++ b/compiler/GHC/Iface/Ext/Ast.hs
@@ -28,7 +28,7 @@ import ConLike                    ( conLikeName )
 import GHC.HsToCore               ( deSugarExpr )
 import FieldLabel
 import GHC.Hs
-import HscTypes
+import GHC.Driver.Types
 import Module                     ( ModuleName, ml_hs_file )
 import MonadUtils                 ( concatMapM, liftIO )
 import Name                       ( Name, nameSrcSpan, setNameLoc )
diff --git a/compiler/GHC/Iface/Ext/Utils.hs b/compiler/GHC/Iface/Ext/Utils.hs
index eba14f190a..007634bae6 100644
--- a/compiler/GHC/Iface/Ext/Utils.hs
+++ b/compiler/GHC/Iface/Ext/Utils.hs
@@ -7,7 +7,7 @@ module GHC.Iface.Ext.Utils where
 import GhcPrelude
 
 import CoreMap
-import DynFlags                   ( DynFlags )
+import GHC.Driver.Session                   ( DynFlags )
 import FastString                 ( FastString, mkFastString )
 import GHC.Iface.Type
 import Name hiding (varName)
diff --git a/compiler/GHC/Iface/Load.hs b/compiler/GHC/Iface/Load.hs
index c11d4b3e4f..cde0e8c9e2 100644
--- a/compiler/GHC/Iface/Load.hs
+++ b/compiler/GHC/Iface/Load.hs
@@ -40,10 +40,10 @@ import {-# SOURCE #-} GHC.IfaceToCore
    ( tcIfaceDecl, tcIfaceRules, tcIfaceInst, tcIfaceFamInst
    , tcIfaceAnnotations, tcIfaceCompleteSigs )
 
-import DynFlags
+import GHC.Driver.Session
 import GHC.Iface.Syntax
 import GHC.Iface.Env
-import HscTypes
+import GHC.Driver.Types
 
 import BasicTypes hiding (SuccessFlag(..))
 import TcRnMonad
@@ -65,7 +65,7 @@ import Avail
 import Module
 import Maybes
 import ErrUtils
-import Finder
+import GHC.Driver.Finder
 import UniqFM
 import SrcLoc
 import Outputable
@@ -74,11 +74,11 @@ import Panic
 import Util
 import FastString
 import Fingerprint
-import Hooks
+import GHC.Driver.Hooks
 import FieldLabel
 import GHC.Iface.Rename
 import UniqDSet
-import Plugins
+import GHC.Driver.Plugins
 
 import Control.Monad
 import Control.Exception
@@ -863,7 +863,7 @@ Note [Home module load error]
 If the sought-for interface is in the current package (as determined
 by -package-name flag) then it jolly well should already be in the HPT
 because we process home-package modules in dependency order.  (Except
-in one-shot mode; see notes with hsc_HPT decl in HscTypes).
+in one-shot mode; see notes with hsc_HPT decl in GHC.Driver.Types).
 
 It is possible (though hard) to get this error through user behaviour.
   * Suppose package P (modules P1, P2) depends on package Q (modules Q1,
diff --git a/compiler/GHC/Iface/Load.hs-boot b/compiler/GHC/Iface/Load.hs-boot
index e3dce1d68f..a2af2a1a9a 100644
--- a/compiler/GHC/Iface/Load.hs-boot
+++ b/compiler/GHC/Iface/Load.hs-boot
@@ -2,7 +2,7 @@ module GHC.Iface.Load where
 
 import Module (Module)
 import TcRnMonad (IfM)
-import HscTypes (ModIface)
+import GHC.Driver.Types (ModIface)
 import Outputable (SDoc)
 
 loadSysInterface :: SDoc -> Module -> IfM lcl ModIface
diff --git a/compiler/GHC/Iface/Rename.hs b/compiler/GHC/Iface/Rename.hs
index 693f9068c4..3cadf15e80 100644
--- a/compiler/GHC/Iface/Rename.hs
+++ b/compiler/GHC/Iface/Rename.hs
@@ -21,7 +21,7 @@ import GhcPrelude
 
 import SrcLoc
 import Outputable
-import HscTypes
+import GHC.Driver.Types
 import Module
 import UniqFM
 import Avail
@@ -38,13 +38,13 @@ import BasicTypes
 
 -- a bit vexing
 import {-# SOURCE #-} GHC.Iface.Load
-import DynFlags
+import GHC.Driver.Session
 
 import qualified Data.Traversable as T
 
 import Bag
 import Data.IORef
-import NameShape
+import GHC.Types.Name.Shape
 import GHC.Iface.Env
 
 tcRnMsgMaybe :: IO (Either ErrorMessages a) -> TcM a
diff --git a/compiler/GHC/Iface/Syntax.hs b/compiler/GHC/Iface/Syntax.hs
index c831d09c7f..cea861de27 100644
--- a/compiler/GHC/Iface/Syntax.hs
+++ b/compiler/GHC/Iface/Syntax.hs
@@ -403,10 +403,10 @@ ifaceDeclImplicitBndrs :: IfaceDecl -> [OccName]
 --  *Excludes* the 'main' name, but *includes* the implicitly-bound names
 -- Deeply revolting, because it has to predict what gets bound,
 -- especially the question of whether there's a wrapper for a datacon
--- See Note [Implicit TyThings] in HscTypes
+-- See Note [Implicit TyThings] in GHC.Driver.Types
 
 -- N.B. the set of names returned here *must* match the set of
--- TyThings returned by HscTypes.implicitTyThings, in the sense that
+-- TyThings returned by GHC.Driver.Types.implicitTyThings, in the sense that
 -- TyThing.getOccName should define a bijection between the two lists.
 -- This invariant is used in GHC.Iface.Load.loadDecl (see note [Tricky iface loop])
 -- The order of the list does not matter.
@@ -1741,7 +1741,7 @@ not happen.   Here's the one that bit me:
      data DynFlags = DF ... PackageState ...
 
    module Packages where
-     import DynFlags
+     import GHC.Driver.Session
      data PackageState = PS ...
      lookupModule (df :: DynFlags)
         = case df of
diff --git a/compiler/GHC/Iface/Tidy.hs b/compiler/GHC/Iface/Tidy.hs
index 3d08b139b5..49a5a29856 100644
--- a/compiler/GHC/Iface/Tidy.hs
+++ b/compiler/GHC/Iface/Tidy.hs
@@ -17,7 +17,7 @@ module GHC.Iface.Tidy (
 import GhcPrelude
 
 import TcRnTypes
-import DynFlags
+import GHC.Driver.Session
 import CoreSyn
 import CoreUnfold
 import CoreFVs
@@ -53,7 +53,7 @@ import DataCon
 import TyCon
 import Class
 import Module
-import HscTypes
+import GHC.Driver.Types
 import Maybes
 import UniqSupply
 import Outputable
diff --git a/compiler/GHC/Iface/Utils.hs b/compiler/GHC/Iface/Utils.hs
index bf221bd88c..83f46bd774 100644
--- a/compiler/GHC/Iface/Utils.hs
+++ b/compiler/GHC/Iface/Utils.hs
@@ -83,9 +83,9 @@ import InstEnv
 import FamInstEnv
 import TcRnMonad
 import GHC.Hs
-import HscTypes
-import Finder
-import DynFlags
+import GHC.Driver.Types
+import GHC.Driver.Finder
+import GHC.Driver.Session
 import VarEnv
 import Var
 import Name
@@ -108,7 +108,7 @@ import Binary
 import Fingerprint
 import Exception
 import UniqSet
-import Packages
+import GHC.Driver.Packages
 import GHC.HsToCore.Docs
 
 import Control.Monad
@@ -120,7 +120,7 @@ import Data.Ord
 import Data.IORef
 import System.Directory
 import System.FilePath
-import Plugins ( PluginRecompile(..), PluginWithArgs(..), LoadedPlugin(..),
+import GHC.Driver.Plugins ( PluginRecompile(..), PluginWithArgs(..), LoadedPlugin(..),
                  pluginRecompile', plugins )
 
 --Qualified import so we can define a Semigroup instance