-import NewDemand ( Demand, StrictSig, topSig, isBottomingSig )
-import Name ( Name, OccName,
- mkSystemName, mkInternalName,
- getOccName, getSrcLoc
- )
-import OccName ( EncodedFS, UserFS, mkWorkerOcc )
-import PrimRep ( PrimRep )
-import TysPrim ( statePrimTyCon )
-import FieldLabel ( FieldLabel )
+#endif
+import DataCon ( DataCon, isUnboxedTupleCon )
+import NewDemand ( Demand, StrictSig, topDmd, topSig, isBottomingSig )
+import Name ( Name, OccName, nameIsLocalOrFrom,
+ mkSystemVarName, mkInternalName, getOccName,
+ getSrcLoc )
+import Module ( Module )
+import OccName ( mkWorkerOcc )