deplacement de clenv vers pretyping

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@6058 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 116 insertions, 119 deletions

diff --git a/.depend b/.depend
index 885fa8d21..1ebac3f41 100644
--- a/.depend
+++ b/.depend
@@ -153,6 +153,9 @@ pretyping/cbv.cmi: kernel/closure.cmi kernel/environ.cmi kernel/esubst.cmi \
 pretyping/classops.cmi: library/decl_kinds.cmo kernel/environ.cmi \
     pretyping/evd.cmi library/libnames.cmi library/libobject.cmi \
     kernel/names.cmi library/nametab.cmi lib/pp.cmi kernel/term.cmi 
+pretyping/clenv.cmi: pretyping/evd.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretyping.cmi pretyping/rawterm.cmi pretyping/reductionops.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi 
 pretyping/coercion.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
     pretyping/evd.cmi kernel/names.cmi pretyping/rawterm.cmi kernel/sign.cmi \
     kernel/term.cmi lib/util.cmi 
@@ -201,11 +204,7 @@ pretyping/typing.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/term.cmi
 pretyping/unification.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
     pretyping/evd.cmi kernel/names.cmi pretyping/reductionops.cmi \
     kernel/sign.cmi kernel/term.cmi lib/util.cmi 
-proofs/clenv.cmi: pretyping/evd.cmi kernel/names.cmi lib/pp.cmi \
-    pretyping/pretyping.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
-    pretyping/reductionops.cmi kernel/sign.cmi kernel/term.cmi \
-    pretyping/termops.cmi lib/util.cmi 
-proofs/clenvtac.cmi: proofs/clenv.cmi pretyping/evd.cmi kernel/names.cmi \
+proofs/clenvtac.cmi: pretyping/clenv.cmi pretyping/evd.cmi kernel/names.cmi \
     proofs/proof_type.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi 
 proofs/evar_refiner.cmi: kernel/environ.cmi pretyping/evd.cmi \
     kernel/names.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
@@ -234,7 +233,7 @@ proofs/tacmach.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
 proofs/tactic_debug.cmi: kernel/environ.cmi pretyping/evd.cmi \
     kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
     proofs/tacexpr.cmo kernel/term.cmi 
-tactics/auto.cmi: tactics/btermdn.cmi proofs/clenv.cmi kernel/environ.cmi \
+tactics/auto.cmi: tactics/btermdn.cmi pretyping/clenv.cmi kernel/environ.cmi \
     pretyping/evd.cmi library/libnames.cmi kernel/names.cmi \
     pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
     pretyping/rawterm.cmi kernel/sign.cmi proofs/tacexpr.cmo \
@@ -284,10 +283,10 @@ tactics/tacinterp.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/environ.cmi \
     lib/pp.cmi proofs/proof_type.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
     pretyping/tacred.cmi proofs/tactic_debug.cmi kernel/term.cmi \
     interp/topconstr.cmi lib/util.cmi 
-tactics/tacticals.cmi: proofs/clenv.cmi interp/genarg.cmi kernel/names.cmi \
+tactics/tacticals.cmi: pretyping/clenv.cmi interp/genarg.cmi kernel/names.cmi \
     pretyping/pattern.cmi proofs/proof_type.cmi kernel/reduction.cmi \
     kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi 
-tactics/tactics.cmi: proofs/clenv.cmi kernel/environ.cmi \
+tactics/tactics.cmi: pretyping/clenv.cmi kernel/environ.cmi \
     proofs/evar_refiner.cmi pretyping/evd.cmi interp/genarg.cmi \
     library/libnames.cmi kernel/names.cmi library/nametab.cmi \
     proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
@@ -423,7 +422,7 @@ contrib/interface/name_to_ast.cmi: parsing/coqast.cmi library/libnames.cmi \
 contrib/interface/pbp.cmi: kernel/names.cmi proofs/proof_type.cmi \
     proofs/tacexpr.cmo 
 contrib/interface/showproof.cmi: contrib/interface/ascent.cmi \
-    proofs/clenv.cmi parsing/coqast.cmi kernel/declarations.cmi \
+    pretyping/clenv.cmi parsing/coqast.cmi kernel/declarations.cmi \
     kernel/environ.cmi pretyping/evd.cmi kernel/inductive.cmi \
     kernel/names.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
     proofs/proof_trees.cmi proofs/proof_type.cmi kernel/reduction.cmi \
@@ -452,20 +451,20 @@ config/coq_config.cmo: config/coq_config.cmi
 config/coq_config.cmx: config/coq_config.cmi 
 dev/db_printers.cmo: kernel/names.cmi lib/pp.cmi 
 dev/db_printers.cmx: kernel/names.cmx lib/pp.cmx 
