4 files changed, 6 insertions, 6 deletions
diff --git a/compiler/main/SysTools/ExtraObj.hs b/compiler/main/SysTools/ExtraObj.hs
index 13236933e6..9ff428f9ca 100644
--- a/compiler/main/SysTools/ExtraObj.hs
+++ b/compiler/main/SysTools/ExtraObj.hs
@@ -15,8 +15,8 @@ module SysTools.ExtraObj (
 
 import AsmUtils
 import ErrUtils
-import DynFlags
-import Packages
+import GHC.Driver.Session
+import GHC.Driver.Packages
 import GHC.Platform
 import Outputable
 import SrcLoc           ( noSrcSpan )
diff --git a/compiler/main/SysTools/Info.hs b/compiler/main/SysTools/Info.hs
index 93c2819528..b6b74406af 100644
--- a/compiler/main/SysTools/Info.hs
+++ b/compiler/main/SysTools/Info.hs
@@ -10,7 +10,7 @@ module SysTools.Info where
 
 import Exception
 import ErrUtils
-import DynFlags
+import GHC.Driver.Session
 import Outputable
 import Util
 
diff --git a/compiler/main/SysTools/Process.hs b/compiler/main/SysTools/Process.hs
index c7255b6a93..8772e3eec1 100644
--- a/compiler/main/SysTools/Process.hs
+++ b/compiler/main/SysTools/Process.hs
@@ -12,7 +12,7 @@ module SysTools.Process where
 
 import Exception
 import ErrUtils
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import Outputable
 import Panic
diff --git a/compiler/main/SysTools/Tasks.hs b/compiler/main/SysTools/Tasks.hs
index d006a84b99..e4bbb32dc6 100644
--- a/compiler/main/SysTools/Tasks.hs
+++ b/compiler/main/SysTools/Tasks.hs
@@ -10,8 +10,8 @@ module SysTools.Tasks where
 
 import Exception
 import ErrUtils
-import HscTypes
-import DynFlags
+import GHC.Driver.Types
+import GHC.Driver.Session
 import Outputable
 import GHC.Platform
 import Util