1 files changed, 11 insertions, 10 deletions
diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs
index 6ea8268f10..fc8c861480 100644
--- a/compiler/simplCore/Simplify.hs
+++ b/compiler/simplCore/Simplify.hs
@@ -15,24 +15,25 @@ import GhcPrelude
 
 import GHC.Driver.Session
 import SimplMonad
-import Type hiding      ( substTy, substTyVar, extendTvSubst, extendCvSubst )
+import GHC.Core.Type hiding ( substTy, substTyVar, extendTvSubst, extendCvSubst )
 import SimplEnv
 import SimplUtils
 import OccurAnal        ( occurAnalyseExpr )
-import FamInstEnv       ( FamInstEnv )
+import GHC.Core.FamInstEnv ( FamInstEnv )
 import Literal          ( litIsLifted ) --, mkLitInt ) -- temporalily commented out. See #8326
 import Id
 import MkId             ( seqId )
-import GHC.Core.Make           ( FloatBind, mkImpossibleExpr, castBottomExpr )
+import GHC.Core.Make    ( FloatBind, mkImpossibleExpr, castBottomExpr )
 import qualified GHC.Core.Make
 import IdInfo
 import Name             ( mkSystemVarName, isExternalName, getOccFS )
-import Coercion hiding  ( substCo, substCoVar )
-import OptCoercion      ( optCoercion )
-import FamInstEnv       ( topNormaliseType_maybe )
-import DataCon          ( DataCon, dataConWorkId, dataConRepStrictness
-                        , dataConRepArgTys, isUnboxedTupleCon
-                        , StrictnessMark (..) )
+import GHC.Core.Coercion hiding ( substCo, substCoVar )
+import GHC.Core.Coercion.Opt    ( optCoercion )
+import GHC.Core.FamInstEnv      ( topNormaliseType_maybe )
+import GHC.Core.DataCon
+   ( DataCon, dataConWorkId, dataConRepStrictness
+   , dataConRepArgTys, isUnboxedTupleCon
+   , StrictnessMark (..) )
 import CoreMonad        ( Tick(..), SimplMode(..) )
 import GHC.Core
 import Demand           ( StrictSig(..), dmdTypeDepth, isStrictDmd
@@ -48,7 +49,7 @@ import BasicTypes       ( TopLevelFlag(..), isNotTopLevel, isTopLevel,
                           RecFlag(..), Arity )
 import MonadUtils       ( mapAccumLM, liftIO )
 import Var              ( isTyCoVar )
-import Maybes           (  orElse )
+import Maybes           ( orElse )
 import Control.Monad
 import Outputable
 import FastString