-dev/top_printers.cmo: parsing/ast.cmi toplevel/cerrors.cmi proofs/clenv.cmi \
-    kernel/closure.cmi interp/constrextern.cmi kernel/declarations.cmi \
-    kernel/environ.cmi pretyping/evd.cmi library/libnames.cmi \
-    library/libobject.cmi library/nameops.cmi kernel/names.cmi lib/pp.cmi \
-    parsing/pptactic.cmi parsing/printer.cmi proofs/proof_trees.cmi \
-    proofs/refiner.cmi kernel/sign.cmi lib/system.cmi proofs/tacmach.cmi \
-    kernel/term.cmi pretyping/termops.cmi kernel/univ.cmi 
-dev/top_printers.cmx: parsing/ast.cmx toplevel/cerrors.cmx proofs/clenv.cmx \
-    kernel/closure.cmx interp/constrextern.cmx kernel/declarations.cmx \
-    kernel/environ.cmx pretyping/evd.cmx library/libnames.cmx \
-    library/libobject.cmx library/nameops.cmx kernel/names.cmx lib/pp.cmx \
-    parsing/pptactic.cmx parsing/printer.cmx proofs/proof_trees.cmx \
-    proofs/refiner.cmx kernel/sign.cmx lib/system.cmx proofs/tacmach.cmx \
-    kernel/term.cmx pretyping/termops.cmx kernel/univ.cmx 
+dev/top_printers.cmo: parsing/ast.cmi toplevel/cerrors.cmi \
+    pretyping/clenv.cmi kernel/closure.cmi interp/constrextern.cmi \
+    kernel/declarations.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/libnames.cmi library/libobject.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/refiner.cmi kernel/sign.cmi lib/system.cmi \
+    proofs/tacmach.cmi kernel/term.cmi pretyping/termops.cmi kernel/univ.cmi 
+dev/top_printers.cmx: parsing/ast.cmx toplevel/cerrors.cmx \
+    pretyping/clenv.cmx kernel/closure.cmx interp/constrextern.cmx \
+    kernel/declarations.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/libnames.cmx library/libobject.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/refiner.cmx kernel/sign.cmx lib/system.cmx \
+    proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx kernel/univ.cmx 
 doc/parse.cmo: parsing/ast.cmi 
 doc/parse.cmx: parsing/ast.cmx 
 ide/blaster_window.cmo: ide/coq.cmi ide/ideutils.cmi 
@@ -1258,6 +1257,22 @@ pretyping/classops.cmx: library/decl_kinds.cmx kernel/environ.cmx \
     lib/pp.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
     library/summary.cmx pretyping/tacred.cmx kernel/term.cmx \
     pretyping/termops.cmx lib/util.cmx pretyping/classops.cmi 
+pretyping/clenv.cmo: pretyping/coercion.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
+    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi pretyping/retyping.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo pretyping/tacred.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi pretyping/unification.cmi \
+    lib/util.cmi pretyping/clenv.cmi 
+pretyping/clenv.cmx: pretyping/coercion.cmx kernel/environ.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx \
+    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx pretyping/rawterm.cmx \
+    pretyping/reductionops.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    proofs/tacexpr.cmx pretyping/tacred.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx pretyping/unification.cmx \
+    lib/util.cmx pretyping/clenv.cmi 
 pretyping/coercion.cmo: pretyping/classops.cmi kernel/environ.cmi \
     pretyping/evarconv.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
     kernel/names.cmi pretyping/pretype_errors.cmi pretyping/rawterm.cmi \
@@ -1458,25 +1473,7 @@ pretyping/unification.cmx: kernel/environ.cmx pretyping/evarutil.cmx \
     pretyping/rawterm.cmx pretyping/reductionops.cmx kernel/sign.cmx \
     kernel/term.cmx pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     pretyping/unification.cmi 
-proofs/clenv.cmo: pretyping/coercion.cmi kernel/environ.cmi \
-    proofs/evar_refiner.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
-    library/global.cmi proofs/logic.cmi library/nameops.cmi kernel/names.cmi \
-    pretyping/pattern.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
-    parsing/printer.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
-    pretyping/rawterm.cmi pretyping/reductionops.cmi proofs/refiner.cmi \
-    pretyping/retyping.cmi kernel/sign.cmi proofs/tacexpr.cmo \
-    proofs/tacmach.cmi kernel/term.cmi pretyping/termops.cmi \
-    pretyping/unification.cmi lib/util.cmi proofs/clenv.cmi 
-proofs/clenv.cmx: pretyping/coercion.cmx kernel/environ.cmx \
-    proofs/evar_refiner.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
-    library/global.cmx proofs/logic.cmx library/nameops.cmx kernel/names.cmx \
-    pretyping/pattern.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
-    parsing/printer.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
-    pretyping/rawterm.cmx pretyping/reductionops.cmx proofs/refiner.cmx \
-    pretyping/retyping.cmx kernel/sign.cmx proofs/tacexpr.cmx \
-    proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx \
-    pretyping/unification.cmx lib/util.cmx proofs/clenv.cmi 
-proofs/clenvtac.cmo: proofs/clenv.cmi kernel/environ.cmi \
+proofs/clenvtac.cmo: pretyping/clenv.cmi kernel/environ.cmi \
     proofs/evar_refiner.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
     proofs/logic.cmi library/nameops.cmi kernel/names.cmi \
     pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
@@ -1484,7 +1481,7 @@ proofs/clenvtac.cmo: proofs/clenv.cmi kernel/environ.cmi \
     proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
     kernel/term.cmi pretyping/termops.cmi pretyping/unification.cmi \
     lib/util.cmi proofs/clenvtac.cmi 
