10 files changed, 24 insertions, 24 deletions
diff --git a/compiler/GHC/StgToCmm/ArgRep.hs b/compiler/GHC/StgToCmm/ArgRep.hs
index bd9abbfdea..26532b974d 100644
--- a/compiler/GHC/StgToCmm/ArgRep.hs
+++ b/compiler/GHC/StgToCmm/ArgRep.hs
@@ -19,9 +19,9 @@ import GhcPrelude
 
 import GHC.StgToCmm.Closure ( idPrimRep )
 
-import GHC.Runtime.Heap.Layout            ( WordOff )
+import GHC.Runtime.Heap.Layout ( WordOff )
 import Id               ( Id )
-import TyCon            ( PrimRep(..), primElemRepSizeB )
+import GHC.Core.TyCon   ( PrimRep(..), primElemRepSizeB )
 import BasicTypes       ( RepArity )
 import Constants        ( wORD64_SIZE )
 import GHC.Driver.Session
diff --git a/compiler/GHC/StgToCmm/Closure.hs b/compiler/GHC/StgToCmm/Closure.hs
index d42a7f4764..7bb73111a9 100644
--- a/compiler/GHC/StgToCmm/Closure.hs
+++ b/compiler/GHC/StgToCmm/Closure.hs
@@ -76,12 +76,12 @@ import GHC.Cmm.BlockId
 import GHC.Cmm.CLabel
 import Id
 import IdInfo
-import DataCon
+import GHC.Core.DataCon
 import Name
-import Type
-import TyCoRep
+import GHC.Core.Type
+import GHC.Core.TyCo.Rep
 import TcType
-import TyCon
+import GHC.Core.TyCon
 import GHC.Types.RepType
 import BasicTypes
 import Outputable
diff --git a/compiler/GHC/StgToCmm/DataCon.hs b/compiler/GHC/StgToCmm/DataCon.hs
index 199417ad34..43e2ab8e9a 100644
--- a/compiler/GHC/StgToCmm/DataCon.hs
+++ b/compiler/GHC/StgToCmm/DataCon.hs
@@ -36,7 +36,7 @@ import GHC.Cmm.Graph
 import GHC.Runtime.Heap.Layout
 import CostCentre
 import Module
-import DataCon
+import GHC.Core.DataCon
 import GHC.Driver.Session
 import FastString
 import Id
