15 files changed, 18 insertions, 43 deletions
diff --git a/libraries/base/Control/OldException.hs b/libraries/base/Control/OldException.hs
index 6014e1c9b0..1b392d8594 100644
--- a/libraries/base/Control/OldException.hs
+++ b/libraries/base/Control/OldException.hs
@@ -138,7 +138,6 @@ import GHC.IOBase ( IO )
 import GHC.IOBase (block, unblock, evaluate, catchException, throwIO)
 import qualified GHC.IOBase as ExceptionBase
 import qualified GHC.IOBase as New
-import GHC.Exception hiding ( Exception )
 import GHC.Conc hiding (setUncaughtExceptionHandler,
                         getUncaughtExceptionHandler)
 import Data.IORef       ( IORef, newIORef, readIORef, writeIORef )
@@ -151,6 +150,7 @@ import Hugs.Exception   as ExceptionBase
 #endif
 
 import qualified Control.Exception as New
+import           Control.Exception ( throw, SomeException )
 import System.IO.Error  hiding ( catch, try )
 import System.IO.Unsafe (unsafePerformIO)
 import Data.Dynamic
@@ -721,7 +721,7 @@ data Exception
 INSTANCE_TYPEABLE0(Exception,exceptionTc,"Exception")
 
 nonTermination :: SomeException
-nonTermination = toException NonTermination
+nonTermination = New.toException NonTermination
 
 -- For now at least, make the monolithic Exception type an instance of
 -- the Exception class
diff --git a/libraries/base/Data/Either.hs b/libraries/base/Data/Either.hs
index d22e91c0a5..0bed2902a3 100644
--- a/libraries/base/Data/Either.hs
+++ b/libraries/base/Data/Either.hs
@@ -21,7 +21,7 @@ module Data.Either (
    partitionEithers, -- :: [Either a b] -> ([a],[b])
  ) where
 