-proofs/clenvtac.cmx: proofs/clenv.cmx kernel/environ.cmx \
+proofs/clenvtac.cmx: pretyping/clenv.cmx kernel/environ.cmx \
     proofs/evar_refiner.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
     proofs/logic.cmx library/nameops.cmx kernel/names.cmx \
     pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
@@ -1510,24 +1507,24 @@ proofs/evar_refiner.cmx: interp/constrintern.cmx kernel/environ.cmx \
     pretyping/tacred.cmx kernel/term.cmx pretyping/termops.cmx \
     kernel/type_errors.cmx pretyping/typing.cmx lib/util.cmx \
     proofs/evar_refiner.cmi 
-proofs/logic.cmo: interp/constrextern.cmi parsing/coqast.cmi \
-    kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
-    library/global.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
-    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
-    lib/pp.cmi pretyping/pretype_errors.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
-    pretyping/retyping.cmi kernel/sign.cmi kernel/term.cmi \
-    pretyping/termops.cmi kernel/type_errors.cmi kernel/typeops.cmi \
-    pretyping/typing.cmi lib/util.cmi proofs/logic.cmi 
-proofs/logic.cmx: interp/constrextern.cmx parsing/coqast.cmx \
-    kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
-    library/global.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
-    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
-    lib/pp.cmx pretyping/pretype_errors.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
-    pretyping/retyping.cmx kernel/sign.cmx kernel/term.cmx \
-    pretyping/termops.cmx kernel/type_errors.cmx kernel/typeops.cmx \
-    pretyping/typing.cmx lib/util.cmx proofs/logic.cmi 
+proofs/logic.cmo: interp/constrextern.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
+    kernel/inductive.cmi pretyping/inductiveops.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/reductionops.cmi pretyping/retyping.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi pretyping/typing.cmi \
+    lib/util.cmi proofs/logic.cmi 
+proofs/logic.cmx: interp/constrextern.cmx kernel/environ.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx \
+    kernel/inductive.cmx pretyping/inductiveops.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/reductionops.cmx pretyping/retyping.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx pretyping/typing.cmx \
+    lib/util.cmx proofs/logic.cmi 
 proofs/pfedit.cmo: library/decl_kinds.cmo kernel/declarations.cmi \
     lib/edit.cmi kernel/entries.cmi kernel/environ.cmi \
     proofs/evar_refiner.cmi pretyping/evd.cmi library/lib.cmi \
@@ -1588,33 +1585,33 @@ proofs/tacexpr.cmx: library/decl_kinds.cmx lib/dyn.cmx interp/genarg.cmx \
     interp/topconstr.cmx lib/util.cmx 
 proofs/tacmach.cmo: interp/constrintern.cmi kernel/environ.cmi \
     pretyping/evd.cmi library/global.cmi proofs/logic.cmi library/nameops.cmi \
-    kernel/names.cmi lib/pp.cmi parsing/printer.cmi proofs/proof_trees.cmi \
-    proofs/proof_type.cmi pretyping/rawterm.cmi pretyping/reductionops.cmi \
-    proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo \
-    pretyping/tacred.cmi kernel/term.cmi pretyping/termops.cmi \
-    pretyping/typing.cmi lib/util.cmi proofs/tacmach.cmi 
+    kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi pretyping/reductionops.cmi proofs/refiner.cmi \
+    kernel/sign.cmi proofs/tacexpr.cmo pretyping/tacred.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
+    proofs/tacmach.cmi 
 proofs/tacmach.cmx: interp/constrintern.cmx kernel/environ.cmx \
     pretyping/evd.cmx library/global.cmx proofs/logic.cmx library/nameops.cmx \
-    kernel/names.cmx lib/pp.cmx parsing/printer.cmx proofs/proof_trees.cmx \
-    proofs/proof_type.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
-    proofs/refiner.cmx kernel/sign.cmx proofs/tacexpr.cmx \
-    pretyping/tacred.cmx kernel/term.cmx pretyping/termops.cmx \
-    pretyping/typing.cmx lib/util.cmx proofs/tacmach.cmi 
-proofs/tactic_debug.cmo: parsing/ast.cmi interp/constrextern.cmi \
-    library/global.cmi proofs/logic.cmi kernel/names.cmi lib/options.cmi \
-    lib/pp.cmi parsing/pptactic.cmi translate/pptacticnew.cmi \
-    parsing/printer.cmi proofs/proof_trees.cmi proofs/tacexpr.cmo \
-    proofs/tacmach.cmi pretyping/termops.cmi proofs/tactic_debug.cmi 
-proofs/tactic_debug.cmx: parsing/ast.cmx interp/constrextern.cmx \
-    library/global.cmx proofs/logic.cmx kernel/names.cmx lib/options.cmx \
-    lib/pp.cmx parsing/pptactic.cmx translate/pptacticnew.cmx \
-    parsing/printer.cmx proofs/proof_trees.cmx proofs/tacexpr.cmx \
-    proofs/tacmach.cmx pretyping/termops.cmx proofs/tactic_debug.cmi 
+    kernel/names.cmx lib/pp.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    pretyping/rawterm.cmx pretyping/reductionops.cmx proofs/refiner.cmx \
+    kernel/sign.cmx proofs/tacexpr.cmx pretyping/tacred.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
+    proofs/tacmach.cmi 
+proofs/tactic_debug.cmo: interp/constrextern.cmi library/global.cmi \
+    proofs/logic.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
+    parsing/pptactic.cmi translate/pptacticnew.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    pretyping/termops.cmi proofs/tactic_debug.cmi 
+proofs/tactic_debug.cmx: interp/constrextern.cmx library/global.cmx \
+    proofs/logic.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
+    parsing/pptactic.cmx translate/pptacticnew.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
+    pretyping/termops.cmx proofs/tactic_debug.cmi 
 scripts/coqc.cmo: config/coq_config.cmi toplevel/usage.cmi 
 scripts/coqc.cmx: config/coq_config.cmx toplevel/usage.cmx 
 scripts/coqmktop.cmo: config/coq_config.cmi scripts/tolink.cmo 
 scripts/coqmktop.cmx: config/coq_config.cmx scripts/tolink.cmx 
