--- friends:
-import MkId -- Ditto
-import PrelNames -- Prelude module names
-
-import PrimOp ( PrimOp(..), allThePrimOps, primOpRdrName )
-import DataCon ( DataCon, dataConId, dataConWrapId )
-import TysPrim -- TYPES
-import TysWiredIn
-
--- others:
-import RdrName ( RdrName )
-import Name ( Name, mkKnownKeyGlobal, getName )
-import TyCon ( tyConDataConsIfAvailable, TyCon )
+import PrelNames ( basicKnownKeyNames,
+ hasKey, charDataConKey, intDataConKey,
+ numericClassKeys, standardClassKeys,
+ noDictClassKeys )
+
+import PrimOp ( PrimOp, allThePrimOps, primOpOcc, primOpTag, maxPrimOpTag )
+import DataCon ( DataCon )
+import Id ( Id, idName )
+import MkId ( mkPrimOpId, wiredInIds )
+import MkId -- All of it, for re-export
+import Name ( nameOccName )
+import TysPrim ( primTyCons )
+import TysWiredIn ( wiredInTyCons )
+import HscTypes ( TyThing(..), implicitTyThings, GenAvailInfo(..), RdrAvailInfo )