diff --git a/compiler/GHC/StgToCmm/Env.hs b/compiler/GHC/StgToCmm/Env.hs
index a0c49e69ee..fe886644c4 100644
--- a/compiler/GHC/StgToCmm/Env.hs
+++ b/compiler/GHC/StgToCmm/Env.hs
@@ -26,7 +26,7 @@ module GHC.StgToCmm.Env (
 
 import GhcPrelude
 
-import TyCon
+import GHC.Core.TyCon
 import GHC.StgToCmm.Monad
 import GHC.StgToCmm.Utils
 import GHC.StgToCmm.Closure
@@ -42,7 +42,7 @@ import GHC.Cmm.Graph
 import Name
 import Outputable
 import GHC.Stg.Syntax
-import Type
+import GHC.Core.Type
 import TysPrim
 import UniqFM
 import Util
diff --git a/compiler/GHC/StgToCmm/Expr.hs b/compiler/GHC/StgToCmm/Expr.hs
index cf0d4be8bc..f8e2cbd73d 100644
--- a/compiler/GHC/StgToCmm/Expr.hs
+++ b/compiler/GHC/StgToCmm/Expr.hs
@@ -37,15 +37,15 @@ import GHC.Cmm.BlockId
 import GHC.Cmm hiding ( succ )
 import GHC.Cmm.Info
 import GHC.Core
-import DataCon
-import GHC.Driver.Session         ( mAX_PTR_TAG )
+import GHC.Core.DataCon
+import GHC.Driver.Session ( mAX_PTR_TAG )
 import ForeignCall
 import Id
 import PrimOp
-import TyCon
-import Type             ( isUnliftedType )
-import GHC.Types.RepType          ( isVoidTy, countConRepArgs )
-import CostCentre       ( CostCentreStack, currentCCS )
+import GHC.Core.TyCon
+import GHC.Core.Type      ( isUnliftedType )
+import GHC.Types.RepType  ( isVoidTy, countConRepArgs )
+import CostCentre         ( CostCentreStack, currentCCS )
 import Maybes
 import Util
 import FastString
diff --git a/compiler/GHC/StgToCmm/Foreign.hs b/compiler/GHC/StgToCmm/Foreign.hs
index 04b8478c0f..b083736b20 100644
--- a/compiler/GHC/StgToCmm/Foreign.hs
+++ b/compiler/GHC/StgToCmm/Foreign.hs
@@ -32,7 +32,7 @@ import GHC.Cmm.BlockId (newBlockId)
 import GHC.Cmm
 import GHC.Cmm.Utils
 import GHC.Cmm.Graph
-import Type
+import GHC.Core.Type
 import GHC.Types.RepType
 import GHC.Cmm.CLabel
 import GHC.Runtime.Heap.Layout
@@ -43,7 +43,7 @@ import Outputable
 import UniqSupply
 import BasicTypes
 
-import TyCoRep
+import GHC.Core.TyCo.Rep
 import TysPrim
 import Util (zipEqual)
 
diff --git a/compiler/GHC/StgToCmm/Layout.hs b/compiler/GHC/StgToCmm/Layout.hs
index 1438077fd5..cf2024fa31 100644
--- a/compiler/GHC/StgToCmm/Layout.hs
+++ b/compiler/GHC/StgToCmm/Layout.hs
@@ -50,7 +50,7 @@ import GHC.Cmm.Info
 import GHC.Cmm.CLabel
 import GHC.Stg.Syntax
 import Id
-import TyCon             ( PrimRep(..), primRepSizeB )
+import GHC.Core.TyCon    ( PrimRep(..), primRepSizeB )
 import BasicTypes        ( RepArity )
 import GHC.Driver.Session
 import Module
diff --git a/compiler/GHC/StgToCmm/Prim.hs b/compiler/GHC/StgToCmm/Prim.hs
index d9ab05eebb..2555d764db 100644
--- a/compiler/GHC/StgToCmm/Prim.hs
+++ b/compiler/GHC/StgToCmm/Prim.hs
@@ -43,8 +43,8 @@ import GHC.Cmm.Graph
 import GHC.Stg.Syntax
 import GHC.Cmm
 import Module   ( rtsUnitId )
-import Type     ( Type, tyConAppTyCon )
-import TyCon
+import GHC.Core.Type    ( Type, tyConAppTyCon )
+import GHC.Core.TyCon
 import GHC.Cmm.CLabel
 import GHC.Cmm.Utils
 import PrimOp
diff --git a/compiler/GHC/StgToCmm/Ticky.hs b/compiler/GHC/StgToCmm/Ticky.hs
index 4257f02886..5968b9a944 100644
--- a/compiler/GHC/StgToCmm/Ticky.hs
+++ b/compiler/GHC/StgToCmm/Ticky.hs
@@ -131,8 +131,8 @@ import GHC.Driver.Session
 -- Turgid imports for showTypeCategory
 import PrelNames
 import TcType
-import TyCon
-import Predicate
+import GHC.Core.TyCon
+import GHC.Core.Predicate
 
 import Data.Maybe
 import qualified Data.Char
diff --git a/compiler/GHC/StgToCmm/Utils.hs b/compiler/GHC/StgToCmm/Utils.hs
index 310bf70a7c..e576c2d95e 100644
--- a/compiler/GHC/StgToCmm/Utils.hs
+++ b/compiler/GHC/StgToCmm/Utils.hs
@@ -64,8 +64,8 @@ import GHC.StgToCmm.CgUtils
 
 import ForeignCall
 import IdInfo
-import Type
-import TyCon
+import GHC.Core.Type
+import GHC.Core.TyCon
 import GHC.Runtime.Heap.Layout
 import Module
 import Literal