-import Demand ( Demand )
-import Name ( Name, OccName,
- mkSysLocalName, mkLocalName,
+#ifdef OLD_STRICTNESS
+import qualified Demand ( Demand )
+#endif
+import DataCon ( isUnboxedTupleCon )
+import NewDemand ( Demand, StrictSig, topDmd, topSig, isBottomingSig )
+import Name ( Name, OccName, nameIsLocalOrFrom,
+ mkSystemName, mkSystemNameEncoded, mkInternalName,