3 files changed, 6 insertions, 6 deletions
diff --git a/ghc/GHCi/UI/Info.hs b/ghc/GHCi/UI/Info.hs
index 81e5f4db6f..7f65cf11c9 100644
--- a/ghc/GHCi/UI/Info.hs
+++ b/ghc/GHCi/UI/Info.hs
@@ -33,10 +33,10 @@ import           System.Directory
 
 import qualified CoreUtils
 import           GHC.HsToCore
-import           DynFlags (HasDynFlags(..))
+import           GHC.Driver.Session (HasDynFlags(..))
 import           FastString
 import           GHC
-import           GhcMonad
+import           GHC.Driver.Monad
 import           Name
 import           NameSet
 import           Outputable
diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs
index 6bd584bbe6..675b92babe 100644
--- a/ghc/GHCi/UI/Monad.hs
+++ b/ghc/GHCi/UI/Monad.hs
@@ -37,13 +37,13 @@ module GHCi.UI.Monad (
 
 import GHCi.UI.Info (ModInfo)
 import qualified GHC
-import GhcMonad         hiding (liftIO)
+import GHC.Driver.Monad hiding (liftIO)
 import Outputable       hiding (printForUser, printForUserPartWay)
 import qualified Outputable
 import OccName
-import DynFlags
+import GHC.Driver.Session
 import FastString
-import HscTypes
+import GHC.Driver.Types
 import SrcLoc
 import Module
 import RdrName (mkOrig)
diff --git a/ghc/GHCi/UI/Tags.hs b/ghc/GHCi/UI/Tags.hs
index 09a8406d96..ce85bb30cf 100644
--- a/ghc/GHCi/UI/Tags.hs
+++ b/ghc/GHCi/UI/Tags.hs
@@ -30,7 +30,7 @@ import Data.Function
 import Data.List
 import Data.Maybe
 import Data.Ord
-import DriverPhases
+import GHC.Driver.Phases
 import Panic
 import Prelude
 import System.Directory