-import Const ( Con(..), DataCon )
-import DataCon ( isTupleCon, isUnboxedTupleCon )
-import PprType ( pprParendType, pprTyVarBndr )
-import SpecEnv ( specEnvToList )
-import PprEnv
+import Var ( TyVar, isTyVar, tyVarKind )
+import IdInfo ( IdInfo, megaSeqIdInfo,
+ arityInfo, ppArityInfo,
+ specInfo, pprNewStrictness,
+ workerInfo, ppWorkerInfo,
+ newStrictnessInfo, cafInfo, ppCafInfo, specInfoRules
+ )
+
+#ifdef OLD_STRICTNESS
+import Id ( idDemandInfo )
+import IdInfo ( cprInfo, ppCprInfo, strictnessInfo, ppStrictnessInfo )
+#endif
+
+import DataCon ( dataConTyCon )
+import TyCon ( tupleTyConBoxity, isTupleTyCon )
+import Type ( pprParendType, pprType, pprParendKind )
+import BasicTypes ( tupleParens )
+import Util ( lengthIs )