-tactics/auto.cmo: tactics/btermdn.cmi proofs/clenv.cmi \
+tactics/auto.cmo: tactics/btermdn.cmi pretyping/clenv.cmi \
     interp/constrintern.cmi kernel/declarations.cmi tactics/dhyp.cmi \
     proofs/evar_refiner.cmi pretyping/evd.cmi library/global.cmi \
     tactics/hiddentac.cmi tactics/hipattern.cmi kernel/inductive.cmi \
@@ -1628,7 +1625,7 @@ tactics/auto.cmo: tactics/btermdn.cmi proofs/clenv.cmi \
     pretyping/tacred.cmi tactics/tacticals.cmi tactics/tactics.cmi \
     kernel/term.cmi pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
     toplevel/vernacexpr.cmo tactics/auto.cmi 
-tactics/auto.cmx: tactics/btermdn.cmx proofs/clenv.cmx \
+tactics/auto.cmx: tactics/btermdn.cmx pretyping/clenv.cmx \
     interp/constrintern.cmx kernel/declarations.cmx tactics/dhyp.cmx \
     proofs/evar_refiner.cmx pretyping/evd.cmx library/global.cmx \
     tactics/hiddentac.cmx tactics/hipattern.cmx kernel/inductive.cmx \
@@ -1666,7 +1663,7 @@ tactics/contradiction.cmx: interp/coqlib.cmx tactics/hipattern.cmx \
     proofs/proof_type.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
     proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
     kernel/term.cmx lib/util.cmx tactics/contradiction.cmi 
-tactics/dhyp.cmo: parsing/ast.cmi proofs/clenv.cmi interp/constrintern.cmi \
+tactics/dhyp.cmo: parsing/ast.cmi pretyping/clenv.cmi interp/constrintern.cmi \
     kernel/environ.cmi pretyping/evd.cmi library/global.cmi library/lib.cmi \
     library/libnames.cmi library/libobject.cmi library/library.cmi \
     pretyping/matching.cmi kernel/names.cmi tactics/nbtermdn.cmi \
@@ -1675,7 +1672,7 @@ tactics/dhyp.cmo: parsing/ast.cmi proofs/clenv.cmi interp/constrintern.cmi \
     library/summary.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
     tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi \
     tactics/dhyp.cmi 
-tactics/dhyp.cmx: parsing/ast.cmx proofs/clenv.cmx interp/constrintern.cmx \
+tactics/dhyp.cmx: parsing/ast.cmx pretyping/clenv.cmx interp/constrintern.cmx \
     kernel/environ.cmx pretyping/evd.cmx library/global.cmx library/lib.cmx \
     library/libnames.cmx library/libobject.cmx library/library.cmx \
     pretyping/matching.cmx kernel/names.cmx tactics/nbtermdn.cmx \
@@ -1686,7 +1683,7 @@ tactics/dhyp.cmx: parsing/ast.cmx proofs/clenv.cmx interp/constrintern.cmx \
     tactics/dhyp.cmi 
 tactics/dn.cmo: lib/tlm.cmi tactics/dn.cmi 
 tactics/dn.cmx: lib/tlm.cmx tactics/dn.cmi 
-tactics/eauto.cmo: tactics/auto.cmi toplevel/cerrors.cmi proofs/clenv.cmi \
+tactics/eauto.cmo: tactics/auto.cmi toplevel/cerrors.cmi pretyping/clenv.cmi \
     proofs/clenvtac.cmi kernel/declarations.cmi parsing/egrammar.cmi \
     proofs/evar_refiner.cmi lib/explore.cmi parsing/extend.cmi \
     interp/genarg.cmi library/global.cmi proofs/logic.cmi library/nameops.cmi \
@@ -1697,7 +1694,7 @@ tactics/eauto.cmo: tactics/auto.cmi toplevel/cerrors.cmi proofs/clenv.cmi \
     tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     tactics/eauto.cmi 
-tactics/eauto.cmx: tactics/auto.cmx toplevel/cerrors.cmx proofs/clenv.cmx \
+tactics/eauto.cmx: tactics/auto.cmx toplevel/cerrors.cmx pretyping/clenv.cmx \
     proofs/clenvtac.cmx kernel/declarations.cmx parsing/egrammar.cmx \
     proofs/evar_refiner.cmx lib/explore.cmx parsing/extend.cmx \
     interp/genarg.cmx library/global.cmx proofs/logic.cmx library/nameops.cmx \
