[project @ 1997-09-22 09:15:20 by simonm]

fix imports for bootstrapping

ghc/compiler/coreSyn/CoreLint.lhs

@@ -12,6 +12,7 @@ module CoreLint (
     ) where
 
 IMP_Ubiq()
+IMPORT_1_3(IO(hPutStr,stderr))
 
 import CmdLineOpts      ( opt_D_show_passes, opt_PprUserLength, opt_DoCoreLinting )
 import CoreSyn

ghc/compiler/typecheck/TcDeriv.lhs

@@ -44,7 +44,7 @@ import Id		( dataConArgTys, isNullaryDataCon, mkDictFunId )
 import PrelInfo		( needsDataDeclCtxtClassKeys )
 import Maybes		( maybeToBool )
 import Name		( isLocallyDefined, getSrcLoc, ExportFlag(..), Provenance, 
-			  Name{--O only-}, SYN_IE(Module)
+			  Name{--O only-}, SYN_IE(Module), NamedThing(..)
 			)
 import Outputable	( PprStyle(..), Outputable(..){-instances e.g., (,)-} )
 import PprType		( GenType, GenTyVar, GenClass, TyCon )

ghc/compiler/typecheck/Unify.lhs

@@ -19,7 +19,7 @@ IMP_Ubiq()
 -- friends: 
 import TcMonad
 import Type	( GenType(..), typeKind, mkFunTy, getFunTy_maybe, splitAppTys )
-import TyCon	( TyCon, mkFunTyCon, isTupleTyCon, tyConArity )
+import TyCon	( TyCon, mkFunTyCon, isTupleTyCon, tyConArity, SYN_IE(Arity) )
 import Class	( GenClass )
 import TyVar	( GenTyVar(..), SYN_IE(TyVar), tyVarKind )
 import TcType	( SYN_IE(TcType), TcMaybe(..), SYN_IE(TcTauType), SYN_IE(TcTyVar),