Remove GHC's haskell98 dependency

5 files changed, 5 insertions, 5 deletions

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index ce31717885..c66af03672 100644
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -20,9 +20,9 @@ import ClosureInfo
 import FastString
 import HscTypes
 import Panic
-import Char
 import BasicTypes
 
+import Data.Char
 import Data.Word
 
 cgTickBox :: Module -> Int -> Code
diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs
index 64d3ef1794..379c4c42b4 100644
--- a/compiler/codeGen/StgCmmBind.hs
+++ b/compiler/codeGen/StgCmmBind.hs
@@ -36,7 +36,7 @@ import CLabel
 import StgSyn
 import CostCentre	
 import Id
-import Monad (foldM, liftM)
+import Control.Monad
 import Name
 import Module
 import ListSetOps
diff --git a/compiler/codeGen/StgCmmCon.hs b/compiler/codeGen/StgCmmCon.hs
index beff73e9e0..9039d64daf 100644
--- a/compiler/codeGen/StgCmmCon.hs
+++ b/compiler/codeGen/StgCmmCon.hs
@@ -38,7 +38,7 @@ import Literal
 import PrelInfo
 import Outputable
 import Util             ( lengthIs )
-import Char		( ord )
+import Data.Char
 
 
 ---------------------------------------------------------------
diff --git a/compiler/codeGen/StgCmmEnv.hs b/compiler/codeGen/StgCmmEnv.hs
index a1ba606584..cd94c58daa 100644
--- a/compiler/codeGen/StgCmmEnv.hs
+++ b/compiler/codeGen/StgCmmEnv.hs
@@ -41,7 +41,7 @@ import FastString
 import PprCmm		( {- instance Outputable -} )
 import Id
 import VarEnv
-import Monad
+import Control.Monad
 import Name
 import StgSyn
 import Outputable
diff --git a/compiler/codeGen/StgCmmHpc.hs b/compiler/codeGen/StgCmmHpc.hs
index ab95a66cd0..e78acb78b7 100644
--- a/compiler/codeGen/StgCmmHpc.hs
+++ b/compiler/codeGen/StgCmmHpc.hs
@@ -19,7 +19,7 @@ import Module
 import CmmUtils
 import FastString
 import HscTypes
-import Char
+import Data.Char
 import StaticFlags
 import BasicTypes