4 files changed, 13 insertions, 13 deletions
diff --git a/compiler/GHC/CmmToAsm/X86/CodeGen.hs b/compiler/GHC/CmmToAsm/X86/CodeGen.hs
index deabf01425..1a22fc27f0 100644
--- a/compiler/GHC/CmmToAsm/X86/CodeGen.hs
+++ b/compiler/GHC/CmmToAsm/X86/CodeGen.hs
@@ -65,9 +65,9 @@ import GHC.Platform.Reg
 import GHC.Platform
 
 -- Our intermediate code:
-import BasicTypes
+import GHC.Types.Basic
 import GHC.Cmm.BlockId
-import Module           ( primUnitId )
+import GHC.Types.Module ( primUnitId )
 import GHC.Cmm.Utils
 import GHC.Cmm.Switch
 import GHC.Cmm
@@ -77,16 +77,16 @@ import GHC.Cmm.Dataflow.Graph
 import GHC.Cmm.Dataflow.Label
 import GHC.Cmm.CLabel
 import GHC.Core          ( Tickish(..) )
-import SrcLoc           ( srcSpanFile, srcSpanStartLine, srcSpanStartCol )
+import GHC.Types.SrcLoc  ( srcSpanFile, srcSpanStartLine, srcSpanStartCol )
 
 -- The rest:
-import ForeignCall      ( CCallConv(..) )
+import GHC.Types.ForeignCall ( CCallConv(..) )
 import OrdList
 import Outputable
 import FastString
 import GHC.Driver.Session
 import Util
-import UniqSupply       ( getUniqueM )
+import GHC.Types.Unique.Supply ( getUniqueM )
 
 import Control.Monad
 import Data.Bits
diff --git a/compiler/GHC/CmmToAsm/X86/Instr.hs b/compiler/GHC/CmmToAsm/X86/Instr.hs
index 71ee322516..846ef9b72f 100644
--- a/compiler/GHC/CmmToAsm/X86/Instr.hs
+++ b/compiler/GHC/CmmToAsm/X86/Instr.hs
@@ -38,11 +38,11 @@ import FastString
 import Outputable
 import GHC.Platform
 
-import BasicTypes       (Alignment)
+import GHC.Types.Basic (Alignment)
 import GHC.Cmm.CLabel
-import UniqSet
-import Unique
-import UniqSupply
+import GHC.Types.Unique.Set
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply
 import GHC.Cmm.DebugBlock (UnwindTable)
 
 import Control.Monad
diff --git a/compiler/GHC/CmmToAsm/X86/Ppr.hs b/compiler/GHC/CmmToAsm/X86/Ppr.hs
index 0dfd394d8e..357e24a9cc 100644
--- a/compiler/GHC/CmmToAsm/X86/Ppr.hs
+++ b/compiler/GHC/CmmToAsm/X86/Ppr.hs
@@ -36,12 +36,12 @@ import GHC.CmmToAsm.Ppr
 
 import GHC.Cmm.Dataflow.Collections
 import GHC.Cmm.Dataflow.Label
-import BasicTypes       (Alignment, mkAlignment, alignmentBytes)
+import GHC.Types.Basic (Alignment, mkAlignment, alignmentBytes)
 import GHC.Driver.Session
 import GHC.Cmm              hiding (topInfoTable)
 import GHC.Cmm.BlockId
 import GHC.Cmm.CLabel
-import Unique           ( pprUniqueAlways )
+import GHC.Types.Unique ( pprUniqueAlways )
 import GHC.Platform
 import FastString
 import Outputable
diff --git a/compiler/GHC/CmmToAsm/X86/RegInfo.hs b/compiler/GHC/CmmToAsm/X86/RegInfo.hs
index 597efe1c3e..5b2464c415 100644
--- a/compiler/GHC/CmmToAsm/X86/RegInfo.hs
+++ b/compiler/GHC/CmmToAsm/X86/RegInfo.hs
@@ -15,9 +15,9 @@ import GHC.Platform.Reg
 
 import Outputable
 import GHC.Platform
-import Unique
+import GHC.Types.Unique
 
-import UniqFM
+import GHC.Types.Unique.FM
 import GHC.CmmToAsm.X86.Regs