3 files changed, 29 insertions, 16 deletions
diff --git a/compiler/GHC/ByteCode/Asm.hs b/compiler/GHC/ByteCode/Asm.hs
index c344823ccb..92255f9ea0 100644
--- a/compiler/GHC/ByteCode/Asm.hs
+++ b/compiler/GHC/ByteCode/Asm.hs
@@ -19,27 +19,30 @@ module GHC.ByteCode.Asm (
 
 import GHC.Prelude
 
+import GHC.Driver.Env
+import GHC.Driver.Session
+
 import GHC.ByteCode.Instr
 import GHC.ByteCode.InfoTable
 import GHC.ByteCode.Types
 import GHCi.RemoteTypes
 import GHC.Runtime.Interpreter
+import GHC.Runtime.Heap.Layout
 
-import GHC.Driver.Types
 import GHC.Types.Name
 import GHC.Types.Name.Set
 import GHC.Types.Literal
+import GHC.Types.Unique
+import GHC.Types.Unique.DSet
+
+import GHC.Utils.Outputable
+import GHC.Utils.Panic
+import GHC.Utils.Misc
+
 import GHC.Core.TyCon
 import GHC.Data.FastString
 import GHC.StgToCmm.Layout     ( ArgRep(..) )
-import GHC.Runtime.Heap.Layout
-import GHC.Driver.Session
-import GHC.Utils.Outputable
-import GHC.Utils.Panic
 import GHC.Platform
-import GHC.Utils.Misc
-import GHC.Types.Unique
-import GHC.Types.Unique.DSet
 
 -- From iserv
 import SizedSeq
diff --git a/compiler/GHC/ByteCode/InfoTable.hs b/compiler/GHC/ByteCode/InfoTable.hs
index 567209adda..594a68c12b 100644
--- a/compiler/GHC/ByteCode/InfoTable.hs
+++ b/compiler/GHC/ByteCode/InfoTable.hs
@@ -12,21 +12,26 @@ module GHC.ByteCode.InfoTable ( mkITbls ) where
 
 import GHC.Prelude
 
+import GHC.Driver.Session
+import GHC.Driver.Env
+
 import GHC.Platform
 import GHC.Platform.Profile
 
 import GHC.ByteCode.Types
 import GHC.Runtime.Interpreter
-import GHC.Driver.Session
-import GHC.Driver.Types
+
 import GHC.Types.Name       ( Name, getName )
 import GHC.Types.Name.Env
+import GHC.Types.RepType
+
 import GHC.Core.DataCon     ( DataCon, dataConRepArgTys, dataConIdentity )
 import GHC.Core.TyCon       ( TyCon, tyConFamilySize, isDataTyCon, tyConDataCons )
 import GHC.Core.Multiplicity     ( scaledThing )
-import GHC.Types.RepType
+
 import GHC.StgToCmm.Layout  ( mkVirtConstrSizes )
 import GHC.StgToCmm.Closure ( tagForCon, NonVoid (..) )
+
 import GHC.Utils.Misc
 import GHC.Utils.Panic
 
diff --git a/compiler/GHC/ByteCode/Linker.hs b/compiler/GHC/ByteCode/Linker.hs
index a158886369..7b532b96d5 100644
--- a/compiler/GHC/ByteCode/Linker.hs
+++ b/compiler/GHC/ByteCode/Linker.hs
@@ -19,24 +19,29 @@ module GHC.ByteCode.Linker (
 
 import GHC.Prelude
 
+import GHC.Driver.Env
+
+import GHC.Runtime.Interpreter
+import GHC.ByteCode.Types
 import GHCi.RemoteTypes
 import GHCi.ResolvedBCO
 import GHCi.BreakArray
 import SizedSeq
 
-import GHC.Runtime.Interpreter
-import GHC.ByteCode.Types
-import GHC.Driver.Types
-import GHC.Types.Name
-import GHC.Types.Name.Env
 import GHC.Builtin.PrimOps
+
 import GHC.Unit.Types
 import GHC.Unit.Module.Name
+
 import GHC.Data.FastString
+
 import GHC.Utils.Panic
 import GHC.Utils.Outputable
 import GHC.Utils.Misc
 
+import GHC.Types.Name
+import GHC.Types.Name.Env
+
 -- Standard libraries
 import Data.Array.Unboxed
 import Foreign.Ptr