4 files changed, 29 insertions, 17 deletions
diff --git a/compiler/GHC/Tc/TyCl/Build.hs b/compiler/GHC/Tc/TyCl/Build.hs
index 93f5eedb50..52a5592d67 100644
--- a/compiler/GHC/Tc/TyCl/Build.hs
+++ b/compiler/GHC/Tc/TyCl/Build.hs
@@ -34,6 +34,7 @@ import GHC.Core.Class
 import GHC.Core.TyCon
 import GHC.Core.Type
 import GHC.Types.Id
+import GHC.Types.SourceText
 import GHC.Tc.Utils.TcType
 import GHC.Core.Multiplicity
 
diff --git a/compiler/GHC/Tc/TyCl/Class.hs b/compiler/GHC/Tc/TyCl/Class.hs
index baad1622c0..92be85fa06 100644
--- a/compiler/GHC/Tc/TyCl/Class.hs
+++ b/compiler/GHC/Tc/TyCl/Class.hs
@@ -45,7 +45,6 @@ import GHC.Core.Multiplicity
 import GHC.Tc.Types.Origin
 import GHC.Tc.Utils.TcType
 import GHC.Tc.Utils.Monad
-import GHC.Driver.Phases (HscSource(..))
 import GHC.Tc.TyCl.Build( TcMethInfo )
 import GHC.Core.Class
 import GHC.Core.Coercion ( pprCoAxiom )
@@ -58,6 +57,7 @@ import GHC.Types.Name.Env
 import GHC.Types.Name.Set
 import GHC.Types.Var
 import GHC.Types.Var.Env
+import GHC.Types.SourceFile (HscSource(..))
 import GHC.Utils.Outputable
 import GHC.Utils.Panic
 import GHC.Types.SrcLoc
diff --git a/compiler/GHC/Tc/TyCl/Instance.hs b/compiler/GHC/Tc/TyCl/Instance.hs
index 4cc8a79e1e..cc47d1e348 100644
--- a/compiler/GHC/Tc/TyCl/Instance.hs
+++ b/compiler/GHC/Tc/TyCl/Instance.hs
@@ -67,11 +67,13 @@ import GHC.Types.Var.Env
 import GHC.Types.Var.Set
 import GHC.Data.Bag
 import GHC.Types.Basic
+import GHC.Types.Fixity
 import GHC.Driver.Session
 import GHC.Driver.Ppr
 import GHC.Utils.Error
 import GHC.Data.FastString
 import GHC.Types.Id
+import GHC.Types.SourceText
 import GHC.Data.List.SetOps
 import GHC.Types.Name
 import GHC.Types.Name.Set
diff --git a/compiler/GHC/Tc/TyCl/Utils.hs b/compiler/GHC/Tc/TyCl/Utils.hs
index a225fbdd6d..8755fbf762 100644
--- a/compiler/GHC/Tc/TyCl/Utils.hs
+++ b/compiler/GHC/Tc/TyCl/Utils.hs
@@ -34,40 +34,49 @@ import GHC.Prelude
 import GHC.Tc.Utils.Monad
 import GHC.Tc.Utils.Env
 import GHC.Tc.Gen.Bind( tcValBinds )
+import GHC.Tc.Utils.TcType
+
+import GHC.Builtin.Types( unitTy )
+import GHC.Builtin.Uniques ( mkBuiltinUnique )
+
+import GHC.Hs
+
 import GHC.Core.TyCo.Rep( Type(..), Coercion(..), MCoercion(..), UnivCoProvenance(..) )
 import GHC.Core.Multiplicity
-import GHC.Tc.Utils.TcType
 import GHC.Core.Predicate
-import GHC.Builtin.Types( unitTy )
 import GHC.Core.Make( rEC_SEL_ERROR_ID )
-import GHC.Hs
 import GHC.Core.Class
 import GHC.Core.Type
-import GHC.Driver.Types
 import GHC.Core.TyCon
 import GHC.Core.ConLike
 import GHC.Core.DataCon
-import GHC.Types.Name
-import GHC.Types.Name.Env
-import GHC.Types.Name.Reader ( mkVarUnqual )
-import GHC.Types.Id
-import GHC.Types.Id.Info
-import GHC.Types.Var.Env
-import GHC.Types.Var.Set
-import GHC.Types.Unique.Set
 import GHC.Core.TyCon.Set
 import GHC.Core.Coercion ( ltRole )
-import GHC.Types.Basic
-import GHC.Types.SrcLoc
-import GHC.Builtin.Uniques ( mkBuiltinUnique )
+
 import GHC.Utils.Outputable
 import GHC.Utils.Panic
 import GHC.Utils.Misc
+import GHC.Utils.FV as FV
+
 import GHC.Data.Maybe
 import GHC.Data.Bag
 import GHC.Data.FastString
-import GHC.Utils.FV as FV
+
 import GHC.Unit.Module
+
+import GHC.Types.Basic
+import GHC.Types.SrcLoc
+import GHC.Types.SourceFile
+import GHC.Types.SourceText
+import GHC.Types.Name
+import GHC.Types.Name.Env
+import GHC.Types.Name.Reader ( mkVarUnqual )
+import GHC.Types.Id
+import GHC.Types.Id.Info
+import GHC.Types.Var.Env
+import GHC.Types.Var.Set
+import GHC.Types.Unique.Set
+import GHC.Types.TyThing
 import qualified GHC.LanguageExtensions as LangExt
 
 import Control.Monad