@@ -1708,14 +1705,14 @@ tactics/eauto.cmx: tactics/auto.cmx toplevel/cerrors.cmx proofs/clenv.cmx \
     tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
     tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     tactics/eauto.cmi 
-tactics/elim.cmo: proofs/clenv.cmi kernel/environ.cmi interp/genarg.cmi \
+tactics/elim.cmo: pretyping/clenv.cmi kernel/environ.cmi interp/genarg.cmi \
     tactics/hiddentac.cmi tactics/hipattern.cmi pretyping/inductiveops.cmi \
     library/libnames.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
     proofs/proof_type.cmi kernel/reduction.cmi proofs/refiner.cmi \
     proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     tactics/elim.cmi 
-tactics/elim.cmx: proofs/clenv.cmx kernel/environ.cmx interp/genarg.cmx \
+tactics/elim.cmx: pretyping/clenv.cmx kernel/environ.cmx interp/genarg.cmx \
     tactics/hiddentac.cmx tactics/hipattern.cmx pretyping/inductiveops.cmx \
     library/libnames.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
     proofs/proof_type.cmx kernel/reduction.cmx proofs/refiner.cmx \
@@ -1742,7 +1739,7 @@ tactics/eqdecide.cmx: tactics/auto.cmx toplevel/cerrors.cmx interp/coqlib.cmx \
     proofs/refiner.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
     proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
     kernel/term.cmx lib/util.cmx 
-tactics/equality.cmo: proofs/clenv.cmi interp/coqlib.cmi \
+tactics/equality.cmo: pretyping/clenv.cmi interp/coqlib.cmi \
     kernel/declarations.cmi kernel/environ.cmi proofs/evar_refiner.cmi \
     pretyping/evarconv.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
     tactics/hipattern.cmi pretyping/indrec.cmi kernel/inductive.cmi \
@@ -1755,7 +1752,7 @@ tactics/equality.cmo: proofs/clenv.cmi interp/coqlib.cmi \
     tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi \
     kernel/typeops.cmi pretyping/typing.cmi kernel/univ.cmi lib/util.cmi \
     toplevel/vernacexpr.cmo tactics/equality.cmi 
-tactics/equality.cmx: proofs/clenv.cmx interp/coqlib.cmx \
+tactics/equality.cmx: pretyping/clenv.cmx interp/coqlib.cmx \
     kernel/declarations.cmx kernel/environ.cmx proofs/evar_refiner.cmx \
     pretyping/evarconv.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
     tactics/hipattern.cmx pretyping/indrec.cmx kernel/inductive.cmx \
@@ -1820,21 +1817,21 @@ tactics/hiddentac.cmx: tactics/evar_tactics.cmx interp/genarg.cmx \
     proofs/proof_type.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
     proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tactics.cmx kernel/term.cmx \
     lib/util.cmx tactics/hiddentac.cmi 
-tactics/hipattern.cmo: proofs/clenv.cmi interp/coqlib.cmi \
+tactics/hipattern.cmo: pretyping/clenv.cmi interp/coqlib.cmi \
     kernel/declarations.cmi kernel/environ.cmi pretyping/evd.cmi \
     library/global.cmi pretyping/inductiveops.cmi pretyping/matching.cmi \
     library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
     proofs/proof_trees.cmi pretyping/reductionops.cmi proofs/tacmach.cmi \
     tactics/tacticals.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     tactics/hipattern.cmi 
-tactics/hipattern.cmx: proofs/clenv.cmx interp/coqlib.cmx \
+tactics/hipattern.cmx: pretyping/clenv.cmx interp/coqlib.cmx \
     kernel/declarations.cmx kernel/environ.cmx pretyping/evd.cmx \
     library/global.cmx pretyping/inductiveops.cmx pretyping/matching.cmx \
     library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
     proofs/proof_trees.cmx pretyping/reductionops.cmx proofs/tacmach.cmx \
     tactics/tacticals.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     tactics/hipattern.cmi 
-tactics/inv.cmo: proofs/clenv.cmi interp/coqlib.cmi tactics/elim.cmi \
+tactics/inv.cmo: pretyping/clenv.cmi interp/coqlib.cmi tactics/elim.cmi \
     kernel/environ.cmi tactics/equality.cmi proofs/evar_refiner.cmi \
     pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
     tactics/hipattern.cmi pretyping/inductiveops.cmi pretyping/matching.cmi \
@@ -1845,7 +1842,7 @@ tactics/inv.cmo: proofs/clenv.cmi interp/coqlib.cmi tactics/elim.cmi \
     tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
     pretyping/termops.cmi pretyping/typing.cmi pretyping/unification.cmi \
     lib/util.cmi tactics/inv.cmi 
-tactics/inv.cmx: proofs/clenv.cmx interp/coqlib.cmx tactics/elim.cmx \
+tactics/inv.cmx: pretyping/clenv.cmx interp/coqlib.cmx tactics/elim.cmx \
     kernel/environ.cmx tactics/equality.cmx proofs/evar_refiner.cmx \
     pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
     tactics/hipattern.cmx pretyping/inductiveops.cmx pretyping/matching.cmx \
