6 files changed, 12 insertions, 14 deletions
diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs
index 00e9aabb..7dba9d03 100644
--- a/haddock-api/src/Haddock/Interface/AttachInstances.hs
+++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs
@@ -30,15 +30,15 @@ import qualified Data.Set as Set
 import GHC.Core.Class
 import GHC.Driver.Session
 import GHC.Core (isOrphan)
-import ErrUtils
+import GHC.Utils.Error
 import GHC.Core.FamInstEnv
 import GHC
 import GHC.Core.InstEnv
 import GHC.Types.Module ( ModuleSet, moduleSetElts )
-import MonadUtils (liftIO)
+import GHC.Utils.Monad (liftIO)
 import GHC.Types.Name
 import GHC.Types.Name.Env
-import Outputable (text, sep, (<+>))
+import GHC.Utils.Outputable (text, sep, (<+>))
 import GHC.Types.SrcLoc
 import GHC.Core.TyCon
 import GHC.Core.TyCo.Rep
diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index de4febf8..7e05e669 100644
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@ -34,7 +34,6 @@ import qualified Data.Map as M
 import Data.Map (Map)
 import Data.List
 import Data.Maybe
-import Data.Ord
 import Control.Applicative
 import Control.Monad
 import Data.Traversable
@@ -50,12 +49,12 @@ import GHC.Types.Name
 import GHC.Types.Name.Set
 import GHC.Types.Name.Env
 import GHC.Driver.Packages   ( lookupModuleInAllPackages, PackageName(..) )
-import Bag
+import GHC.Data.Bag
 import GHC.Types.Name.Reader
 import GHC.Tc.Types
-import FastString ( unpackFS, bytesFS )
+import GHC.Data.FastString ( unpackFS, bytesFS )
 import GHC.Types.Basic ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
-import qualified Outputable as O
+import qualified GHC.Utils.Outputable as O
 
 
 -- | Use a 'TypecheckedModule' to produce an 'Interface'.
diff --git a/haddock-api/src/Haddock/Interface/Json.hs b/haddock-api/src/Haddock/Interface/Json.hs
index 88387edd..701c68bf 100644
--- a/haddock-api/src/Haddock/Interface/Json.hs
+++ b/haddock-api/src/Haddock/Interface/Json.hs
@@ -6,10 +6,10 @@ module Haddock.Interface.Json (
   ) where
 
 import GHC.Types.Basic
-import Json
+import GHC.Utils.Json
 import GHC.Types.Module
 import GHC.Types.Name
-import Outputable
+import GHC.Utils.Outputable
 
 import Control.Arrow
 import Data.Map (Map)
diff --git a/haddock-api/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs
index 22279614..2b03ecfa 100644
--- a/haddock-api/src/Haddock/Interface/LexParseRn.hs
+++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs
@@ -32,9 +32,9 @@ import Haddock.Interface.ParseModuleHeader
 import Haddock.Parser
 import Haddock.Types
 import GHC.Types.Name
-import Outputable ( showPpr, showSDoc )
+import GHC.Utils.Outputable ( showPpr, showSDoc )
 import GHC.Types.Name.Reader
-import EnumSet
+import GHC.Data.EnumSet as EnumSet
 import GHC.Rename.Env (dataTcOccs)
 
 processDocStrings :: DynFlags -> Maybe Package -> GlobalRdrEnv -> [HsDocString]
diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index 4ca4a13d..59c2f818 100644
--- a/haddock-api/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
@@ -19,10 +19,9 @@ import Data.Traversable (mapM)
 import Haddock.GhcUtils
 import Haddock.Types
 
-import Bag (emptyBag)
+import GHC.Data.Bag (emptyBag)
 import GHC hiding (NoLink)
 import GHC.Types.Name
-import Outputable ( panic )
 import GHC.Types.Name.Reader (RdrName(Exact))
 import GHC.Builtin.Types (eqTyCon_RDR)
 
diff --git a/haddock-api/src/Haddock/Interface/Specialize.hs b/haddock-api/src/Haddock/Interface/Specialize.hs
index 52cbcdbf..a939dfbd 100644
--- a/haddock-api/src/Haddock/Interface/Specialize.hs
+++ b/haddock-api/src/Haddock/Interface/Specialize.hs
@@ -14,7 +14,7 @@ import Haddock.Types
 
 import GHC
 import GHC.Types.Name
-import FastString
+import GHC.Data.FastString
 import GHC.Builtin.Types.Prim ( funTyConName )
 import GHC.Builtin.Types ( listTyConName )