-import BasicTypes ( EP(..) )
-import Bag ( Bag, isEmptyBag )
-vimport Outputable
-
+import BasicTypes ( EP(..), Fixity )
+import Bag ( isEmptyBag )
+import Outputable
+import HscTypes ( PersistentCompilerState(..), HomeSymbolTable, HomeIfaceTable,
+ PackageSymbolTable, DFunId, ModIface(..),
+ TypeEnv, extendTypeEnv, lookupTable,
+ TyThing(..), groupTyThings )
+import FiniteMap ( FiniteMap, delFromFM, lookupWithDefaultFM )