7 files changed, 25 insertions, 25 deletions
diff --git a/haddock-api/src/Haddock/Interface/AttachInstances.hs b/haddock-api/src/Haddock/Interface/AttachInstances.hs
index 65deffd3..5bec4d34 100644
--- a/haddock-api/src/Haddock/Interface/AttachInstances.hs
+++ b/haddock-api/src/Haddock/Interface/AttachInstances.hs
@@ -34,16 +34,16 @@ import ErrUtils
 import GHC.Core.FamInstEnv
 import GHC
 import GHC.Core.InstEnv
-import Module ( ModuleSet, moduleSetElts )
+import GHC.Types.Module ( ModuleSet, moduleSetElts )
 import MonadUtils (liftIO)
-import Name
-import NameEnv
+import GHC.Types.Name
+import GHC.Types.Name.Env
 import Outputable (text, sep, (<+>))
-import SrcLoc
+import GHC.Types.SrcLoc
 import GHC.Core.TyCon
 import GHC.Core.TyCo.Rep
 import TysPrim( funTyConName )
-import Var hiding (varName)
+import GHC.Types.Var hiding (varName)
 
 type ExportedNames = Set.Set Name
 type Modules = Set.Set Module
diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index a606076d..6073f735 100644
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@ -39,22 +39,22 @@ import Control.Applicative
 import Control.Monad
 import Data.Traversable
 
-import Avail hiding (avail)
-import qualified Avail
-import qualified Module
-import qualified SrcLoc
+import GHC.Types.Avail hiding (avail)
+import qualified GHC.Types.Avail  as Avail
+import qualified GHC.Types.Module as Module
+import qualified GHC.Types.SrcLoc as SrcLoc
 import GHC.Core.ConLike (ConLike(..))
 import GHC
 import GHC.Driver.Types
-import Name
-import NameSet
-import NameEnv
+import GHC.Types.Name
+import GHC.Types.Name.Set
+import GHC.Types.Name.Env
 import GHC.Driver.Packages   ( lookupModuleInAllPackages, PackageName(..) )
 import Bag
-import RdrName
+import GHC.Types.Name.Reader
 import TcRnTypes
 import FastString ( unpackFS, bytesFS )
-import BasicTypes ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
+import GHC.Types.Basic ( StringLiteral(..), SourceText(..), PromotionFlag(..) )
 import qualified Outputable as O
 
 
@@ -869,7 +869,7 @@ availExportItem is_sig modMap thisMod semMod warnings exportedNames
         constructor_names =
           filter isDataConName (availSubordinates avail)
 
--- this heavily depends on the invariants stated in Avail
+-- this heavily depends on the invariants stated in GHC.Types.Avail
 availExportsDecl :: AvailInfo -> Bool
 availExportsDecl (AvailTC ty_name names _)
   | n : _ <- names = ty_name == n
diff --git a/haddock-api/src/Haddock/Interface/Json.hs b/haddock-api/src/Haddock/Interface/Json.hs
index 636d3e19..88387edd 100644
--- a/haddock-api/src/Haddock/Interface/Json.hs
+++ b/haddock-api/src/Haddock/Interface/Json.hs
@@ -5,10 +5,10 @@ module Haddock.Interface.Json (
   , renderJson
   ) where
 
-import BasicTypes
+import GHC.Types.Basic
 import Json
-import Module
-import Name
+import GHC.Types.Module
+import GHC.Types.Name
 import Outputable
 
 import Control.Arrow
diff --git a/haddock-api/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs
index 7323e68e..22279614 100644
--- a/haddock-api/src/Haddock/Interface/LexParseRn.hs
+++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs
@@ -19,7 +19,7 @@ module Haddock.Interface.LexParseRn
   , processModuleHeader
   ) where
 
-import Avail
+import GHC.Types.Avail
 import Control.Arrow
 import Control.Monad
 import Data.List
@@ -31,9 +31,9 @@ import GHC
 import Haddock.Interface.ParseModuleHeader
 import Haddock.Parser
 import Haddock.Types
-import Name
+import GHC.Types.Name
 import Outputable ( showPpr, showSDoc )
-import RdrName
+import GHC.Types.Name.Reader
 import EnumSet
 import GHC.Rename.Env (dataTcOccs)
 
diff --git a/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
index 4e91e321..611d8b6f 100644
--- a/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
+++ b/haddock-api/src/Haddock/Interface/ParseModuleHeader.hs
@@ -16,7 +16,7 @@ import Data.Char
 import GHC.Driver.Session
 import Haddock.Parser
 import Haddock.Types
-import RdrName
+import GHC.Types.Name.Reader
 
 -- -----------------------------------------------------------------------------
 -- Parsing module headers
diff --git a/haddock-api/src/Haddock/Interface/Rename.hs b/haddock-api/src/Haddock/Interface/Rename.hs
index 5b96c0a0..47aeb31a 100644
--- a/haddock-api/src/Haddock/Interface/Rename.hs
+++ b/haddock-api/src/Haddock/Interface/Rename.hs
@@ -21,9 +21,9 @@ import Haddock.Types
 
 import Bag (emptyBag)
 import GHC hiding (NoLink)
-import Name
+import GHC.Types.Name
 import Outputable ( panic )
-import RdrName (RdrName(Exact))
+import GHC.Types.Name.Reader (RdrName(Exact))
 import TysWiredIn (eqTyCon_RDR)
 
 import Control.Applicative
diff --git a/haddock-api/src/Haddock/Interface/Specialize.hs b/haddock-api/src/Haddock/Interface/Specialize.hs
index 03cc1b7e..92ad33d3 100644
--- a/haddock-api/src/Haddock/Interface/Specialize.hs
+++ b/haddock-api/src/Haddock/Interface/Specialize.hs
@@ -13,7 +13,7 @@ import Haddock.Syb
 import Haddock.Types
 
 import GHC
-import Name
+import GHC.Types.Name
 import FastString
 import TysPrim ( funTyConName )
 import TysWiredIn ( listTyConName )