diff --git a/polyparse.cabal b/polyparse.cabal
--- a/polyparse.cabal
+++ b/polyparse.cabal
@@ -1,5 +1,5 @@
 name:		polyparse
-version:	1.6
+version:	1.7
 license:	LGPL
 license-file:	COPYRIGHT
 author:		Malcolm Wallace <Malcolm.Wallace@me.com>
@@ -19,7 +19,7 @@
 
 library
   hs-source-dirs:	src
-  build-depends:	base <= 6, haskell98
+  build-depends:	base <= 6
   exposed-modules:
         Text.ParserCombinators.HuttonMeijer,
         Text.ParserCombinators.HuttonMeijerWallace,
@@ -43,6 +43,6 @@
         Text.ParserCombinators.Poly.Text
         Text.ParserCombinators.Poly.StateText
 --      Text.Parse.Text
-  cpp-options:		-DVERSION="1.6"
+  cpp-options:		-DVERSION="1.7"
   nhc98-options:	-K6M
   extensions:		CPP
diff --git a/src/Text/Parse.hs b/src/Text/Parse.hs
--- a/src/Text/Parse.hs
+++ b/src/Text/Parse.hs
@@ -29,10 +29,10 @@
   , allAsString
   ) where
 
-import Char (isSpace,toLower,isUpper,isDigit,isOctDigit,isHexDigit,digitToInt
-            ,isAlpha,isAlphaNum,ord,chr)
-import List (intersperse)
-import Ratio
+import Data.Char as Char (isSpace,toLower,isUpper,isDigit,isOctDigit
+                         ,isHexDigit,digitToInt,isAlpha,isAlphaNum,ord,chr)
+import Data.List (intersperse)
+import Data.Ratio
 import Text.ParserCombinators.Poly
 
 ------------------------------------------------------------------------
diff --git a/src/Text/Parse/ByteString.hs b/src/Text/Parse/ByteString.hs
--- a/src/Text/Parse/ByteString.hs
+++ b/src/Text/Parse/ByteString.hs
@@ -32,10 +32,10 @@
   , allAsString
   ) where
 
-import Char (isUpper,isDigit,isOctDigit,isHexDigit,digitToInt
-            ,isSpace,isAlpha,isAlphaNum,ord,chr,toLower)
-import List (intersperse)
-import Ratio
+import Data.Char as Char (isUpper,isDigit,isOctDigit,isHexDigit,digitToInt
+                         ,isSpace,isAlpha,isAlphaNum,ord,chr,toLower)
+import Data.List (intersperse)
+import Data.Ratio
 import qualified Data.ByteString.Lazy.Char8 as BS
 import Data.ByteString.Lazy.Char8 (ByteString)
 import Text.ParserCombinators.Poly.ByteString
diff --git a/src/Text/ParserCombinators/HuttonMeijer.hs b/src/Text/ParserCombinators/HuttonMeijer.hs
--- a/src/Text/ParserCombinators/HuttonMeijer.hs
+++ b/src/Text/ParserCombinators/HuttonMeijer.hs
@@ -34,8 +34,8 @@
     letter, alphanum, string, ident, nat, int, spaces, comment, junk,
     skip, token, natural, integer, symbol, identifier) where
 
-import Char
-import Monad
+import Data.Char
+import Control.Monad
 
 infixr 5 +++
 
diff --git a/src/Text/ParserCombinators/HuttonMeijerWallace.hs b/src/Text/ParserCombinators/HuttonMeijerWallace.hs
--- a/src/Text/ParserCombinators/HuttonMeijerWallace.hs
+++ b/src/Text/ParserCombinators/HuttonMeijerWallace.hs
@@ -53,8 +53,8 @@
   , reparse
   ) where
 
-import Char
-import Monad
+import Data.Char
+import Control.Monad
 
 infixr 5 +++