diff --git a/Commands/Convert.hs b/Commands/Convert.hs
index f4f5e483f..acf5920b2 100644
--- a/Commands/Convert.hs
+++ b/Commands/Convert.hs
@@ -16,7 +16,7 @@ import Text.Printf (hPrintf)
 import Text.RegexPR (matchRegexPR)
 import Data.Maybe
 import Ledger.Dates (firstJust, showDate, parsedate)
-import Locale (defaultTimeLocale)
+import System.Locale (defaultTimeLocale)
 import Data.Time.Format (parseTime)
 import Control.Monad (when, guard)
 import Safe (readDef, readMay)
diff --git a/Ledger/Dates.hs b/Ledger/Dates.hs
index 152f448ce..a5d362cf0 100644
--- a/Ledger/Dates.hs
+++ b/Ledger/Dates.hs
@@ -23,7 +23,7 @@ where
 
 import Data.Time.Format
 import Data.Time.Calendar.OrdinalDate
-import Locale (defaultTimeLocale)
+import System.Locale (defaultTimeLocale)
 import Text.ParserCombinators.Parsec
 import Text.ParserCombinators.Parsec.Char
 import Text.ParserCombinators.Parsec.Combinator
diff --git a/Ledger/Utils.hs b/Ledger/Utils.hs
index 2727b13f0..81ba11a70 100644
--- a/Ledger/Utils.hs
+++ b/Ledger/Utils.hs
@@ -7,7 +7,7 @@ needed low in the module hierarchy. This is the bottom of the dependency graph.
 -}
 
 module Ledger.Utils (
-module Char,
+module Data.Char,
 module Control.Monad,
 module Data.List,
 --module Data.Map,
@@ -24,7 +24,7 @@ module Text.RegexPR,
 module Test.HUnit,
 )
 where
-import Char
+import Data.Char
 import Control.Exception
 import Control.Monad
 import Data.List
diff --git a/Tests.hs b/Tests.hs
index b757d52ca..616f62f15 100644
--- a/Tests.hs
+++ b/Tests.hs
@@ -30,7 +30,7 @@ module Tests
 where
 import qualified Data.Map as Map
 import Data.Time.Format
-import Locale (defaultTimeLocale)
+import System.Locale (defaultTimeLocale)
 import Test.HUnit.Tools (runVerboseTests)
 import System.Exit (exitFailure, exitWith, ExitCode(ExitSuccess)) -- base 3 compatible
 import System.Time (ClockTime(TOD))
diff --git a/hledger.cabal b/hledger.cabal
index 21df5b557..ccc07849b 100644
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -65,7 +65,6 @@ library
                  ,containers
                  ,directory
                  ,filepath
-                 ,haskell98
                  ,old-time
                  ,parsec
                  ,time
@@ -110,8 +109,8 @@ executable hledger
                  ,csv
                  ,directory
                  ,filepath
-                 ,haskell98
                  ,mtl
+                 ,old-locale
                  ,old-time
                  ,parsec
                  ,process
diff --git a/tools/bench.hs b/tools/bench.hs
index 832944a72..6908ccf81 100644
--- a/tools/bench.hs
+++ b/tools/bench.hs
@@ -52,7 +52,7 @@ import System.Exit
 import Text.Printf
 import Data.Time.Clock
 import Data.Time.Format
-import Locale
+import System.Locale
 import Control.Monad
 import Debug.Trace
 import System.Console.GetOpt
diff --git a/tools/listbydeps.hs b/tools/listbydeps.hs
index 0fb5c9e7d..9189372b6 100644
--- a/tools/listbydeps.hs
+++ b/tools/listbydeps.hs
@@ -2,7 +2,7 @@
 
 import System
 import System.Directory
-import IO
+import System.IO
 import Data.List
 import Data.Char
 import Data.Maybe