-import Data.Tuple
+import Data.Tuple ()
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
diff --git a/libraries/base/Foreign/C/Error.hs b/libraries/base/Foreign/C/Error.hs
index 0a4c90fdc2..77d2738833 100644
--- a/libraries/base/Foreign/C/Error.hs
+++ b/libraries/base/Foreign/C/Error.hs
@@ -101,20 +101,6 @@ module Foreign.C.Error (
 #include "HsBaseConfig.h"
 #endif
 
--- system dependent imports
--- ------------------------
-
--- GHC allows us to get at the guts inside IO errors/exceptions
---
-#if __GLASGOW_HASKELL__
-import GHC.IOBase (IOException(..), IOErrorType(..))
-#endif /* __GLASGOW_HASKELL__ */
-
-
--- regular imports
--- ---------------
-
-import Foreign.Storable
 import Foreign.Ptr
 import Foreign.C.Types
 import Foreign.C.String
diff --git a/libraries/base/Foreign/Marshal/Alloc.hs b/libraries/base/Foreign/Marshal/Alloc.hs
index c5ae6a9ac3..220d02b14c 100644
--- a/libraries/base/Foreign/Marshal/Alloc.hs
+++ b/libraries/base/Foreign/Marshal/Alloc.hs
@@ -31,10 +31,13 @@ module Foreign.Marshal.Alloc (
 ) where
 
 import Data.Maybe
-import Foreign.Ptr              ( Ptr, nullPtr, FunPtr )
 import Foreign.C.Types          ( CSize )
 import Foreign.Storable         ( Storable(sizeOf) )
 
+#ifndef __GLASGOW_HASKELL__
+import Foreign.Ptr              ( Ptr, nullPtr, FunPtr )
+#endif
+
 #ifdef __GLASGOW_HASKELL__
 import Foreign.ForeignPtr       ( FinalizerPtr )
 import GHC.IOBase
diff --git a/libraries/base/Foreign/Marshal/Array.hs b/libraries/base/Foreign/Marshal/Array.hs
index fa23be949e..a3d9d1639c 100644
--- a/libraries/base/Foreign/Marshal/Array.hs
+++ b/libraries/base/Foreign/Marshal/Array.hs
@@ -62,7 +62,6 @@ module Foreign.Marshal.Array (
   advancePtr,     -- :: Storable a => Ptr a -> Int -> Ptr a
 ) where
 
-import Control.Monad
 import Foreign.Ptr      (Ptr, plusPtr)
 import Foreign.Storable (Storable(sizeOf,peekElemOff,pokeElemOff))
 import Foreign.Marshal.Alloc (mallocBytes, allocaBytes, reallocBytes)
diff --git a/libraries/base/GHC/Conc.lhs b/libraries/base/GHC/Conc.lhs
index c45d563f1b..d47ba0b5fc 100644
--- a/libraries/base/GHC/Conc.lhs
+++ b/libraries/base/GHC/Conc.lhs
@@ -114,9 +114,10 @@ import GHC.Base
 import {-# SOURCE #-} GHC.Handle
 import GHC.IOBase
 import GHC.Num          ( Num(..) )
-import GHC.Real         ( fromIntegral, div )
-#ifndef mingw32_HOST_OS
-import GHC.Base         ( Int(..) )
+import GHC.Real         ( fromIntegral )
+#ifdef mingw32_HOST_OS
+import GHC.Real         ( div )
+import GHC.Ptr          ( plusPtr, FunPtr(..) )
 #endif
 #ifdef mingw32_HOST_OS
 import GHC.Read         ( Read )
@@ -124,7 +125,7 @@ import GHC.Enum         ( Enum )
 #endif
 import GHC.Exception    ( SomeException(..), throw )
 import GHC.Pack         ( packCString# )
-import GHC.Ptr          ( Ptr(..), plusPtr, FunPtr(..) )
+import GHC.Ptr          ( Ptr(..) )
 import GHC.STRef
 import GHC.Show         ( Show(..), showString )
 import Data.Typeable
diff --git a/libraries/base/GHC/Dotnet.hs b/libraries/base/GHC/Dotnet.hs
index 01de3e9916..1d62f72170 100644
--- a/libraries/base/GHC/Dotnet.hs
+++ b/libraries/base/GHC/Dotnet.hs
@@ -22,15 +22,11 @@ module GHC.Dotnet
         , checkResult
         ) where
 
-import GHC.Prim
 import GHC.Base
 import GHC.Exception
-import GHC.IO
 import GHC.IOBase
 import GHC.Ptr
-import Foreign.Marshal.Array
 import Foreign.Marshal.Alloc
-import Foreign.Storable
 import Foreign.C.String
 
 data Object a
diff --git a/libraries/base/GHC/Err.lhs b/libraries/base/GHC/Err.lhs
index 071e9b61e7..b2bca941a6 100644
--- a/libraries/base/GHC/Err.lhs
+++ b/libraries/base/GHC/Err.lhs
@@ -35,7 +35,7 @@ module GHC.Err
 #ifndef __HADDOCK__
 import GHC.Base
 import GHC.IOBase
-import GHC.List     ( span )
+import GHC.List ()
 import GHC.Exception
 #endif
 \end{code}
diff --git a/libraries/base/GHC/Exts.hs b/libraries/base/GHC/Exts.hs
index 7dc604f9ec..bc36771677 100644
--- a/libraries/base/GHC/Exts.hs
+++ b/libraries/base/GHC/Exts.hs
@@ -51,7 +51,6 @@ import GHC.Prim
 import GHC.Base
 import GHC.Word
 import GHC.Int
-import GHC.Num
 import GHC.Float
 import GHC.Ptr
 import Data.String
diff --git a/libraries/base/GHC/Handle.hs b/libraries/base/GHC/Handle.hs
index c33ddab628..5cb0a401c8 100644
--- a/libraries/base/GHC/Handle.hs
+++ b/libraries/base/GHC/Handle.hs
@@ -58,7 +58,6 @@ module GHC.Handle (
  ) where
 
 import Control.Monad
-import Data.Bits
 import Data.Maybe
 import Foreign
 import Foreign.C
@@ -77,7 +76,6 @@ import GHC.Exception
 import GHC.Enum
 import GHC.Num          ( Integer(..), Num(..) )
 import GHC.Show
-import GHC.Real         ( toInteger )
 #if defined(DEBUG_DUMP)
 import GHC.Pack
 #endif
diff --git a/libraries/base/GHC/IOBase.lhs b/libraries/base/GHC/IOBase.lhs
index 399d8ebd34..ea4abf4934 100644
--- a/libraries/base/GHC/IOBase.lhs
+++ b/libraries/base/GHC/IOBase.lhs
@@ -64,8 +64,8 @@ import Foreign.C.Types (CInt)
 import GHC.Exception
 
 #ifndef __HADDOCK__
-import {-# SOURCE #-} Data.Typeable     ( Typeable, showsTypeRep )
-import {-# SOURCE #-} Data.Dynamic      ( Dynamic, dynTypeRep )
+import {-# SOURCE #-} Data.Typeable     ( Typeable )
+import {-# SOURCE #-} Data.Dynamic      ( Dynamic )
 #endif
 
 -- ---------------------------------------------------------------------------
diff --git a/libraries/base/GHC/PArr.hs b/libraries/base/GHC/PArr.hs
index 0ca8b66756..9148301d61 100644
--- a/libraries/base/GHC/PArr.hs
+++ b/libraries/base/GHC/PArr.hs
@@ -148,7 +148,7 @@ module GHC.PArr (
 
 import Prelude
 
-import GHC.ST   ( ST(..), STRep, runST )
+import GHC.ST   ( ST(..), runST )
 import GHC.Exts ( Int#, Array#, Int(I#), MutableArray#, newArray#,
                   unsafeFreezeArray#, indexArray#, writeArray#, (<#), (>=#) )
 
diff --git a/libraries/base/GHC/Unicode.hs b/libraries/base/GHC/Unicode.hs
index 7c4ed9f7ca..ceb3c910a8 100644
--- a/libraries/base/GHC/Unicode.hs
+++ b/libraries/base/GHC/Unicode.hs
@@ -31,7 +31,6 @@ module GHC.Unicode (
 import GHC.Base
 import GHC.Real  (fromIntegral)
 import GHC.Int
-import GHC.Word
 import GHC.Num   (fromInteger)
 
 #include "HsBaseConfig.h"
diff --git a/libraries/base/Prelude.hs b/libraries/base/Prelude.hs
index 8eb912bffa..813d252f5f 100644
--- a/libraries/base/Prelude.hs
+++ b/libraries/base/Prelude.hs
@@ -146,21 +146,16 @@ module Prelude (
 #ifndef __HUGS__
 import Control.Monad
 import System.IO
-import Text.Read
-import Text.Show
 import Data.List
 import Data.Either
 import Data.Maybe
-import Data.Bool
 import Data.Tuple
-import Data.Eq
-import Data.Ord
 #endif
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
 import GHC.IOBase
-import GHC.Exception
+import GHC.Exception ( throw )
 import GHC.Read
 import GHC.Enum
 import GHC.Num
@@ -170,7 +165,7 @@ import GHC.Show
 import GHC.Err   ( error, undefined )
 #endif
 
-import qualified Control.OldException as Old
+import qualified Control.OldException as Old hiding ( throw )
 
 #ifdef __HUGS__
 import Hugs.Prelude
diff --git a/libraries/base/System/IO/Error.hs b/libraries/base/System/IO/Error.hs
index 6d1f14952c..55b9ca4669 100644
--- a/libraries/base/System/IO/Error.hs
+++ b/libraries/base/System/IO/Error.hs
@@ -98,7 +98,6 @@ import Data.Maybe
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
 import GHC.IOBase
-import GHC.Exception
 import Text.Show
 #endif