@@ -1856,7 +1853,7 @@ tactics/inv.cmx: proofs/clenv.cmx interp/coqlib.cmx tactics/elim.cmx \
     tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
     pretyping/termops.cmx pretyping/typing.cmx pretyping/unification.cmx \
     lib/util.cmx tactics/inv.cmi 
-tactics/leminv.cmo: proofs/clenv.cmi proofs/clenvtac.cmi \
+tactics/leminv.cmo: pretyping/clenv.cmi proofs/clenvtac.cmi \
     interp/constrintern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
     library/declare.cmi kernel/entries.cmi kernel/environ.cmi \
     proofs/evar_refiner.cmi pretyping/evd.cmi library/global.cmi \
@@ -1867,7 +1864,7 @@ tactics/leminv.cmo: proofs/clenv.cmi proofs/clenvtac.cmi \
     proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
     kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     toplevel/vernacexpr.cmo tactics/leminv.cmi 
-tactics/leminv.cmx: proofs/clenv.cmx proofs/clenvtac.cmx \
+tactics/leminv.cmx: pretyping/clenv.cmx proofs/clenvtac.cmx \
     interp/constrintern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
     library/declare.cmx kernel/entries.cmx kernel/environ.cmx \
     proofs/evar_refiner.cmx pretyping/evd.cmx library/global.cmx \
@@ -1884,19 +1881,19 @@ tactics/nbtermdn.cmo: tactics/btermdn.cmi lib/gmap.cmi library/libobject.cmi \
 tactics/nbtermdn.cmx: tactics/btermdn.cmx lib/gmap.cmx library/libobject.cmx \
     library/library.cmx kernel/names.cmx pretyping/pattern.cmx \
     kernel/term.cmx tactics/termdn.cmx lib/util.cmx tactics/nbtermdn.cmi 
-tactics/refine.cmo: proofs/clenv.cmi kernel/environ.cmi pretyping/evd.cmi \
+tactics/refine.cmo: pretyping/clenv.cmi kernel/environ.cmi pretyping/evd.cmi \
     kernel/names.cmi lib/pp.cmi parsing/printer.cmi kernel/reduction.cmi \
     pretyping/retyping.cmi kernel/sign.cmi proofs/tacmach.cmi \
     tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
     pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
     tactics/refine.cmi 
-tactics/refine.cmx: proofs/clenv.cmx kernel/environ.cmx pretyping/evd.cmx \
+tactics/refine.cmx: pretyping/clenv.cmx kernel/environ.cmx pretyping/evd.cmx \
     kernel/names.cmx lib/pp.cmx parsing/printer.cmx kernel/reduction.cmx \
     pretyping/retyping.cmx kernel/sign.cmx proofs/tacmach.cmx \
     tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
     pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     tactics/refine.cmi 
-tactics/setoid_replace.cmo: proofs/clenv.cmi interp/constrintern.cmi \
+tactics/setoid_replace.cmo: pretyping/clenv.cmi interp/constrintern.cmi \
     interp/coqlib.cmi library/decl_kinds.cmo library/declare.cmi \
     kernel/entries.cmi kernel/environ.cmi proofs/evar_refiner.cmi \
     pretyping/evd.cmi library/global.cmi lib/gmap.cmi library/lib.cmi \
@@ -1906,9 +1903,9 @@ tactics/setoid_replace.cmo: proofs/clenv.cmi interp/constrintern.cmi \
     pretyping/rawterm.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
     kernel/safe_typing.cmi library/summary.cmi proofs/tacmach.cmi \
     tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
-    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
-    toplevel/vernacexpr.cmo tactics/setoid_replace.cmi 
-tactics/setoid_replace.cmx: proofs/clenv.cmx interp/constrintern.cmx \
+    pretyping/termops.cmi pretyping/typing.cmi pretyping/unification.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo tactics/setoid_replace.cmi 
+tactics/setoid_replace.cmx: pretyping/clenv.cmx interp/constrintern.cmx \
     interp/coqlib.cmx library/decl_kinds.cmx library/declare.cmx \
     kernel/entries.cmx kernel/environ.cmx proofs/evar_refiner.cmx \
     pretyping/evd.cmx library/global.cmx lib/gmap.cmx library/lib.cmx \
@@ -1918,8 +1915,8 @@ tactics/setoid_replace.cmx: proofs/clenv.cmx interp/constrintern.cmx \
     pretyping/rawterm.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
     kernel/safe_typing.cmx library/summary.cmx proofs/tacmach.cmx \
     tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
-    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
-    toplevel/vernacexpr.cmx tactics/setoid_replace.cmi 
+    pretyping/termops.cmx pretyping/typing.cmx pretyping/unification.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx tactics/setoid_replace.cmi 
 tactics/tacinterp.cmo: parsing/ast.cmi tactics/auto.cmi kernel/closure.cmi \
     interp/constrintern.cmi parsing/coqast.cmi library/decl_kinds.cmo \
     kernel/declarations.cmi tactics/dhyp.cmi lib/dyn.cmi tactics/elim.cmi \
@@ -1954,7 +1951,7 @@ tactics/tacinterp.cmx: parsing/ast.cmx tactics/auto.cmx kernel/closure.cmx \
     tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx \
     interp/topconstr.cmx pretyping/typing.cmx lib/util.cmx \
     tactics/tacinterp.cmi 
-tactics/tacticals.cmo: proofs/clenv.cmi proofs/clenvtac.cmi \
+tactics/tacticals.cmo: pretyping/clenv.cmi proofs/clenvtac.cmi \
     kernel/declarations.cmi kernel/environ.cmi proofs/evar_refiner.cmi \
     pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
     pretyping/indrec.cmi kernel/inductive.cmi library/libnames.cmi \
@@ -1962,7 +1959,7 @@ tactics/tacticals.cmo: proofs/clenv.cmi proofs/clenvtac.cmi \
     kernel/reduction.cmi proofs/refiner.cmi kernel/sign.cmi \
     proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi \
     pretyping/termops.cmi lib/util.cmi tactics/tacticals.cmi 
-tactics/tacticals.cmx: proofs/clenv.cmx proofs/clenvtac.cmx \
+tactics/tacticals.cmx: pretyping/clenv.cmx proofs/clenvtac.cmx \
     kernel/declarations.cmx kernel/environ.cmx proofs/evar_refiner.cmx \
     pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
     pretyping/indrec.cmx kernel/inductive.cmx library/libnames.cmx \
@@ -1970,7 +1967,7 @@ tactics/tacticals.cmx: proofs/clenv.cmx proofs/clenvtac.cmx \
     kernel/reduction.cmx proofs/refiner.cmx kernel/sign.cmx \
     proofs/tacexpr.cmx proofs/tacmach.cmx kernel/term.cmx \
     pretyping/termops.cmx lib/util.cmx tactics/tacticals.cmi 
-tactics/tactics.cmo: proofs/clenv.cmi proofs/clenvtac.cmi \
+tactics/tactics.cmo: pretyping/clenv.cmi proofs/clenvtac.cmi \
     interp/constrintern.cmi interp/coqlib.cmi library/decl_kinds.cmo \
     kernel/declarations.cmi library/declare.cmi kernel/entries.cmi \
     kernel/environ.cmi proofs/evar_refiner.cmi pretyping/evd.cmi \
@@ -1983,7 +1980,7 @@ tactics/tactics.cmo: proofs/clenv.cmi proofs/clenvtac.cmi \
     proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
     pretyping/tacred.cmi tactics/tacticals.cmi kernel/term.cmi \
     pretyping/termops.cmi lib/util.cmi tactics/tactics.cmi 
-tactics/tactics.cmx: proofs/clenv.cmx proofs/clenvtac.cmx \
+tactics/tactics.cmx: pretyping/clenv.cmx proofs/clenvtac.cmx \
     interp/constrintern.cmx interp/coqlib.cmx library/decl_kinds.cmx \
     kernel/declarations.cmx library/declare.cmx kernel/entries.cmx \
     kernel/environ.cmx proofs/evar_refiner.cmx pretyping/evd.cmx \
@@ -2764,12 +2761,12 @@ contrib/first-order/unify.cmx: contrib/first-order/formula.cmx \
     kernel/names.cmx pretyping/reductionops.cmx proofs/tacmach.cmx \
     kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     contrib/first-order/unify.cmi 
-contrib/fourier/fourierR.cmo: proofs/clenv.cmi tactics/contradiction.cmi \
+contrib/fourier/fourierR.cmo: pretyping/clenv.cmi tactics/contradiction.cmi \
     interp/coqlib.cmi tactics/equality.cmi contrib/fourier/fourier.cmo \
     library/libnames.cmi library/library.cmi kernel/names.cmi \
     contrib/ring/ring.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
     tactics/tactics.cmi kernel/term.cmi lib/util.cmi toplevel/vernacexpr.cmo 
-contrib/fourier/fourierR.cmx: proofs/clenv.cmx tactics/contradiction.cmx \
+contrib/fourier/fourierR.cmx: pretyping/clenv.cmx tactics/contradiction.cmx \
     interp/coqlib.cmx tactics/equality.cmx contrib/fourier/fourier.cmx \
     library/libnames.cmx library/library.cmx kernel/names.cmx \
     contrib/ring/ring.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
@@ -2820,7 +2817,7 @@ contrib/funind/tacinvutils.cmx: interp/coqlib.cmx kernel/declarations.cmx \
     lib/pp.cmx parsing/printer.cmx pretyping/reductionops.cmx kernel/sign.cmx \
     kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     contrib/funind/tacinvutils.cmi 
-contrib/interface/blast.cmo: tactics/auto.cmi proofs/clenv.cmi \
+contrib/interface/blast.cmo: tactics/auto.cmi pretyping/clenv.cmi \
     toplevel/command.cmi contrib/interface/ctast.cmo kernel/declarations.cmi \
     library/declare.cmi tactics/eauto.cmi kernel/environ.cmi \
     tactics/equality.cmi pretyping/evd.cmi lib/explore.cmi library/global.cmi \
@@ -2834,7 +2831,7 @@ contrib/interface/blast.cmo: tactics/auto.cmi proofs/clenv.cmi \
     tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi \
     pretyping/typing.cmi lib/util.cmi toplevel/vernacentries.cmi \
     toplevel/vernacinterp.cmi contrib/interface/blast.cmi 
-contrib/interface/blast.cmx: tactics/auto.cmx proofs/clenv.cmx \
+contrib/interface/blast.cmx: tactics/auto.cmx pretyping/clenv.cmx \
     toplevel/command.cmx contrib/interface/ctast.cmx kernel/declarations.cmx \
     library/declare.cmx tactics/eauto.cmx kernel/environ.cmx \
     tactics/equality.cmx pretyping/evd.cmx lib/explore.cmx library/global.cmx \
@@ -2994,7 +2991,7 @@ contrib/interface/showproof_ct.cmx: contrib/interface/ascent.cmi \
     parsing/esyntax.cmx library/global.cmx toplevel/metasyntax.cmx lib/pp.cmx \
     parsing/printer.cmx contrib/interface/translate.cmx \
     contrib/interface/vtp.cmx contrib/interface/xlate.cmx 
-contrib/interface/showproof.cmo: proofs/clenv.cmi interp/constrintern.cmi \
+contrib/interface/showproof.cmo: pretyping/clenv.cmi interp/constrintern.cmi \
     parsing/coqast.cmi kernel/declarations.cmi kernel/environ.cmi \
     pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
     kernel/inductive.cmi pretyping/inductiveops.cmi library/libnames.cmi \
@@ -3006,7 +3003,7 @@ contrib/interface/showproof.cmo: proofs/clenv.cmi interp/constrintern.cmi \
     pretyping/termops.cmi contrib/interface/translate.cmi \
     pretyping/typing.cmi lib/util.cmi toplevel/vernacinterp.cmi \
     contrib/interface/showproof.cmi 
-contrib/interface/showproof.cmx: proofs/clenv.cmx interp/constrintern.cmx \
+contrib/interface/showproof.cmx: pretyping/clenv.cmx interp/constrintern.cmx \
     parsing/coqast.cmx kernel/declarations.cmx kernel/environ.cmx \
     pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
     kernel/inductive.cmx pretyping/inductiveops.cmx library/libnames.cmx \
@@ -3064,7 +3061,7 @@ contrib/jprover/jlogic.cmo: contrib/jprover/jterm.cmi \
     contrib/jprover/opname.cmi contrib/jprover/jlogic.cmi 
 contrib/jprover/jlogic.cmx: contrib/jprover/jterm.cmx \
     contrib/jprover/opname.cmx contrib/jprover/jlogic.cmi 
-contrib/jprover/jprover.cmo: toplevel/cerrors.cmi proofs/clenv.cmi \
+contrib/jprover/jprover.cmo: toplevel/cerrors.cmi pretyping/clenv.cmi \
     parsing/egrammar.cmi interp/genarg.cmi library/global.cmi \
     tactics/hiddentac.cmi tactics/hipattern.cmi contrib/jprover/jall.cmi \
     contrib/jprover/jlogic.cmi contrib/jprover/jterm.cmi kernel/names.cmi \
@@ -3074,7 +3071,7 @@ contrib/jprover/jprover.cmo: toplevel/cerrors.cmi proofs/clenv.cmi \
     proofs/refiner.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
     proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
     kernel/term.cmi pretyping/termops.cmi lib/util.cmi 
-contrib/jprover/jprover.cmx: toplevel/cerrors.cmx proofs/clenv.cmx \
+contrib/jprover/jprover.cmx: toplevel/cerrors.cmx pretyping/clenv.cmx \
     parsing/egrammar.cmx interp/genarg.cmx library/global.cmx \
     tactics/hiddentac.cmx tactics/hipattern.cmx contrib/jprover/jall.cmx \
     contrib/jprover/jlogic.cmx contrib/jprover/jterm.cmx kernel/names.cmx \
@@ -3092,7 +3089,7 @@ contrib/jprover/jtunify.cmo: contrib/jprover/jtunify.cmi
 contrib/jprover/jtunify.cmx: contrib/jprover/jtunify.cmi 
 contrib/jprover/opname.cmo: contrib/jprover/opname.cmi 
 contrib/jprover/opname.cmx: contrib/jprover/opname.cmi 
-contrib/omega/coq_omega.cmo: parsing/ast.cmi proofs/clenv.cmi \
+contrib/omega/coq_omega.cmo: parsing/ast.cmi pretyping/clenv.cmi \
     kernel/closure.cmi tactics/contradiction.cmi interp/coqlib.cmi \
     kernel/declarations.cmi kernel/environ.cmi tactics/equality.cmi \
     proofs/evar_refiner.cmi library/global.cmi library/goptions.cmi \
@@ -3103,7 +3100,7 @@ contrib/omega/coq_omega.cmo: parsing/ast.cmi proofs/clenv.cmi \
     kernel/sign.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
     tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
     pretyping/termops.cmi lib/util.cmi 
-contrib/omega/coq_omega.cmx: parsing/ast.cmx proofs/clenv.cmx \
+contrib/omega/coq_omega.cmx: parsing/ast.cmx pretyping/clenv.cmx \
     kernel/closure.cmx tactics/contradiction.cmx interp/coqlib.cmx \
     kernel/declarations.cmx kernel/environ.cmx tactics/equality.cmx \
     proofs/evar_refiner.cmx library/global.cmx library/goptions.cmx \