Imported Upstream version 8.1~gammaupstream/8.1.gamma

1 files changed, 753 insertions, 625 deletions

diff --git a/.depend b/.depend
index f762207f..6c36e157 100644
--- a/.depend
+++ b/.depend
@@ -77,10 +77,11 @@ kernel/term_typing.cmi: kernel/univ.cmi kernel/typeops.cmi kernel/term.cmi \
     kernel/entries.cmi kernel/declarations.cmi kernel/cooking.cmi 
 kernel/type_errors.cmi: kernel/term.cmi kernel/names.cmi kernel/environ.cmi 
 kernel/typeops.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/names.cmi kernel/environ.cmi kernel/entries.cmi 
+    kernel/names.cmi kernel/environ.cmi kernel/entries.cmi \
+    kernel/declarations.cmi 
 kernel/univ.cmi: lib/pp.cmi kernel/names.cmi 
-kernel/vconv.cmi: kernel/vm.cmi kernel/term.cmi kernel/reduction.cmi \
-    kernel/names.cmi kernel/environ.cmi 
+kernel/vconv.cmi: kernel/term.cmi kernel/reduction.cmi kernel/names.cmi \
+    kernel/environ.cmi 
 kernel/vm.cmi: kernel/term.cmi kernel/names.cmi kernel/cemitcodes.cmi \
     kernel/cbytecodes.cmi 
 lib/bigint.cmi: lib/pp.cmi 
@@ -129,11 +130,12 @@ parsing/lexer.cmi: lib/util.cmi lib/pp.cmi
 parsing/pcoq.cmi: toplevel/vernacexpr.cmo lib/util.cmi interp/topconstr.cmi \
     proofs/tacexpr.cmo pretyping/rawterm.cmi kernel/names.cmi \
     library/libnames.cmi interp/genarg.cmi parsing/extend.cmi \
-    library/decl_kinds.cmo lib/bigint.cmi 
+    library/decl_kinds.cmo proofs/decl_expr.cmi lib/bigint.cmi 
 parsing/ppconstr.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
     proofs/tacexpr.cmo pretyping/rawterm.cmi interp/ppextend.cmi lib/pp.cmi \
     parsing/pcoq.cmi kernel/names.cmi library/libnames.cmi interp/genarg.cmi \
     kernel/environ.cmi 
+parsing/ppdecl_proof.cmi: lib/pp.cmi kernel/environ.cmi proofs/decl_expr.cmi 
 parsing/pptactic.cmi: interp/topconstr.cmi kernel/term.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi proofs/proof_type.cmi pretyping/pretyping.cmi \
     interp/ppextend.cmi lib/pp.cmi library/libnames.cmi interp/genarg.cmi \
@@ -183,7 +185,7 @@ pretyping/evarutil.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
     kernel/names.cmi pretyping/evd.cmi kernel/environ.cmi 
 pretyping/evd.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
     kernel/reduction.cmi lib/pp.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi kernel/environ.cmi 
+    library/libnames.cmi kernel/environ.cmi lib/dyn.cmi 
 pretyping/indrec.cmi: kernel/term.cmi kernel/names.cmi \
     pretyping/inductiveops.cmi pretyping/evd.cmi kernel/environ.cmi \
     kernel/declarations.cmi 
@@ -222,9 +224,17 @@ pretyping/termops.cmi: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
 pretyping/typing.cmi: kernel/term.cmi pretyping/evd.cmi kernel/environ.cmi 
 pretyping/unification.cmi: kernel/term.cmi pretyping/evd.cmi \
     kernel/environ.cmi 
+pretyping/vnorm.cmi: kernel/term.cmi kernel/reduction.cmi kernel/names.cmi \
+    kernel/environ.cmi 
 proofs/clenvtac.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
     proofs/proof_type.cmi kernel/names.cmi pretyping/evd.cmi \
     pretyping/clenv.cmi 
+proofs/decl_expr.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
+    proofs/tacexpr.cmo pretyping/rawterm.cmi kernel/names.cmi \
+    interp/genarg.cmi 
+proofs/decl_mode.cmi: kernel/term.cmi proofs/tacmach.cmi \
+    proofs/proof_type.cmi kernel/names.cmi pretyping/evd.cmi lib/dyn.cmi \
+    proofs/decl_expr.cmi 
 proofs/evar_refiner.cmi: interp/topconstr.cmi kernel/term.cmi \
     proofs/refiner.cmi pretyping/rawterm.cmi kernel/names.cmi \
     pretyping/evd.cmi kernel/environ.cmi 
@@ -236,11 +246,11 @@ proofs/pfedit.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
     library/decl_kinds.cmo 
 proofs/proof_trees.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
     proofs/proof_type.cmi lib/pp.cmi kernel/names.cmi pretyping/evd.cmi \
-    kernel/environ.cmi 
+    kernel/environ.cmi lib/dyn.cmi 
 proofs/proof_type.cmi: lib/util.cmi kernel/term.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi pretyping/pattern.cmi library/nametab.cmi \
     kernel/names.cmi library/libnames.cmi interp/genarg.cmi pretyping/evd.cmi \
-    kernel/environ.cmi 
+    kernel/environ.cmi proofs/decl_expr.cmi 
 proofs/redexpr.cmi: kernel/term.cmi pretyping/reductionops.cmi \
     pretyping/rawterm.cmi kernel/names.cmi kernel/closure.cmi 
 proofs/refiner.cmi: pretyping/termops.cmi kernel/term.cmi proofs/tacexpr.cmo \
@@ -260,11 +270,18 @@ tactics/auto.cmi: toplevel/vernacexpr.cmo lib/util.cmi kernel/term.cmi \
     pretyping/pattern.cmi kernel/names.cmi kernel/mod_subst.cmi \
     library/libnames.cmi pretyping/evd.cmi kernel/environ.cmi \
     pretyping/clenv.cmi tactics/btermdn.cmi 
-tactics/autorewrite.cmi: kernel/term.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo kernel/names.cmi 
+tactics/autorewrite.cmi: kernel/term.cmi tactics/tacticals.cmi \
+    proofs/tacmach.cmi proofs/tacexpr.cmo kernel/names.cmi 
 tactics/btermdn.cmi: kernel/term.cmi pretyping/pattern.cmi 
 tactics/contradiction.cmi: kernel/term.cmi pretyping/rawterm.cmi \
     proofs/proof_type.cmi kernel/names.cmi 
+tactics/decl_interp.cmi: tactics/tacinterp.cmi kernel/mod_subst.cmi \
+    pretyping/evd.cmi kernel/environ.cmi proofs/decl_mode.cmi \
+    proofs/decl_expr.cmi 
+tactics/decl_proof_instr.cmi: kernel/term.cmi proofs/tacmach.cmi \
+    proofs/refiner.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
+    kernel/names.cmi kernel/environ.cmi proofs/decl_mode.cmi \
+    proofs/decl_expr.cmi 
 tactics/dhyp.cmi: toplevel/vernacexpr.cmo interp/topconstr.cmi \
     proofs/tacmach.cmi proofs/tacexpr.cmo kernel/names.cmi 
 tactics/eauto.cmi: interp/topconstr.cmi kernel/term.cmi proofs/tacexpr.cmo \
@@ -276,15 +293,16 @@ tactics/equality.cmi: kernel/term.cmi tactics/tactics.cmi \
     tactics/tacticals.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
     kernel/sign.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
     pretyping/pattern.cmi kernel/names.cmi tactics/hipattern.cmi \
-    pretyping/evd.cmi kernel/environ.cmi 
+    interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi 
 tactics/evar_tactics.cmi: kernel/term.cmi proofs/tacmach.cmi \
     proofs/tacexpr.cmo pretyping/rawterm.cmi kernel/names.cmi 
 tactics/extraargs.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tacexpr.cmo tactics/setoid_replace.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi parsing/pcoq.cmi kernel/names.cmi 
+    tactics/tacticals.cmi proofs/tacexpr.cmo tactics/setoid_replace.cmi \
+    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/pcoq.cmi \
+    kernel/names.cmi 
 tactics/extratactics.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
     proofs/tacexpr.cmo pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/pcoq.cmi kernel/names.cmi interp/genarg.cmi 
+    kernel/names.cmi interp/genarg.cmi 
 tactics/hiddentac.cmi: kernel/term.cmi tactics/tacticals.cmi \
     proofs/tacmach.cmi proofs/tacexpr.cmo proofs/redexpr.cmi \
     pretyping/rawterm.cmi proofs/proof_type.cmi kernel/names.cmi \
@@ -358,7 +376,8 @@ toplevel/whelp.cmi: interp/topconstr.cmi kernel/term.cmi kernel/names.cmi \
     kernel/environ.cmi 
 contrib/cc/ccalgo.cmi: lib/util.cmi kernel/term.cmi lib/pp.cmi \
     kernel/names.cmi 
-contrib/cc/ccproof.cmi: kernel/names.cmi contrib/cc/ccalgo.cmi 
+contrib/cc/ccproof.cmi: kernel/term.cmi kernel/names.cmi \
+    contrib/cc/ccalgo.cmi 
 contrib/cc/cctac.cmi: kernel/term.cmi proofs/proof_type.cmi 
 contrib/correctness/past.cmi: lib/util.cmi interp/topconstr.cmi \
     kernel/term.cmi kernel/names.cmi 
@@ -483,14 +502,15 @@ contrib/subtac/subtac_errors.cmi: lib/util.cmi lib/pp.cmi
 contrib/subtac/subtac_interp_fixpoint.cmi: lib/util.cmi interp/topconstr.cmi \
     lib/pp.cmi kernel/names.cmi library/libnames.cmi 
 contrib/subtac/subtac.cmi: toplevel/vernacexpr.cmo lib/util.cmi 
+contrib/subtac/subtac_obligations.cmi: kernel/term.cmi kernel/names.cmi 
 contrib/subtac/subtac_pretyping.cmi: interp/topconstr.cmi kernel/term.cmi \
     kernel/sign.cmi pretyping/pretyping.cmi kernel/names.cmi \
     library/global.cmi pretyping/evd.cmi kernel/environ.cmi 
 contrib/subtac/subtac_utils.cmi: lib/util.cmi interp/topconstr.cmi \
-    kernel/term.cmi proofs/tacexpr.cmo pretyping/rawterm.cmi \
-    proofs/proof_type.cmi lib/pp.cmi kernel/names.cmi library/libnames.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi \
-    library/decl_kinds.cmo interp/coqlib.cmi 
+    kernel/term.cmi proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi \
+    pretyping/rawterm.cmi proofs/proof_type.cmi lib/pp.cmi kernel/names.cmi \
+    library/libnames.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
+    kernel/environ.cmi library/decl_kinds.cmo interp/coqlib.cmi 
 contrib/xml/doubleTypeInference.cmi: kernel/term.cmi kernel/names.cmi \
     pretyping/evd.cmi kernel/environ.cmi contrib/xml/acic.cmo 
 contrib/xml/xmlcommand.cmi: contrib/xml/xml.cmi kernel/term.cmi \
@@ -541,13 +561,13 @@ ide/config_parser.cmx: lib/util.cmx ide/config_parser.cmi
 ide/coqide.cmo: toplevel/vernacexpr.cmo lib/util.cmi ide/undo.cmi \
     lib/system.cmi ide/preferences.cmi lib/pp.cmi proofs/pfedit.cmi \
     ide/ideutils.cmi ide/highlight.cmo ide/find_phrase.cmo \
-    config/coq_config.cmi ide/coq_commands.cmo ide/coq.cmi \
-    ide/command_windows.cmi ide/blaster_window.cmo ide/coqide.cmi 
+    proofs/decl_mode.cmi config/coq_config.cmi ide/coq_commands.cmo \
+    ide/coq.cmi ide/command_windows.cmi ide/blaster_window.cmo ide/coqide.cmi 
 ide/coqide.cmx: toplevel/vernacexpr.cmx lib/util.cmx ide/undo.cmx \
     lib/system.cmx ide/preferences.cmx lib/pp.cmx proofs/pfedit.cmx \
     ide/ideutils.cmx ide/highlight.cmx ide/find_phrase.cmx \
-    config/coq_config.cmx ide/coq_commands.cmx ide/coq.cmx \
-    ide/command_windows.cmx ide/blaster_window.cmx ide/coqide.cmi 
+    proofs/decl_mode.cmx config/coq_config.cmx ide/coq_commands.cmx \
+    ide/coq.cmx ide/command_windows.cmx ide/blaster_window.cmx ide/coqide.cmi 
 ide/coq.cmo: toplevel/vernacexpr.cmo toplevel/vernacentries.cmi \
     toplevel/vernac.cmi lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
     proofs/tacmach.cmi tactics/tacinterp.cmi lib/system.cmi \
@@ -555,10 +575,10 @@ ide/coq.cmo: toplevel/vernacexpr.cmo toplevel/vernacentries.cmi \
     parsing/printer.cmi lib/pp.cmi proofs/pfedit.cmi parsing/pcoq.cmi \
     lib/options.cmi library/nametab.cmi kernel/names.cmi toplevel/mltop.cmi \
     library/library.cmi library/libnames.cmi library/lib.cmi ide/ideutils.cmi \
-    tactics/hipattern.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi kernel/declarations.cmi \
-    toplevel/coqtop.cmi config/coq_config.cmi toplevel/cerrors.cmi \
-    ide/coq.cmi 
+    tactics/hipattern.cmi library/goptions.cmi library/global.cmi \
+    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi \
+    kernel/declarations.cmi proofs/decl_mode.cmi toplevel/coqtop.cmi \
+    config/coq_config.cmi toplevel/cerrors.cmi ide/coq.cmi 
 ide/coq.cmx: toplevel/vernacexpr.cmx toplevel/vernacentries.cmx \
     toplevel/vernac.cmx lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
     proofs/tacmach.cmx tactics/tacinterp.cmx lib/system.cmx \
@@ -566,14 +586,14 @@ ide/coq.cmx: toplevel/vernacexpr.cmx toplevel/vernacentries.cmx \
     parsing/printer.cmx lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx \
     lib/options.cmx library/nametab.cmx kernel/names.cmx toplevel/mltop.cmx \
     library/library.cmx library/libnames.cmx library/lib.cmx ide/ideutils.cmx \
-    tactics/hipattern.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx kernel/declarations.cmx \
-    toplevel/coqtop.cmx config/coq_config.cmx toplevel/cerrors.cmx \
-    ide/coq.cmi 
+    tactics/hipattern.cmx library/goptions.cmx library/global.cmx \
+    pretyping/evd.cmx pretyping/evarutil.cmx kernel/environ.cmx \
+    kernel/declarations.cmx proofs/decl_mode.cmx toplevel/coqtop.cmx \
+    config/coq_config.cmx toplevel/cerrors.cmx ide/coq.cmi 
 ide/coq_tactics.cmo: ide/coq_tactics.cmi 
 ide/coq_tactics.cmx: ide/coq_tactics.cmi 
-ide/find_phrase.cmo: ide/ideutils.cmi 
-ide/find_phrase.cmx: ide/ideutils.cmx 
+ide/find_phrase.cmo: ide/preferences.cmi ide/ideutils.cmi 
+ide/find_phrase.cmx: ide/preferences.cmx ide/ideutils.cmx 
 ide/highlight.cmo: ide/ideutils.cmi 
 ide/highlight.cmx: ide/ideutils.cmx 
 ide/ideutils.cmo: ide/utf8_convert.cmo lib/system.cmi ide/preferences.cmi \
@@ -677,13 +697,13 @@ interp/syntax_def.cmx: lib/util.cmx interp/topconstr.cmx library/summary.cmx \
     kernel/names.cmx library/nameops.cmx library/libobject.cmx \
     library/libnames.cmx library/lib.cmx interp/syntax_def.cmi 
 interp/topconstr.cmo: lib/util.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    lib/pp.cmi kernel/names.cmi library/nameops.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi pretyping/evd.cmi lib/dyn.cmi pretyping/detyping.cmi \
-    lib/bigint.cmi interp/topconstr.cmi 
+    lib/pp.cmi library/nametab.cmi kernel/names.cmi library/nameops.cmi \
+    kernel/mod_subst.cmi library/libnames.cmi pretyping/evd.cmi lib/dyn.cmi \
+    pretyping/detyping.cmi lib/bigint.cmi interp/topconstr.cmi 
 interp/topconstr.cmx: lib/util.cmx kernel/term.cmx pretyping/rawterm.cmx \
-    lib/pp.cmx kernel/names.cmx library/nameops.cmx kernel/mod_subst.cmx \
-    library/libnames.cmx pretyping/evd.cmx lib/dyn.cmx pretyping/detyping.cmx \
-    lib/bigint.cmx interp/topconstr.cmi 
+    lib/pp.cmx library/nametab.cmx kernel/names.cmx library/nameops.cmx \
+    kernel/mod_subst.cmx library/libnames.cmx pretyping/evd.cmx lib/dyn.cmx \
+    pretyping/detyping.cmx lib/bigint.cmx interp/topconstr.cmi 
 kernel/cbytecodes.cmo: kernel/term.cmi kernel/names.cmi kernel/cbytecodes.cmi 
 kernel/cbytecodes.cmx: kernel/term.cmx kernel/names.cmx kernel/cbytecodes.cmi 
 kernel/cbytegen.cmo: lib/util.cmi kernel/term.cmi kernel/pre_env.cmi \
@@ -704,12 +724,14 @@ kernel/closure.cmx: lib/util.cmx kernel/term.cmx kernel/sign.cmx lib/pp.cmx \
     kernel/declarations.cmx kernel/closure.cmi 
 kernel/conv_oracle.cmo: kernel/names.cmi kernel/conv_oracle.cmi 
 kernel/conv_oracle.cmx: kernel/names.cmx kernel/conv_oracle.cmi 
-kernel/cooking.cmo: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/reduction.cmi lib/pp.cmi kernel/names.cmi kernel/environ.cmi \
-    kernel/declarations.cmi kernel/cemitcodes.cmi kernel/cooking.cmi 
-kernel/cooking.cmx: lib/util.cmx kernel/term.cmx kernel/sign.cmx \
-    kernel/reduction.cmx lib/pp.cmx kernel/names.cmx kernel/environ.cmx \
-    kernel/declarations.cmx kernel/cemitcodes.cmx kernel/cooking.cmi 
+kernel/cooking.cmo: lib/util.cmi kernel/typeops.cmi kernel/term.cmi \
+    kernel/sign.cmi kernel/reduction.cmi lib/pp.cmi kernel/names.cmi \
+    kernel/environ.cmi kernel/declarations.cmi kernel/cemitcodes.cmi \
+    kernel/cooking.cmi 
+kernel/cooking.cmx: lib/util.cmx kernel/typeops.cmx kernel/term.cmx \
+    kernel/sign.cmx kernel/reduction.cmx lib/pp.cmx kernel/names.cmx \
+    kernel/environ.cmx kernel/declarations.cmx kernel/cemitcodes.cmx \
+    kernel/cooking.cmi 
 kernel/csymtable.cmo: kernel/vm.cmi kernel/term.cmi kernel/pre_env.cmi \
     kernel/names.cmi kernel/declarations.cmi kernel/cemitcodes.cmi \
     kernel/cbytegen.cmi kernel/cbytecodes.cmi kernel/csymtable.cmi 
@@ -746,10 +768,12 @@ kernel/indtypes.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
     kernel/entries.cmx kernel/declarations.cmx kernel/indtypes.cmi 
 kernel/inductive.cmo: lib/util.cmi kernel/univ.cmi kernel/type_errors.cmi \
     kernel/term.cmi kernel/sign.cmi kernel/reduction.cmi kernel/names.cmi \
-    kernel/environ.cmi kernel/declarations.cmi kernel/inductive.cmi 
+    kernel/environ.cmi kernel/declarations.cmi kernel/closure.cmi \
+    kernel/inductive.cmi 
 kernel/inductive.cmx: lib/util.cmx kernel/univ.cmx kernel/type_errors.cmx \
     kernel/term.cmx kernel/sign.cmx kernel/reduction.cmx kernel/names.cmx \
-    kernel/environ.cmx kernel/declarations.cmx kernel/inductive.cmi 
+    kernel/environ.cmx kernel/declarations.cmx kernel/closure.cmx \
+    kernel/inductive.cmi 
 kernel/modops.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi lib/pp.cmi \
     kernel/names.cmi kernel/mod_subst.cmi kernel/environ.cmi \
     kernel/entries.cmi kernel/declarations.cmi kernel/cemitcodes.cmi \
@@ -808,12 +832,12 @@ kernel/sign.cmo: lib/util.cmi kernel/term.cmi kernel/names.cmi \
     kernel/sign.cmi 
 kernel/sign.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
     kernel/sign.cmi 
-kernel/subtyping.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/reduction.cmi kernel/names.cmi kernel/modops.cmi \
+kernel/subtyping.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
+    kernel/term.cmi kernel/reduction.cmi kernel/names.cmi kernel/modops.cmi \
     kernel/mod_subst.cmi kernel/inductive.cmi kernel/environ.cmi \
     kernel/entries.cmi kernel/declarations.cmi kernel/subtyping.cmi 
-kernel/subtyping.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/reduction.cmx kernel/names.cmx kernel/modops.cmx \
+kernel/subtyping.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
+    kernel/term.cmx kernel/reduction.cmx kernel/names.cmx kernel/modops.cmx \
     kernel/mod_subst.cmx kernel/inductive.cmx kernel/environ.cmx \
     kernel/entries.cmx kernel/declarations.cmx kernel/subtyping.cmi 
 kernel/term.cmo: lib/util.cmi kernel/univ.cmi lib/pp.cmi kernel/names.cmi \
@@ -848,14 +872,14 @@ kernel/univ.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi lib/hashcons.cmi \
     kernel/univ.cmi 
 kernel/univ.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx lib/hashcons.cmx \
     kernel/univ.cmi 
-kernel/vconv.cmo: kernel/vm.cmi lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/reduction.cmi kernel/names.cmi kernel/inductive.cmi \
-    kernel/environ.cmi kernel/declarations.cmi kernel/csymtable.cmi \
-    kernel/conv_oracle.cmi kernel/closure.cmi kernel/vconv.cmi 
-kernel/vconv.cmx: kernel/vm.cmx lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/reduction.cmx kernel/names.cmx kernel/inductive.cmx \
-    kernel/environ.cmx kernel/declarations.cmx kernel/csymtable.cmx \
-    kernel/conv_oracle.cmx kernel/closure.cmx kernel/vconv.cmi 
+kernel/vconv.cmo: kernel/vm.cmi kernel/univ.cmi kernel/term.cmi \
+    kernel/reduction.cmi kernel/names.cmi kernel/environ.cmi \
+    kernel/declarations.cmi kernel/csymtable.cmi kernel/conv_oracle.cmi \
+    kernel/closure.cmi kernel/vconv.cmi 
+kernel/vconv.cmx: kernel/vm.cmx kernel/univ.cmx kernel/term.cmx \
+    kernel/reduction.cmx kernel/names.cmx kernel/environ.cmx \
+    kernel/declarations.cmx kernel/csymtable.cmx kernel/conv_oracle.cmx \
+    kernel/closure.cmx kernel/vconv.cmi 
 kernel/vm.cmo: lib/util.cmi kernel/term.cmi kernel/names.cmi \
     kernel/conv_oracle.cmi kernel/cbytecodes.cmi kernel/vm.cmi 
 kernel/vm.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
@@ -934,14 +958,14 @@ library/dischargedhypsmap.cmx: lib/util.cmx kernel/term.cmx \
     kernel/names.cmx library/libobject.cmx library/libnames.cmx \
     library/lib.cmx kernel/inductive.cmx kernel/environ.cmx \
     kernel/declarations.cmx library/dischargedhypsmap.cmi 
-library/global.cmo: lib/util.cmi kernel/term.cmi library/summary.cmi \
-    kernel/sign.cmi kernel/safe_typing.cmi kernel/names.cmi \
-    library/libnames.cmi kernel/inductive.cmi kernel/environ.cmi \
-    library/global.cmi 
-library/global.cmx: lib/util.cmx kernel/term.cmx library/summary.cmx \
-    kernel/sign.cmx kernel/safe_typing.cmx kernel/names.cmx \
-    library/libnames.cmx kernel/inductive.cmx kernel/environ.cmx \
-    library/global.cmi 
+library/global.cmo: lib/util.cmi kernel/typeops.cmi kernel/term.cmi \
+    library/summary.cmi kernel/sign.cmi kernel/safe_typing.cmi \
+    kernel/names.cmi library/libnames.cmi kernel/inductive.cmi \
+    kernel/environ.cmi library/global.cmi 
+library/global.cmx: lib/util.cmx kernel/typeops.cmx kernel/term.cmx \
+    library/summary.cmx kernel/sign.cmx kernel/safe_typing.cmx \
+    kernel/names.cmx library/libnames.cmx kernel/inductive.cmx \
+    kernel/environ.cmx library/global.cmi 
 library/goptions.cmo: lib/util.cmi kernel/term.cmi library/summary.cmi \
     lib/pp.cmi library/nametab.cmi kernel/names.cmi kernel/mod_subst.cmi \
     library/libobject.cmi library/libnames.cmi library/lib.cmi \
@@ -950,18 +974,18 @@ library/goptions.cmx: lib/util.cmx kernel/term.cmx library/summary.cmx \
     lib/pp.cmx library/nametab.cmx kernel/names.cmx kernel/mod_subst.cmx \
     library/libobject.cmx library/libnames.cmx library/lib.cmx \
     library/goptions.cmi 
-library/impargs.cmo: lib/util.cmi interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi library/summary.cmi kernel/reduction.cmi lib/pp.cmi \
-    library/nametab.cmi kernel/names.cmi library/libobject.cmi \
-    library/libnames.cmi library/lib.cmi kernel/inductive.cmi \
-    library/global.cmi kernel/environ.cmi kernel/declarations.cmi \
-    library/impargs.cmi 
-library/impargs.cmx: lib/util.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx library/summary.cmx kernel/reduction.cmx lib/pp.cmx \
-    library/nametab.cmx kernel/names.cmx library/libobject.cmx \
-    library/libnames.cmx library/lib.cmx kernel/inductive.cmx \
-    library/global.cmx kernel/environ.cmx kernel/declarations.cmx \
-    library/impargs.cmi 
+library/impargs.cmo: lib/util.cmi kernel/typeops.cmi interp/topconstr.cmi \
+    pretyping/termops.cmi kernel/term.cmi library/summary.cmi \
+    kernel/reduction.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
+    library/libobject.cmi library/libnames.cmi library/lib.cmi \
+    kernel/inductive.cmi library/global.cmi kernel/environ.cmi \
+    kernel/declarations.cmi library/impargs.cmi 
+library/impargs.cmx: lib/util.cmx kernel/typeops.cmx interp/topconstr.cmx \
+    pretyping/termops.cmx kernel/term.cmx library/summary.cmx \
+    kernel/reduction.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
+    library/libobject.cmx library/libnames.cmx library/lib.cmx \
+    kernel/inductive.cmx library/global.cmx kernel/environ.cmx \
+    kernel/declarations.cmx library/impargs.cmi 
 library/lib.cmo: lib/util.cmi kernel/term.cmi library/summary.cmi \
     kernel/sign.cmi lib/pp.cmi lib/options.cmi library/nametab.cmi \
     kernel/names.cmi library/nameops.cmi library/libobject.cmi \
@@ -1008,8 +1032,6 @@ library/summary.cmo: lib/util.cmi lib/pp.cmi lib/dyn.cmi library/summary.cmi
 library/summary.cmx: lib/util.cmx lib/pp.cmx lib/dyn.cmx library/summary.cmi 
 lib/rtree.cmo: lib/util.cmi lib/pp.cmi lib/rtree.cmi 
 lib/rtree.cmx: lib/util.cmx lib/pp.cmx lib/rtree.cmi 
-lib/stamps.cmo: lib/stamps.cmi 
-lib/stamps.cmx: lib/stamps.cmi 
 lib/system.cmo: lib/util.cmi lib/pp.cmi config/coq_config.cmi lib/system.cmi 
 lib/system.cmx: lib/util.cmx lib/pp.cmx config/coq_config.cmx lib/system.cmi 
 lib/tlm.cmo: lib/gset.cmi lib/gmap.cmi lib/tlm.cmi 
@@ -1048,6 +1070,12 @@ parsing/g_constr.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
 parsing/g_constr.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
     pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx \
     library/libnames.cmx parsing/lexer.cmx lib/bigint.cmx 
+parsing/g_decl_mode.cmo: interp/topconstr.cmi kernel/term.cmi \
+    parsing/pcoq.cmi kernel/names.cmi library/libnames.cmi interp/genarg.cmi \
+    proofs/decl_expr.cmi 
+parsing/g_decl_mode.cmx: interp/topconstr.cmx kernel/term.cmx \
+    parsing/pcoq.cmx kernel/names.cmx library/libnames.cmx interp/genarg.cmx \
+    proofs/decl_expr.cmi 
 parsing/g_ltac.cmo: toplevel/vernacexpr.cmo lib/util.cmi interp/topconstr.cmi \
     proofs/tacexpr.cmo pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi \
     kernel/names.cmi 
@@ -1107,13 +1135,13 @@ parsing/g_vernac.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
     lib/pp.cmi parsing/pcoq.cmi lib/options.cmi kernel/names.cmi \
     library/nameops.cmi parsing/lexer.cmi library/goptions.cmi \
     interp/genarg.cmi parsing/g_constr.cmo parsing/extend.cmi \
-    library/decl_kinds.cmo toplevel/class.cmi 
+    proofs/decl_mode.cmi library/decl_kinds.cmo toplevel/class.cmi 
 parsing/g_vernac.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
     interp/topconstr.cmx pretyping/recordops.cmx interp/ppextend.cmx \
     lib/pp.cmx parsing/pcoq.cmx lib/options.cmx kernel/names.cmx \
     library/nameops.cmx parsing/lexer.cmx library/goptions.cmx \
     interp/genarg.cmx parsing/g_constr.cmx parsing/extend.cmx \
-    library/decl_kinds.cmx toplevel/class.cmx 
+    proofs/decl_mode.cmx library/decl_kinds.cmx toplevel/class.cmx 
 parsing/g_xml.cmo: lib/util.cmi kernel/term.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi library/nametab.cmi \
     kernel/names.cmi library/libnames.cmi pretyping/inductiveops.cmi \
@@ -1156,6 +1184,14 @@ parsing/ppconstr.cmx: lib/util.cmx kernel/univ.cmx interp/topconstr.cmx \
     library/nameops.cmx library/libnames.cmx interp/genarg.cmx \
     pretyping/evd.cmx interp/constrextern.cmx lib/bigint.cmx \
     parsing/ppconstr.cmi 
+parsing/ppdecl_proof.cmo: lib/util.cmi kernel/term.cmi parsing/printer.cmi \
+    parsing/pptactic.cmi parsing/ppconstr.cmi lib/pp.cmi kernel/names.cmi \
+    library/nameops.cmi kernel/environ.cmi proofs/decl_expr.cmi \
+    parsing/ppdecl_proof.cmi 
+parsing/ppdecl_proof.cmx: lib/util.cmx kernel/term.cmx parsing/printer.cmx \
+    parsing/pptactic.cmx parsing/ppconstr.cmx lib/pp.cmx kernel/names.cmx \
+    library/nameops.cmx kernel/environ.cmx proofs/decl_expr.cmi \
+    parsing/ppdecl_proof.cmi 
 parsing/pptactic.cmo: lib/util.cmi interp/topconstr.cmi pretyping/termops.cmi \
     kernel/term.cmi proofs/tactic_debug.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi parsing/printer.cmi interp/ppextend.cmi \
@@ -1214,14 +1250,14 @@ parsing/printer.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
     library/nametab.cmi kernel/names.cmi library/nameops.cmi \
     library/libnames.cmi library/global.cmi pretyping/evd.cmi \
     pretyping/evarutil.cmi kernel/environ.cmi library/declare.cmi \
-    interp/constrextern.cmi parsing/printer.cmi 
+    proofs/decl_mode.cmi interp/constrextern.cmi parsing/printer.cmi 
 parsing/printer.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
     kernel/sign.cmx proofs/refiner.cmx proofs/proof_type.cmx \
     parsing/ppconstr.cmx lib/pp.cmx proofs/pfedit.cmx lib/options.cmx \
     library/nametab.cmx kernel/names.cmx library/nameops.cmx \
     library/libnames.cmx library/global.cmx pretyping/evd.cmx \
     pretyping/evarutil.cmx kernel/environ.cmx library/declare.cmx \
-    interp/constrextern.cmx parsing/printer.cmi 
+    proofs/decl_mode.cmx interp/constrextern.cmx parsing/printer.cmi 
 parsing/printmod.cmo: lib/util.cmi lib/pp.cmi library/nametab.cmi \
     kernel/names.cmi library/nameops.cmi library/libnames.cmi \
     library/global.cmi kernel/declarations.cmi parsing/printmod.cmi 
@@ -1242,22 +1278,22 @@ parsing/q_util.cmo: toplevel/vernacexpr.cmo lib/util.cmi parsing/pcoq.cmi \
     interp/genarg.cmi parsing/q_util.cmi 
 parsing/q_util.cmx: toplevel/vernacexpr.cmx lib/util.cmx parsing/pcoq.cmx \
     interp/genarg.cmx parsing/q_util.cmi 
-parsing/search.cmo: lib/util.cmi pretyping/typing.cmi pretyping/termops.cmi \
-    kernel/term.cmi pretyping/rawterm.cmi parsing/printer.cmi lib/pp.cmi \
-    pretyping/pattern.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/matching.cmi library/libobject.cmi \
-    library/libnames.cmi pretyping/inductiveops.cmi library/global.cmi \
-    pretyping/evd.cmi kernel/environ.cmi library/declaremods.cmi \
-    library/declare.cmi kernel/declarations.cmi interp/coqlib.cmi \
-    parsing/search.cmi 
-parsing/search.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
-    kernel/term.cmx pretyping/rawterm.cmx parsing/printer.cmx lib/pp.cmx \
-    pretyping/pattern.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/matching.cmx library/libobject.cmx \
-    library/libnames.cmx pretyping/inductiveops.cmx library/global.cmx \
-    pretyping/evd.cmx kernel/environ.cmx library/declaremods.cmx \
-    library/declare.cmx kernel/declarations.cmx interp/coqlib.cmx \
-    parsing/search.cmi 
+parsing/search.cmo: lib/util.cmi pretyping/typing.cmi kernel/typeops.cmi \
+    pretyping/termops.cmi kernel/term.cmi pretyping/rawterm.cmi \
+    parsing/printer.cmi lib/pp.cmi pretyping/pattern.cmi library/nametab.cmi \
+    kernel/names.cmi library/nameops.cmi pretyping/matching.cmi \
+    library/libobject.cmi library/libnames.cmi pretyping/inductiveops.cmi \
+    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
+    library/declaremods.cmi library/declare.cmi kernel/declarations.cmi \
+    interp/coqlib.cmi parsing/search.cmi 
+parsing/search.cmx: lib/util.cmx pretyping/typing.cmx kernel/typeops.cmx \
+    pretyping/termops.cmx kernel/term.cmx pretyping/rawterm.cmx \
+    parsing/printer.cmx lib/pp.cmx pretyping/pattern.cmx library/nametab.cmx \
+    kernel/names.cmx library/nameops.cmx pretyping/matching.cmx \
+    library/libobject.cmx library/libnames.cmx pretyping/inductiveops.cmx \
+    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
+    library/declaremods.cmx library/declare.cmx kernel/declarations.cmx \
+    interp/coqlib.cmx parsing/search.cmi 
 parsing/tacextend.cmo: lib/util.cmi parsing/q_util.cmi parsing/q_coqast.cmo \
     lib/pp_control.cmi lib/pp.cmi parsing/pcoq.cmi interp/genarg.cmi \
     parsing/argextend.cmo 
@@ -1266,14 +1302,14 @@ parsing/tacextend.cmx: lib/util.cmx parsing/q_util.cmx parsing/q_coqast.cmx \
     parsing/argextend.cmx 
 parsing/tactic_printer.cmo: lib/util.cmi proofs/tacexpr.cmo kernel/sign.cmi \
     proofs/refiner.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi proofs/logic.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    parsing/tactic_printer.cmi 
+    parsing/printer.cmi parsing/pptactic.cmi parsing/ppdecl_proof.cmi \
+    lib/pp.cmi proofs/logic.cmi library/global.cmi pretyping/evd.cmi \
+    kernel/environ.cmi proofs/decl_expr.cmi parsing/tactic_printer.cmi 
 parsing/tactic_printer.cmx: lib/util.cmx proofs/tacexpr.cmx kernel/sign.cmx \
     proofs/refiner.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx proofs/logic.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    parsing/tactic_printer.cmi 
+    parsing/printer.cmx parsing/pptactic.cmx parsing/ppdecl_proof.cmx \
+    lib/pp.cmx proofs/logic.cmx library/global.cmx pretyping/evd.cmx \
+    kernel/environ.cmx proofs/decl_expr.cmi parsing/tactic_printer.cmi 
 parsing/vernacextend.cmo: lib/util.cmi parsing/q_util.cmi \
     parsing/q_coqast.cmo lib/pp_control.cmi lib/pp.cmi interp/genarg.cmi \
     parsing/argextend.cmo 
@@ -1287,7 +1323,7 @@ pretyping/cases.cmo: lib/util.cmi kernel/typeops.cmi kernel/type_errors.cmi \
     library/nameops.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
     library/global.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
     pretyping/evarconv.cmi kernel/environ.cmi kernel/declarations.cmi \
-    pretyping/coercion.cmi pretyping/cases.cmi 
+    pretyping/coercion.cmi kernel/closure.cmi pretyping/cases.cmi 
 pretyping/cases.cmx: lib/util.cmx kernel/typeops.cmx kernel/type_errors.cmx \
     pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx \
     pretyping/retyping.cmx pretyping/reductionops.cmx pretyping/rawterm.cmx \
@@ -1295,7 +1331,7 @@ pretyping/cases.cmx: lib/util.cmx kernel/typeops.cmx kernel/type_errors.cmx \
     library/nameops.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
     library/global.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
     pretyping/evarconv.cmx kernel/environ.cmx kernel/declarations.cmx \
-    pretyping/coercion.cmx pretyping/cases.cmi 
+    pretyping/coercion.cmx kernel/closure.cmx pretyping/cases.cmi 
 pretyping/cbv.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi lib/pp.cmi \
     kernel/names.cmi pretyping/evd.cmi kernel/esubst.cmi kernel/environ.cmi \
     kernel/conv_oracle.cmi kernel/closure.cmi pretyping/cbv.cmi 
@@ -1307,15 +1343,17 @@ pretyping/classops.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
     pretyping/rawterm.cmi lib/pp.cmi lib/options.cmi library/nametab.cmi \
     kernel/names.cmi kernel/mod_subst.cmi library/library.cmi \
     library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    library/goptions.cmi lib/gmap.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi library/decl_kinds.cmo pretyping/classops.cmi 
+    pretyping/inductiveops.cmi library/goptions.cmi lib/gmap.cmi \
+    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
+    library/decl_kinds.cmo pretyping/classops.cmi 
 pretyping/classops.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
     pretyping/tacred.cmx library/summary.cmx pretyping/reductionops.cmx \
     pretyping/rawterm.cmx lib/pp.cmx lib/options.cmx library/nametab.cmx \
     kernel/names.cmx kernel/mod_subst.cmx library/library.cmx \
     library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    library/goptions.cmx lib/gmap.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx library/decl_kinds.cmx pretyping/classops.cmi 
+    pretyping/inductiveops.cmx library/goptions.cmx lib/gmap.cmx \
+    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
+    library/decl_kinds.cmx pretyping/classops.cmi 
 pretyping/clenv.cmo: lib/util.cmi pretyping/unification.cmi \
     pretyping/typing.cmi pretyping/termops.cmi kernel/term.cmi \
     pretyping/tacred.cmi proofs/tacexpr.cmo kernel/sign.cmi \
@@ -1334,18 +1372,18 @@ pretyping/clenv.cmx: lib/util.cmx pretyping/unification.cmx \
     kernel/mod_subst.cmx library/global.cmx pretyping/evd.cmx \
     pretyping/evarutil.cmx kernel/environ.cmx pretyping/coercion.cmx \
     pretyping/clenv.cmi 
-pretyping/coercion.cmo: lib/util.cmi kernel/typeops.cmi kernel/term.cmi \
-    pretyping/retyping.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    pretyping/recordops.cmi pretyping/rawterm.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi kernel/names.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi pretyping/evarconv.cmi \
-    kernel/environ.cmi pretyping/classops.cmi pretyping/coercion.cmi 
-pretyping/coercion.cmx: lib/util.cmx kernel/typeops.cmx kernel/term.cmx \
-    pretyping/retyping.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    pretyping/recordops.cmx pretyping/rawterm.cmx \
-    pretyping/pretype_errors.cmx lib/pp.cmx kernel/names.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx pretyping/evarconv.cmx \
-    kernel/environ.cmx pretyping/classops.cmx pretyping/coercion.cmi 
+pretyping/coercion.cmo: lib/util.cmi kernel/typeops.cmi pretyping/termops.cmi \
+    kernel/term.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
+    kernel/reduction.cmi pretyping/recordops.cmi pretyping/rawterm.cmi \
+    pretyping/pretype_errors.cmi kernel/names.cmi pretyping/evd.cmi \
+    pretyping/evarutil.cmi pretyping/evarconv.cmi kernel/environ.cmi \
+    pretyping/classops.cmi pretyping/coercion.cmi 
+pretyping/coercion.cmx: lib/util.cmx kernel/typeops.cmx pretyping/termops.cmx \
+    kernel/term.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
+    kernel/reduction.cmx pretyping/recordops.cmx pretyping/rawterm.cmx \
+    pretyping/pretype_errors.cmx kernel/names.cmx pretyping/evd.cmx \
+    pretyping/evarutil.cmx pretyping/evarconv.cmx kernel/environ.cmx \
+    pretyping/classops.cmx pretyping/coercion.cmi 
 pretyping/detyping.cmo: lib/util.cmi kernel/univ.cmi pretyping/termops.cmi \
     kernel/term.cmi kernel/sign.cmi pretyping/rawterm.cmi lib/pp.cmi \
     lib/options.cmi library/nametab.cmi kernel/names.cmi library/nameops.cmi \
@@ -1360,16 +1398,18 @@ pretyping/detyping.cmx: lib/util.cmx kernel/univ.cmx pretyping/termops.cmx \
     kernel/inductive.cmx library/goptions.cmx library/global.cmx \
     pretyping/evd.cmx kernel/environ.cmx kernel/declarations.cmx \
     pretyping/detyping.cmi 
-pretyping/evarconv.cmo: lib/util.cmi pretyping/typing.cmi kernel/term.cmi \
-    pretyping/reductionops.cmi kernel/reduction.cmi pretyping/recordops.cmi \
-    kernel/names.cmi library/libnames.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi kernel/closure.cmi \
-    pretyping/classops.cmi pretyping/evarconv.cmi 
-pretyping/evarconv.cmx: lib/util.cmx pretyping/typing.cmx kernel/term.cmx \
-    pretyping/reductionops.cmx kernel/reduction.cmx pretyping/recordops.cmx \
-    kernel/names.cmx library/libnames.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx kernel/closure.cmx \
-    pretyping/classops.cmx pretyping/evarconv.cmi 
+pretyping/evarconv.cmo: lib/util.cmi pretyping/typing.cmi \
+    pretyping/termops.cmi kernel/term.cmi pretyping/reductionops.cmi \
+    kernel/reduction.cmi pretyping/recordops.cmi lib/pp.cmi kernel/names.cmi \
+    library/libnames.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
+    kernel/environ.cmi kernel/closure.cmi pretyping/classops.cmi \
+    pretyping/evarconv.cmi 
+pretyping/evarconv.cmx: lib/util.cmx pretyping/typing.cmx \
+    pretyping/termops.cmx kernel/term.cmx pretyping/reductionops.cmx \
+    kernel/reduction.cmx pretyping/recordops.cmx lib/pp.cmx kernel/names.cmx \
+    library/libnames.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
+    kernel/environ.cmx kernel/closure.cmx pretyping/classops.cmx \
+    pretyping/evarconv.cmi 
 pretyping/evarutil.cmo: lib/util.cmi kernel/univ.cmi pretyping/typing.cmi \
     kernel/typeops.cmi pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
     pretyping/reductionops.cmi kernel/reduction.cmi \
@@ -1385,12 +1425,12 @@ pretyping/evarutil.cmx: lib/util.cmx kernel/univ.cmx pretyping/typing.cmx \
 pretyping/evd.cmo: lib/util.cmi kernel/univ.cmi pretyping/termops.cmi \
     kernel/term.cmi kernel/sign.cmi kernel/reduction.cmi lib/pp.cmi \
     kernel/names.cmi library/nameops.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi library/global.cmi kernel/environ.cmi \
+    library/libnames.cmi library/global.cmi kernel/environ.cmi lib/dyn.cmi \
     pretyping/evd.cmi 
 pretyping/evd.cmx: lib/util.cmx kernel/univ.cmx pretyping/termops.cmx \
     kernel/term.cmx kernel/sign.cmx kernel/reduction.cmx lib/pp.cmx \
     kernel/names.cmx library/nameops.cmx kernel/mod_subst.cmx \
-    library/libnames.cmx library/global.cmx kernel/environ.cmx \
+    library/libnames.cmx library/global.cmx kernel/environ.cmx lib/dyn.cmx \
     pretyping/evd.cmi 
 pretyping/indrec.cmo: lib/util.cmi kernel/typeops.cmi kernel/type_errors.cmi \
     pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
@@ -1497,13 +1537,15 @@ pretyping/reductionops.cmx: lib/util.cmx kernel/univ.cmx \
     kernel/esubst.cmx kernel/environ.cmx kernel/declarations.cmx \
     kernel/closure.cmx pretyping/reductionops.cmi 
 pretyping/retyping.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/term.cmi pretyping/reductionops.cmi kernel/names.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/declarations.cmi pretyping/retyping.cmi 
+    pretyping/termops.cmi kernel/term.cmi pretyping/reductionops.cmi \
+    kernel/names.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
+    pretyping/evd.cmi kernel/environ.cmi kernel/declarations.cmi \
+    pretyping/retyping.cmi 
 pretyping/retyping.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/term.cmx pretyping/reductionops.cmx kernel/names.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx pretyping/retyping.cmi 
+    pretyping/termops.cmx kernel/term.cmx pretyping/reductionops.cmx \
+    kernel/names.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
+    pretyping/evd.cmx kernel/environ.cmx kernel/declarations.cmx \
+    pretyping/retyping.cmi 
 pretyping/tacred.cmo: lib/util.cmi pretyping/typing.cmi \
     kernel/type_errors.cmi pretyping/termops.cmi kernel/term.cmi \
     library/summary.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
@@ -1550,6 +1592,14 @@ pretyping/unification.cmx: lib/util.cmx pretyping/typing.cmx \
     pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
     library/global.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
     kernel/environ.cmx pretyping/unification.cmi 
+pretyping/vnorm.cmo: kernel/vm.cmi kernel/vconv.cmi lib/util.cmi \
+    kernel/typeops.cmi kernel/term.cmi kernel/reduction.cmi kernel/names.cmi \
+    kernel/inductive.cmi kernel/environ.cmi kernel/declarations.cmi \
+    pretyping/vnorm.cmi 
+pretyping/vnorm.cmx: kernel/vm.cmx kernel/vconv.cmx lib/util.cmx \
+    kernel/typeops.cmx kernel/term.cmx kernel/reduction.cmx kernel/names.cmx \
+    kernel/inductive.cmx kernel/environ.cmx kernel/declarations.cmx \
+    pretyping/vnorm.cmi 
 proofs/clenvtac.cmo: lib/util.cmi pretyping/unification.cmi \
     pretyping/typing.cmi pretyping/termops.cmi kernel/term.cmi \
     proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi proofs/refiner.cmi \
@@ -1568,6 +1618,12 @@ proofs/clenvtac.cmx: lib/util.cmx pretyping/unification.cmx \
     proofs/logic.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
     proofs/evar_refiner.cmx kernel/environ.cmx pretyping/clenv.cmx \
     proofs/clenvtac.cmi 
+proofs/decl_mode.cmo: lib/util.cmi kernel/term.cmi proofs/refiner.cmi \
+    proofs/proof_trees.cmi proofs/pfedit.cmi kernel/names.cmi \
+    pretyping/evd.cmi lib/dyn.cmi proofs/decl_expr.cmi proofs/decl_mode.cmi 
+proofs/decl_mode.cmx: lib/util.cmx kernel/term.cmx proofs/refiner.cmx \
+    proofs/proof_trees.cmx proofs/pfedit.cmx kernel/names.cmx \
+    pretyping/evd.cmx lib/dyn.cmx proofs/decl_expr.cmi proofs/decl_mode.cmi 
 proofs/evar_refiner.cmo: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
     proofs/refiner.cmi proofs/proof_trees.cmi pretyping/pretyping.cmi \
     kernel/names.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
@@ -1611,29 +1667,31 @@ proofs/proof_trees.cmo: lib/util.cmi pretyping/typing.cmi \
     kernel/sign.cmi proofs/proof_type.cmi lib/pp.cmi library/nametab.cmi \
     kernel/names.cmi library/nameops.cmi library/libnames.cmi \
     pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi \
-    pretyping/detyping.cmi kernel/closure.cmi proofs/proof_trees.cmi 
+    pretyping/detyping.cmi proofs/decl_expr.cmi kernel/closure.cmi \
+    proofs/proof_trees.cmi 
 proofs/proof_trees.cmx: lib/util.cmx pretyping/typing.cmx \
     pretyping/termops.cmx kernel/term.cmx pretyping/tacred.cmx \
     kernel/sign.cmx proofs/proof_type.cmx lib/pp.cmx library/nametab.cmx \
     kernel/names.cmx library/nameops.cmx library/libnames.cmx \
     pretyping/evd.cmx pretyping/evarutil.cmx kernel/environ.cmx \
-    pretyping/detyping.cmx kernel/closure.cmx proofs/proof_trees.cmi 
+    pretyping/detyping.cmx proofs/decl_expr.cmi kernel/closure.cmx \
+    proofs/proof_trees.cmi 
 proofs/proof_type.cmo: lib/util.cmi kernel/term.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi pretyping/pattern.cmi library/nametab.cmi \
     kernel/names.cmi library/libnames.cmi interp/genarg.cmi pretyping/evd.cmi \
-    kernel/environ.cmi proofs/proof_type.cmi 
+    kernel/environ.cmi proofs/decl_expr.cmi proofs/proof_type.cmi 
 proofs/proof_type.cmx: lib/util.cmx kernel/term.cmx proofs/tacexpr.cmx \
     pretyping/rawterm.cmx pretyping/pattern.cmx library/nametab.cmx \
     kernel/names.cmx library/libnames.cmx interp/genarg.cmx pretyping/evd.cmx \
-    kernel/environ.cmx proofs/proof_type.cmi 
-proofs/redexpr.cmo: kernel/vconv.cmi lib/util.cmi kernel/typeops.cmi \
+    kernel/environ.cmx proofs/decl_expr.cmi proofs/proof_type.cmi 
+proofs/redexpr.cmo: pretyping/vnorm.cmi lib/util.cmi kernel/typeops.cmi \
     kernel/term.cmi pretyping/tacred.cmi library/summary.cmi \
     pretyping/reductionops.cmi pretyping/rawterm.cmi lib/pp.cmi \
     library/nametab.cmi kernel/names.cmi library/libnames.cmi \
     library/global.cmi kernel/environ.cmi kernel/declarations.cmi \
     kernel/csymtable.cmi kernel/conv_oracle.cmi kernel/closure.cmi \
     proofs/redexpr.cmi 
-proofs/redexpr.cmx: kernel/vconv.cmx lib/util.cmx kernel/typeops.cmx \
+proofs/redexpr.cmx: pretyping/vnorm.cmx lib/util.cmx kernel/typeops.cmx \
     kernel/term.cmx pretyping/tacred.cmx library/summary.cmx \
     pretyping/reductionops.cmx pretyping/rawterm.cmx lib/pp.cmx \
     library/nametab.cmx kernel/names.cmx library/libnames.cmx \
@@ -1715,31 +1773,75 @@ tactics/auto.cmx: toplevel/vernacexpr.cmx lib/util.cmx pretyping/typing.cmx \
 tactics/autorewrite.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
     pretyping/typing.cmi kernel/term.cmi tactics/tactics.cmi \
     tactics/tacticals.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo library/summary.cmi proofs/proof_type.cmi \
-    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi kernel/names.cmi \
-    kernel/mod_subst.cmi library/libobject.cmi library/lib.cmi \
-    tactics/hipattern.cmi library/global.cmi pretyping/evd.cmi \
-    tactics/equality.cmi kernel/environ.cmi tactics/autorewrite.cmi 
+    proofs/tacexpr.cmo library/summary.cmi proofs/refiner.cmi \
+    proofs/proof_type.cmi parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi \
+    kernel/names.cmi kernel/mod_subst.cmi library/libobject.cmi \
+    library/lib.cmi tactics/hipattern.cmi library/global.cmi \
+    pretyping/evd.cmi tactics/equality.cmi kernel/environ.cmi \
+    tactics/autorewrite.cmi 
 tactics/autorewrite.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
     pretyping/typing.cmx kernel/term.cmx tactics/tactics.cmx \
     tactics/tacticals.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx library/summary.cmx proofs/proof_type.cmx \
-    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx kernel/names.cmx \
-    kernel/mod_subst.cmx library/libobject.cmx library/lib.cmx \
-    tactics/hipattern.cmx library/global.cmx pretyping/evd.cmx \
-    tactics/equality.cmx kernel/environ.cmx tactics/autorewrite.cmi 
+    proofs/tacexpr.cmx library/summary.cmx proofs/refiner.cmx \
+    proofs/proof_type.cmx parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx \
+    kernel/names.cmx kernel/mod_subst.cmx library/libobject.cmx \
+    library/lib.cmx tactics/hipattern.cmx library/global.cmx \
+    pretyping/evd.cmx tactics/equality.cmx kernel/environ.cmx \
+    tactics/autorewrite.cmi 
 tactics/btermdn.cmo: tactics/termdn.cmi kernel/term.cmi pretyping/pattern.cmi \
     library/libnames.cmi tactics/dn.cmi tactics/btermdn.cmi 
 tactics/btermdn.cmx: tactics/termdn.cmx kernel/term.cmx pretyping/pattern.cmx \
     library/libnames.cmx tactics/dn.cmx tactics/btermdn.cmi 
 tactics/contradiction.cmo: lib/util.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi pretyping/reductionops.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi tactics/hipattern.cmi \
-    interp/coqlib.cmi tactics/contradiction.cmi 
+    tactics/tacticals.cmi proofs/tacmach.cmi pretyping/retyping.cmi \
+    pretyping/reductionops.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
+    tactics/hipattern.cmi pretyping/evd.cmi kernel/environ.cmi \
+    interp/coqlib.cmi pretyping/coercion.cmi tactics/contradiction.cmi 
 tactics/contradiction.cmx: lib/util.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx pretyping/reductionops.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx tactics/hipattern.cmx \
-    interp/coqlib.cmx tactics/contradiction.cmi 
+    tactics/tacticals.cmx proofs/tacmach.cmx pretyping/retyping.cmx \
+    pretyping/reductionops.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
+    tactics/hipattern.cmx pretyping/evd.cmx kernel/environ.cmx \
+    interp/coqlib.cmx pretyping/coercion.cmx tactics/contradiction.cmi 
+tactics/decl_interp.cmo: lib/util.cmi interp/topconstr.cmi \
+    pretyping/termops.cmi kernel/term.cmi proofs/tacmach.cmi \
+    tactics/tacinterp.cmi pretyping/rawterm.cmi pretyping/pretyping.cmi \
+    lib/pp.cmi kernel/names.cmi library/nameops.cmi library/libnames.cmi \
+    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
+    pretyping/detyping.cmi kernel/declarations.cmi proofs/decl_mode.cmi \
+    proofs/decl_expr.cmi interp/coqlib.cmi interp/constrintern.cmi \
+    kernel/closure.cmi tactics/decl_interp.cmi 
+tactics/decl_interp.cmx: lib/util.cmx interp/topconstr.cmx \
+    pretyping/termops.cmx kernel/term.cmx proofs/tacmach.cmx \
+    tactics/tacinterp.cmx pretyping/rawterm.cmx pretyping/pretyping.cmx \
+    lib/pp.cmx kernel/names.cmx library/nameops.cmx library/libnames.cmx \
+    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
+    pretyping/detyping.cmx kernel/declarations.cmx proofs/decl_mode.cmx \
+    proofs/decl_expr.cmi interp/coqlib.cmx interp/constrintern.cmx \
+    kernel/closure.cmx tactics/decl_interp.cmi 
+tactics/decl_proof_instr.cmo: lib/util.cmi pretyping/unification.cmi \
+    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
+    tactics/tacticals.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
+    proofs/tacexpr.cmo proofs/refiner.cmi pretyping/reductionops.cmi \
+    kernel/reduction.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
+    proofs/proof_trees.cmi parsing/printer.cmi lib/pp.cmi proofs/pfedit.cmi \
+    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
+    pretyping/inductiveops.cmi kernel/inductive.cmi library/goptions.cmi \
+    library/global.cmi interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi \
+    kernel/declarations.cmi proofs/decl_mode.cmi tactics/decl_interp.cmi \
+    proofs/decl_expr.cmi interp/coqlib.cmi kernel/closure.cmi \
+    tactics/decl_proof_instr.cmi 
+tactics/decl_proof_instr.cmx: lib/util.cmx pretyping/unification.cmx \
+    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
+    tactics/tacticals.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
+    proofs/tacexpr.cmx proofs/refiner.cmx pretyping/reductionops.cmx \
+    kernel/reduction.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
+    proofs/proof_trees.cmx parsing/printer.cmx lib/pp.cmx proofs/pfedit.cmx \
+    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
+    pretyping/inductiveops.cmx kernel/inductive.cmx library/goptions.cmx \
+    library/global.cmx interp/genarg.cmx pretyping/evd.cmx kernel/environ.cmx \
+    kernel/declarations.cmx proofs/decl_mode.cmx tactics/decl_interp.cmx \
+    proofs/decl_expr.cmi interp/coqlib.cmx kernel/closure.cmx \
+    tactics/decl_proof_instr.cmi 
 tactics/dhyp.cmo: lib/util.cmi kernel/term.cmi tactics/tactics.cmi \
     tactics/tacticals.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
     library/summary.cmi proofs/refiner.cmi kernel/reduction.cmi \
@@ -1850,24 +1952,25 @@ tactics/evar_tactics.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
     proofs/refiner.cmx proofs/proof_type.cmx pretyping/evd.cmx \
     pretyping/evarutil.cmx proofs/evar_refiner.cmx kernel/environ.cmx \
     tactics/evar_tactics.cmi 
-tactics/extraargs.cmo: lib/util.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    tactics/setoid_replace.cmi parsing/printer.cmi parsing/pptactic.cmi \
-    lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi library/nameops.cmi \
-    toplevel/metasyntax.cmi parsing/lexer.cmi interp/genarg.cmi \
-    tactics/extraargs.cmi 
-tactics/extraargs.cmx: lib/util.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    tactics/setoid_replace.cmx parsing/printer.cmx parsing/pptactic.cmx \
-    lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx library/nameops.cmx \
-    toplevel/metasyntax.cmx parsing/lexer.cmx interp/genarg.cmx \
-    tactics/extraargs.cmi 
+tactics/extraargs.cmo: lib/util.cmi tactics/tacticals.cmi \
+    tactics/tacinterp.cmi proofs/tacexpr.cmo tactics/setoid_replace.cmi \
+    parsing/printer.cmi parsing/pptactic.cmi interp/ppextend.cmi \
+    parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi \
+    library/nameops.cmi toplevel/metasyntax.cmi parsing/lexer.cmi \
+    interp/genarg.cmi tactics/extraargs.cmi 
+tactics/extraargs.cmx: lib/util.cmx tactics/tacticals.cmx \
+    tactics/tacinterp.cmx proofs/tacexpr.cmx tactics/setoid_replace.cmx \
+    parsing/printer.cmx parsing/pptactic.cmx interp/ppextend.cmx \
+    parsing/ppconstr.cmx lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx \
+    library/nameops.cmx toplevel/metasyntax.cmx parsing/lexer.cmx \
+    interp/genarg.cmx tactics/extraargs.cmi 
 tactics/extratactics.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
     kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
     tactics/tacinterp.cmi proofs/tacexpr.cmo library/summary.cmi \
     tactics/setoid_replace.cmi proofs/refiner.cmi tactics/refine.cmi \
-    pretyping/rawterm.cmi parsing/pptactic.cmi interp/ppextend.cmi lib/pp.cmi \
-    parsing/pcoq.cmi kernel/names.cmi library/nameops.cmi \
-    kernel/mod_subst.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi parsing/lexer.cmi tactics/leminv.cmi tactics/inv.cmi \
+    pretyping/rawterm.cmi parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi \
+    kernel/names.cmi kernel/mod_subst.cmi library/libobject.cmi \
+    library/libnames.cmi library/lib.cmi tactics/leminv.cmi tactics/inv.cmi \
     library/global.cmi interp/genarg.cmi tactics/extraargs.cmi \
     pretyping/evd.cmi tactics/evar_tactics.cmi tactics/equality.cmi \
     parsing/egrammar.cmi tactics/contradiction.cmi interp/constrintern.cmi \
@@ -1876,10 +1979,9 @@ tactics/extratactics.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
     kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
     tactics/tacinterp.cmx proofs/tacexpr.cmx library/summary.cmx \
     tactics/setoid_replace.cmx proofs/refiner.cmx tactics/refine.cmx \
-    pretyping/rawterm.cmx parsing/pptactic.cmx interp/ppextend.cmx lib/pp.cmx \
-    parsing/pcoq.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx parsing/lexer.cmx tactics/leminv.cmx tactics/inv.cmx \
+    pretyping/rawterm.cmx parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx \
+    kernel/names.cmx kernel/mod_subst.cmx library/libobject.cmx \
+    library/libnames.cmx library/lib.cmx tactics/leminv.cmx tactics/inv.cmx \
     library/global.cmx interp/genarg.cmx tactics/extraargs.cmx \
     pretyping/evd.cmx tactics/evar_tactics.cmx tactics/equality.cmx \
     parsing/egrammar.cmx tactics/contradiction.cmx interp/constrintern.cmx \
@@ -2058,9 +2160,9 @@ tactics/tacticals.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
     pretyping/evd.cmx proofs/evar_refiner.cmx kernel/environ.cmx \
     kernel/declarations.cmx proofs/clenvtac.cmx pretyping/clenv.cmx \
     tactics/tacticals.cmi 
-tactics/tactics.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tacticals.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo kernel/sign.cmi proofs/refiner.cmi \
+tactics/tactics.cmo: lib/util.cmi pretyping/typing.cmi pretyping/termops.cmi \
+    kernel/term.cmi tactics/tacticals.cmi pretyping/tacred.cmi \
+    proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi proofs/refiner.cmi \
     pretyping/reductionops.cmi kernel/reduction.cmi proofs/redexpr.cmi \
     pretyping/rawterm.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
     pretyping/pretype_errors.cmi lib/pp.cmi proofs/pfedit.cmi lib/options.cmi \
@@ -2072,9 +2174,9 @@ tactics/tactics.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
     library/declare.cmi kernel/declarations.cmi library/decl_kinds.cmo \
     interp/coqlib.cmi interp/constrintern.cmi proofs/clenvtac.cmi \
     pretyping/clenv.cmi tactics/tactics.cmi 
-tactics/tactics.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tacticals.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
-    proofs/tacexpr.cmx kernel/sign.cmx proofs/refiner.cmx \
+tactics/tactics.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
+    kernel/term.cmx tactics/tacticals.cmx pretyping/tacred.cmx \
+    proofs/tacmach.cmx proofs/tacexpr.cmx kernel/sign.cmx proofs/refiner.cmx \
     pretyping/reductionops.cmx kernel/reduction.cmx proofs/redexpr.cmx \
     pretyping/rawterm.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
     pretyping/pretype_errors.cmx lib/pp.cmx proofs/pfedit.cmx lib/options.cmx \
@@ -2141,33 +2243,35 @@ toplevel/class.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
 toplevel/command.cmo: toplevel/vernacexpr.cmo lib/util.cmi kernel/typeops.cmi \
     interp/topconstr.cmi pretyping/termops.cmi kernel/term.cmi \
     proofs/tacmach.cmi interp/syntax_def.cmi library/states.cmi \
-    kernel/safe_typing.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
-    kernel/reduction.cmi proofs/redexpr.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi parsing/printer.cmi pretyping/pretyping.cmi \
+    kernel/sign.cmi kernel/safe_typing.cmi pretyping/retyping.cmi \
+    pretyping/reductionops.cmi kernel/reduction.cmi proofs/redexpr.cmi \
+    pretyping/rawterm.cmi proofs/proof_type.cmi pretyping/pretyping.cmi \
     lib/pp.cmi proofs/pfedit.cmi lib/options.cmi interp/notation.cmi \
     library/nametab.cmi kernel/names.cmi library/nameops.cmi \
     toplevel/metasyntax.cmi proofs/logic.cmi library/library.cmi \
     library/libobject.cmi library/libnames.cmi library/lib.cmi \
     kernel/inductive.cmi kernel/indtypes.cmi pretyping/indrec.cmi \
     library/impargs.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/entries.cmi library/declare.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo interp/constrintern.cmi \
-    interp/constrextern.cmi toplevel/class.cmi toplevel/command.cmi 
+    pretyping/evarutil.cmi pretyping/evarconv.cmi kernel/environ.cmi \
+    kernel/entries.cmi library/declare.cmi kernel/declarations.cmi \
+    library/decl_kinds.cmo interp/constrintern.cmi interp/constrextern.cmi \
+    toplevel/class.cmi toplevel/command.cmi 
 toplevel/command.cmx: toplevel/vernacexpr.cmx lib/util.cmx kernel/typeops.cmx \
     interp/topconstr.cmx pretyping/termops.cmx kernel/term.cmx \
     proofs/tacmach.cmx interp/syntax_def.cmx library/states.cmx \
-    kernel/safe_typing.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
-    kernel/reduction.cmx proofs/redexpr.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx parsing/printer.cmx pretyping/pretyping.cmx \
+    kernel/sign.cmx kernel/safe_typing.cmx pretyping/retyping.cmx \
+    pretyping/reductionops.cmx kernel/reduction.cmx proofs/redexpr.cmx \
+    pretyping/rawterm.cmx proofs/proof_type.cmx pretyping/pretyping.cmx \
     lib/pp.cmx proofs/pfedit.cmx lib/options.cmx interp/notation.cmx \
     library/nametab.cmx kernel/names.cmx library/nameops.cmx \
     toplevel/metasyntax.cmx proofs/logic.cmx library/library.cmx \
     library/libobject.cmx library/libnames.cmx library/lib.cmx \
     kernel/inductive.cmx kernel/indtypes.cmx pretyping/indrec.cmx \
     library/impargs.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/entries.cmx library/declare.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx interp/constrintern.cmx \
-    interp/constrextern.cmx toplevel/class.cmx toplevel/command.cmi 
+    pretyping/evarutil.cmx pretyping/evarconv.cmx kernel/environ.cmx \
+    kernel/entries.cmx library/declare.cmx kernel/declarations.cmx \
+    library/decl_kinds.cmx interp/constrintern.cmx interp/constrextern.cmx \
+    toplevel/class.cmx toplevel/command.cmi 
 toplevel/coqinit.cmo: toplevel/vernac.cmi toplevel/toplevel.cmi \
     lib/system.cmi lib/pp.cmi lib/options.cmi kernel/names.cmi \
     library/nameops.cmi toplevel/mltop.cmi config/coq_config.cmi \
@@ -2193,11 +2297,13 @@ toplevel/coqtop.cmx: kernel/vm.cmx toplevel/vernac.cmx kernel/vconv.cmx \
     toplevel/coqinit.cmx config/coq_config.cmx interp/constrintern.cmx \
     toplevel/cerrors.cmx toplevel/coqtop.cmi 
 toplevel/discharge.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/names.cmi kernel/inductive.cmi kernel/entries.cmi \
-    kernel/declarations.cmi kernel/cooking.cmi toplevel/discharge.cmi 
+    kernel/sign.cmi kernel/names.cmi kernel/inductive.cmi library/global.cmi \
+    kernel/entries.cmi kernel/declarations.cmi kernel/cooking.cmi \
+    toplevel/discharge.cmi 
 toplevel/discharge.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/names.cmx kernel/inductive.cmx kernel/entries.cmx \
-    kernel/declarations.cmx kernel/cooking.cmx toplevel/discharge.cmi 
+    kernel/sign.cmx kernel/names.cmx kernel/inductive.cmx library/global.cmx \
+    kernel/entries.cmx kernel/declarations.cmx kernel/cooking.cmx \
+    toplevel/discharge.cmi 
 toplevel/fhimsg.cmo: lib/util.cmi kernel/type_errors.cmi kernel/term.cmi \
     kernel/sign.cmi kernel/reduction.cmi lib/pp.cmi kernel/names.cmi \
     parsing/g_minicoq.cmi kernel/environ.cmi toplevel/fhimsg.cmi 
@@ -2298,19 +2404,20 @@ toplevel/vernacentries.cmo: kernel/vm.cmi toplevel/vernacinterp.cmi \
     kernel/term.cmi tactics/tactics.cmi parsing/tactic_printer.cmi \
     proofs/tactic_debug.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
     proofs/tacexpr.cmo lib/system.cmi interp/syntax_def.cmi \
-    library/states.cmi tactics/setoid_replace.cmi parsing/search.cmi \
-    kernel/safe_typing.cmi interp/reserve.cmi pretyping/reductionops.cmi \
-    proofs/redexpr.cmi pretyping/recordops.cmi toplevel/record.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    parsing/printmod.cmi parsing/printer.cmi pretyping/pretyping.cmi \
-    parsing/prettyp.cmi lib/pp_control.cmi lib/pp.cmi proofs/pfedit.cmi \
-    lib/options.cmi interp/notation.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi interp/modintern.cmi toplevel/mltop.cmi \
-    toplevel/metasyntax.cmi library/library.cmi library/libnames.cmi \
-    library/lib.cmi pretyping/inductiveops.cmi library/impargs.cmi \
-    library/goptions.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi kernel/entries.cmi \
-    pretyping/detyping.cmi library/declaremods.cmi kernel/declarations.cmi \
+    library/states.cmi kernel/sign.cmi tactics/setoid_replace.cmi \
+    parsing/search.cmi kernel/safe_typing.cmi interp/reserve.cmi \
+    pretyping/reductionops.cmi proofs/redexpr.cmi pretyping/recordops.cmi \
+    toplevel/record.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
+    proofs/proof_trees.cmi parsing/printmod.cmi parsing/printer.cmi \
+    pretyping/pretyping.cmi parsing/prettyp.cmi lib/pp_control.cmi lib/pp.cmi \
+    proofs/pfedit.cmi lib/options.cmi interp/notation.cmi library/nametab.cmi \
+    kernel/names.cmi library/nameops.cmi interp/modintern.cmi \
+    toplevel/mltop.cmi toplevel/metasyntax.cmi library/library.cmi \
+    library/libnames.cmi library/lib.cmi pretyping/inductiveops.cmi \
+    library/impargs.cmi library/goptions.cmi library/global.cmi \
+    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi \
+    kernel/entries.cmi pretyping/detyping.cmi library/declaremods.cmi \
+    kernel/declarations.cmi tactics/decl_proof_instr.cmi proofs/decl_mode.cmi \
     library/decl_kinds.cmo interp/constrintern.cmi interp/constrextern.cmi \
     toplevel/command.cmi pretyping/classops.cmi toplevel/class.cmi \
     tactics/autorewrite.cmi tactics/auto.cmi toplevel/vernacentries.cmi 
@@ -2320,30 +2427,33 @@ toplevel/vernacentries.cmx: kernel/vm.cmx toplevel/vernacinterp.cmx \
     kernel/term.cmx tactics/tactics.cmx parsing/tactic_printer.cmx \
     proofs/tactic_debug.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
     proofs/tacexpr.cmx lib/system.cmx interp/syntax_def.cmx \
-    library/states.cmx tactics/setoid_replace.cmx parsing/search.cmx \
-    kernel/safe_typing.cmx interp/reserve.cmx pretyping/reductionops.cmx \
-    proofs/redexpr.cmx pretyping/recordops.cmx toplevel/record.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    parsing/printmod.cmx parsing/printer.cmx pretyping/pretyping.cmx \
-    parsing/prettyp.cmx lib/pp_control.cmx lib/pp.cmx proofs/pfedit.cmx \
-    lib/options.cmx interp/notation.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx interp/modintern.cmx toplevel/mltop.cmx \
-    toplevel/metasyntax.cmx library/library.cmx library/libnames.cmx \
-    library/lib.cmx pretyping/inductiveops.cmx library/impargs.cmx \
-    library/goptions.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx kernel/entries.cmx \
-    pretyping/detyping.cmx library/declaremods.cmx kernel/declarations.cmx \
+    library/states.cmx kernel/sign.cmx tactics/setoid_replace.cmx \
+    parsing/search.cmx kernel/safe_typing.cmx interp/reserve.cmx \
+    pretyping/reductionops.cmx proofs/redexpr.cmx pretyping/recordops.cmx \
+    toplevel/record.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
+    proofs/proof_trees.cmx parsing/printmod.cmx parsing/printer.cmx \
+    pretyping/pretyping.cmx parsing/prettyp.cmx lib/pp_control.cmx lib/pp.cmx \
+    proofs/pfedit.cmx lib/options.cmx interp/notation.cmx library/nametab.cmx \
+    kernel/names.cmx library/nameops.cmx interp/modintern.cmx \
+    toplevel/mltop.cmx toplevel/metasyntax.cmx library/library.cmx \
+    library/libnames.cmx library/lib.cmx pretyping/inductiveops.cmx \
+    library/impargs.cmx library/goptions.cmx library/global.cmx \
+    pretyping/evd.cmx pretyping/evarutil.cmx kernel/environ.cmx \
+    kernel/entries.cmx pretyping/detyping.cmx library/declaremods.cmx \
+    kernel/declarations.cmx tactics/decl_proof_instr.cmx proofs/decl_mode.cmx \
     library/decl_kinds.cmx interp/constrintern.cmx interp/constrextern.cmx \
     toplevel/command.cmx pretyping/classops.cmx toplevel/class.cmx \
     tactics/autorewrite.cmx tactics/auto.cmx toplevel/vernacentries.cmi 
 toplevel/vernacexpr.cmo: lib/util.cmi interp/topconstr.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi interp/ppextend.cmi library/nametab.cmi \
     kernel/names.cmi library/libnames.cmi library/goptions.cmi \
-    interp/genarg.cmi parsing/extend.cmi library/decl_kinds.cmo 
+    interp/genarg.cmi parsing/extend.cmi library/decl_kinds.cmo \
+    proofs/decl_expr.cmi 
 toplevel/vernacexpr.cmx: lib/util.cmx interp/topconstr.cmx proofs/tacexpr.cmx \
     pretyping/rawterm.cmx interp/ppextend.cmx library/nametab.cmx \
     kernel/names.cmx library/libnames.cmx library/goptions.cmx \
-    interp/genarg.cmx parsing/extend.cmx library/decl_kinds.cmx 
+    interp/genarg.cmx parsing/extend.cmx library/decl_kinds.cmx \
+    proofs/decl_expr.cmi 
 toplevel/vernacinterp.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
     tactics/tacinterp.cmi proofs/tacexpr.cmo proofs/proof_type.cmi lib/pp.cmi \
     lib/options.cmi kernel/names.cmi library/libnames.cmi toplevel/himsg.cmi \
@@ -2382,10 +2492,10 @@ contrib/cc/ccalgo.cmo: lib/util.cmi kernel/term.cmi lib/pp.cmi \
     kernel/names.cmi library/goptions.cmi contrib/cc/ccalgo.cmi 
 contrib/cc/ccalgo.cmx: lib/util.cmx kernel/term.cmx lib/pp.cmx \
     kernel/names.cmx library/goptions.cmx contrib/cc/ccalgo.cmi 
-contrib/cc/ccproof.cmo: lib/util.cmi kernel/names.cmi contrib/cc/ccalgo.cmi \
-    contrib/cc/ccproof.cmi 
-contrib/cc/ccproof.cmx: lib/util.cmx kernel/names.cmx contrib/cc/ccalgo.cmx \
-    contrib/cc/ccproof.cmi 
+contrib/cc/ccproof.cmo: lib/util.cmi kernel/term.cmi kernel/names.cmi \
+    contrib/cc/ccalgo.cmi contrib/cc/ccproof.cmi 
+contrib/cc/ccproof.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
+    contrib/cc/ccalgo.cmx contrib/cc/ccproof.cmi 
 contrib/cc/cctac.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
     tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
     tactics/tacinterp.cmi kernel/sign.cmi proofs/proof_type.cmi lib/pp.cmi \
@@ -2404,14 +2514,12 @@ contrib/cc/cctac.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
     contrib/cc/cctac.cmi 
 contrib/cc/g_congruence.cmo: lib/util.cmi tactics/tactics.cmi \
     tactics/tacticals.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    proofs/refiner.cmi parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi \
-    interp/genarg.cmi parsing/egrammar.cmi toplevel/cerrors.cmi \
-    contrib/cc/cctac.cmi 
+    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi interp/genarg.cmi \
+    parsing/egrammar.cmi toplevel/cerrors.cmi contrib/cc/cctac.cmi 
 contrib/cc/g_congruence.cmx: lib/util.cmx tactics/tactics.cmx \
     tactics/tacticals.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    proofs/refiner.cmx parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx \
-    interp/genarg.cmx parsing/egrammar.cmx toplevel/cerrors.cmx \
-    contrib/cc/cctac.cmx 
+    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx interp/genarg.cmx \
+    parsing/egrammar.cmx toplevel/cerrors.cmx contrib/cc/cctac.cmx 
 contrib/correctness/pcicenv.cmo: kernel/univ.cmi kernel/term.cmi \
     kernel/sign.cmi kernel/names.cmi library/global.cmi \
     contrib/correctness/pcicenv.cmi 
@@ -2608,36 +2716,36 @@ contrib/extraction/common.cmx: lib/util.cmx kernel/term.cmx \
     library/libnames.cmx kernel/inductive.cmx contrib/extraction/haskell.cmx \
     lib/gset.cmx library/global.cmx contrib/extraction/extraction.cmx \
     kernel/declarations.cmx contrib/extraction/common.cmi 
-contrib/extraction/extract_env.cmo: lib/util.cmi kernel/term.cmi \
-    contrib/extraction/table.cmi kernel/reduction.cmi lib/pp.cmi \
-    library/nametab.cmi kernel/names.cmi contrib/extraction/modutil.cmi \
-    kernel/modops.cmi kernel/mod_subst.cmi contrib/extraction/miniml.cmi \
-    library/library.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi library/global.cmi contrib/extraction/extraction.cmi \
-    kernel/declarations.cmi contrib/extraction/common.cmi \
-    contrib/extraction/extract_env.cmi 
-contrib/extraction/extract_env.cmx: lib/util.cmx kernel/term.cmx \
-    contrib/extraction/table.cmx kernel/reduction.cmx lib/pp.cmx \
-    library/nametab.cmx kernel/names.cmx contrib/extraction/modutil.cmx \
-    kernel/modops.cmx kernel/mod_subst.cmx contrib/extraction/miniml.cmi \
-    library/library.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx library/global.cmx contrib/extraction/extraction.cmx \
-    kernel/declarations.cmx contrib/extraction/common.cmx \
-    contrib/extraction/extract_env.cmi 
-contrib/extraction/extraction.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi contrib/extraction/table.cmi library/summary.cmi \
-    pretyping/retyping.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    pretyping/recordops.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi contrib/extraction/mlutil.cmi \
+contrib/extraction/extract_env.cmo: lib/util.cmi kernel/typeops.cmi \
+    kernel/term.cmi contrib/extraction/table.cmi kernel/reduction.cmi \
+    lib/pp.cmi library/nametab.cmi kernel/names.cmi \
+    contrib/extraction/modutil.cmi kernel/modops.cmi kernel/mod_subst.cmi \
+    contrib/extraction/miniml.cmi library/library.cmi library/libobject.cmi \
+    library/libnames.cmi library/lib.cmi library/global.cmi \
+    contrib/extraction/extraction.cmi kernel/declarations.cmi \
+    contrib/extraction/common.cmi contrib/extraction/extract_env.cmi 
+contrib/extraction/extract_env.cmx: lib/util.cmx kernel/typeops.cmx \
+    kernel/term.cmx contrib/extraction/table.cmx kernel/reduction.cmx \
+    lib/pp.cmx library/nametab.cmx kernel/names.cmx \
+    contrib/extraction/modutil.cmx kernel/modops.cmx kernel/mod_subst.cmx \
+    contrib/extraction/miniml.cmi library/library.cmx library/libobject.cmx \
+    library/libnames.cmx library/lib.cmx library/global.cmx \
+    contrib/extraction/extraction.cmx kernel/declarations.cmx \
+    contrib/extraction/common.cmx contrib/extraction/extract_env.cmi 
+contrib/extraction/extraction.cmo: lib/util.cmi kernel/typeops.cmi \
+    pretyping/termops.cmi kernel/term.cmi contrib/extraction/table.cmi \
+    library/summary.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
+    kernel/reduction.cmi pretyping/recordops.cmi library/nametab.cmi \
+    kernel/names.cmi library/nameops.cmi contrib/extraction/mlutil.cmi \
     contrib/extraction/miniml.cmi library/libnames.cmi \
     pretyping/inductiveops.cmi kernel/inductive.cmi pretyping/evd.cmi \
     kernel/environ.cmi kernel/declarations.cmi \
     contrib/extraction/extraction.cmi 
-contrib/extraction/extraction.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx contrib/extraction/table.cmx library/summary.cmx \
-    pretyping/retyping.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    pretyping/recordops.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx contrib/extraction/mlutil.cmx \
+contrib/extraction/extraction.cmx: lib/util.cmx kernel/typeops.cmx \
+    pretyping/termops.cmx kernel/term.cmx contrib/extraction/table.cmx \
+    library/summary.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
+    kernel/reduction.cmx pretyping/recordops.cmx library/nametab.cmx \
+    kernel/names.cmx library/nameops.cmx contrib/extraction/mlutil.cmx \
     contrib/extraction/miniml.cmi library/libnames.cmx \
     pretyping/inductiveops.cmx kernel/inductive.cmx pretyping/evd.cmx \
     kernel/environ.cmx kernel/declarations.cmx \
@@ -2702,13 +2810,13 @@ contrib/extraction/scheme.cmx: lib/util.cmx contrib/extraction/table.cmx \
     library/nameops.cmx contrib/extraction/mlutil.cmx \
     contrib/extraction/miniml.cmi library/libnames.cmx \
     contrib/extraction/scheme.cmi 
-contrib/extraction/table.cmo: lib/util.cmi kernel/term.cmi \
+contrib/extraction/table.cmo: lib/util.cmi kernel/typeops.cmi kernel/term.cmi \
     library/summary.cmi kernel/reduction.cmi parsing/printer.cmi lib/pp.cmi \
     lib/options.cmi library/nametab.cmi kernel/names.cmi library/nameops.cmi \
     contrib/extraction/miniml.cmi library/libobject.cmi library/libnames.cmi \
     library/lib.cmi library/goptions.cmi library/global.cmi \
     kernel/environ.cmi kernel/declarations.cmi contrib/extraction/table.cmi 
-contrib/extraction/table.cmx: lib/util.cmx kernel/term.cmx \
+contrib/extraction/table.cmx: lib/util.cmx kernel/typeops.cmx kernel/term.cmx \
     library/summary.cmx kernel/reduction.cmx parsing/printer.cmx lib/pp.cmx \
     lib/options.cmx library/nametab.cmx kernel/names.cmx library/nameops.cmx \
     contrib/extraction/miniml.cmi library/libobject.cmx library/libnames.cmx \
@@ -2718,24 +2826,24 @@ contrib/field/field.cmo: toplevel/vernacinterp.cmi toplevel/vernacexpr.cmo \
     lib/util.cmi pretyping/typing.cmi interp/topconstr.cmi kernel/term.cmi \
     tactics/tacticals.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
     proofs/tacexpr.cmo library/summary.cmi contrib/ring/ring.cmo \
-    proofs/refiner.cmi pretyping/reductionops.cmi contrib/ring/quote.cmo \
-    proofs/proof_type.cmi parsing/printer.cmi parsing/pptactic.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi \
-    kernel/mod_subst.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi parsing/lexer.cmi tactics/hipattern.cmi lib/gmap.cmi \
-    library/global.cmi interp/genarg.cmi parsing/extend.cmi pretyping/evd.cmi \
+    pretyping/reductionops.cmi contrib/ring/quote.cmo proofs/proof_type.cmi \
+    parsing/printer.cmi parsing/pptactic.cmi parsing/ppconstr.cmi lib/pp.cmi \
+    parsing/pcoq.cmi kernel/names.cmi kernel/mod_subst.cmi \
+    library/libobject.cmi library/libnames.cmi library/lib.cmi \
+    parsing/lexer.cmi tactics/hipattern.cmi lib/gmap.cmi library/global.cmi \
+    interp/genarg.cmi parsing/extend.cmi pretyping/evd.cmi \
     parsing/egrammar.cmi interp/coqlib.cmi interp/constrintern.cmi \
     toplevel/cerrors.cmi 
 contrib/field/field.cmx: toplevel/vernacinterp.cmx toplevel/vernacexpr.cmx \
     lib/util.cmx pretyping/typing.cmx interp/topconstr.cmx kernel/term.cmx \
     tactics/tacticals.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
     proofs/tacexpr.cmx library/summary.cmx contrib/ring/ring.cmx \
-    proofs/refiner.cmx pretyping/reductionops.cmx contrib/ring/quote.cmx \
-    proofs/proof_type.cmx parsing/printer.cmx parsing/pptactic.cmx \
-    parsing/ppconstr.cmx lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx \
-    kernel/mod_subst.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx parsing/lexer.cmx tactics/hipattern.cmx lib/gmap.cmx \
-    library/global.cmx interp/genarg.cmx parsing/extend.cmx pretyping/evd.cmx \
+    pretyping/reductionops.cmx contrib/ring/quote.cmx proofs/proof_type.cmx \
+    parsing/printer.cmx parsing/pptactic.cmx parsing/ppconstr.cmx lib/pp.cmx \
+    parsing/pcoq.cmx kernel/names.cmx kernel/mod_subst.cmx \
+    library/libobject.cmx library/libnames.cmx library/lib.cmx \
+    parsing/lexer.cmx tactics/hipattern.cmx lib/gmap.cmx library/global.cmx \
+    interp/genarg.cmx parsing/extend.cmx pretyping/evd.cmx \
     parsing/egrammar.cmx interp/coqlib.cmx interp/constrintern.cmx \
     toplevel/cerrors.cmx 
 contrib/first-order/formula.cmo: lib/util.cmi pretyping/termops.cmi \
@@ -2756,14 +2864,16 @@ contrib/first-order/g_ground.cmo: lib/util.cmi kernel/term.cmi \
     parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi \
     library/libnames.cmi contrib/first-order/ground.cmi library/goptions.cmi \
     interp/genarg.cmi contrib/first-order/formula.cmi parsing/egrammar.cmi \
-    toplevel/cerrors.cmi tactics/auto.cmi 
+    tactics/decl_proof_instr.cmi toplevel/cerrors.cmi contrib/cc/cctac.cmi \
+    tactics/auto.cmi 
 contrib/first-order/g_ground.cmx: lib/util.cmx kernel/term.cmx \
     tactics/tactics.cmx tactics/tacticals.cmx tactics/tacinterp.cmx \
     proofs/tacexpr.cmx contrib/first-order/sequent.cmx proofs/refiner.cmx \
     parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx \
     library/libnames.cmx contrib/first-order/ground.cmx library/goptions.cmx \
     interp/genarg.cmx contrib/first-order/formula.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.cmx tactics/auto.cmx 
+    tactics/decl_proof_instr.cmx toplevel/cerrors.cmx contrib/cc/cctac.cmx \
+    tactics/auto.cmx 
 contrib/first-order/ground.cmo: kernel/term.cmi tactics/tactics.cmi \
     tactics/tacticals.cmi proofs/tactic_debug.cmi proofs/tacmach.cmi \
     tactics/tacinterp.cmi contrib/first-order/sequent.cmi \
@@ -2847,8 +2957,8 @@ contrib/fourier/g_fourier.cmx: lib/util.cmx tactics/tacinterp.cmx \
     parsing/pcoq.cmx contrib/fourier/fourierR.cmx parsing/egrammar.cmx \
     toplevel/cerrors.cmx 
 contrib/funind/functional_principles_proofs.cmo: lib/util.cmi \
-    pretyping/typing.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tactic_debug.cmi \
+    pretyping/typing.cmi kernel/typeops.cmi pretyping/termops.cmi \
+    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
     pretyping/tacred.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
     kernel/sign.cmi pretyping/reductionops.cmi contrib/recdef/recdef.cmo \
     pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
@@ -2861,8 +2971,8 @@ contrib/funind/functional_principles_proofs.cmo: lib/util.cmi \
     toplevel/command.cmi kernel/closure.cmi toplevel/cerrors.cmi \
     contrib/funind/functional_principles_proofs.cmi 
 contrib/funind/functional_principles_proofs.cmx: lib/util.cmx \
-    pretyping/typing.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tactic_debug.cmx \
+    pretyping/typing.cmx kernel/typeops.cmx pretyping/termops.cmx \
+    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
     pretyping/tacred.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
     kernel/sign.cmx pretyping/reductionops.cmx contrib/recdef/recdef.cmx \
     pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
@@ -2906,47 +3016,53 @@ contrib/funind/indfun_common.cmo: lib/util.cmi pretyping/termops.cmi \
     parsing/printer.cmi lib/pp.cmi proofs/pfedit.cmi lib/options.cmi \
     library/nametab.cmi kernel/names.cmi library/nameops.cmi \
     kernel/mod_subst.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/entries.cmi library/declare.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo interp/coqlib.cmi \
-    kernel/closure.cmi contrib/funind/indfun_common.cmi 
+    library/lib.cmi library/impargs.cmi library/goptions.cmi \
+    library/global.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
+    kernel/entries.cmi library/declare.cmi kernel/declarations.cmi \
+    library/decl_kinds.cmo interp/coqlib.cmi kernel/closure.cmi \
+    contrib/funind/indfun_common.cmi 
 contrib/funind/indfun_common.cmx: lib/util.cmx pretyping/termops.cmx \
     kernel/term.cmx library/summary.cmx proofs/refiner.cmx \
     pretyping/reductionops.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
     parsing/printer.cmx lib/pp.cmx proofs/pfedit.cmx lib/options.cmx \
     library/nametab.cmx kernel/names.cmx library/nameops.cmx \
     kernel/mod_subst.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/entries.cmx library/declare.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx interp/coqlib.cmx \
-    kernel/closure.cmx contrib/funind/indfun_common.cmi 
+    library/lib.cmx library/impargs.cmx library/goptions.cmx \
+    library/global.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
+    kernel/entries.cmx library/declare.cmx kernel/declarations.cmx \
+    library/decl_kinds.cmx interp/coqlib.cmx kernel/closure.cmx \
+    contrib/funind/indfun_common.cmi 
 contrib/funind/indfun_main.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
     interp/topconstr.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo proofs/refiner.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi parsing/printer.cmi parsing/pptactic.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi parsing/lexer.cmi \
-    contrib/funind/invfun.cmo contrib/funind/indfun_common.cmi \
-    contrib/funind/indfun.cmo interp/genarg.cmi \
-    contrib/funind/functional_principles_types.cmi parsing/egrammar.cmi \
+    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
+    tactics/tacinterp.cmi proofs/tacexpr.cmo proofs/refiner.cmi \
+    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
+    parsing/pptactic.cmi parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.cmi \
+    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
+    contrib/funind/merge.cmo parsing/lexer.cmi contrib/funind/invfun.cmo \
+    contrib/funind/indfun_common.cmi contrib/funind/indfun.cmo \
+    library/global.cmi interp/genarg.cmi \
+    contrib/funind/functional_principles_types.cmi pretyping/evd.cmi \
+    parsing/egrammar.cmi interp/coqlib.cmi interp/constrintern.cmi \
     toplevel/cerrors.cmi 
 contrib/funind/indfun_main.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
     interp/topconstr.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx proofs/refiner.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx parsing/printer.cmx parsing/pptactic.cmx \
-    parsing/ppconstr.cmx lib/pp.cmx parsing/pcoq.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx parsing/lexer.cmx \
-    contrib/funind/invfun.cmx contrib/funind/indfun_common.cmx \
-    contrib/funind/indfun.cmx interp/genarg.cmx \
-    contrib/funind/functional_principles_types.cmx parsing/egrammar.cmx \
+    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
+    tactics/tacinterp.cmx proofs/tacexpr.cmx proofs/refiner.cmx \
+    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
+    parsing/pptactic.cmx parsing/ppconstr.cmx lib/pp.cmx parsing/pcoq.cmx \
+    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
+    contrib/funind/merge.cmx parsing/lexer.cmx contrib/funind/invfun.cmx \
+    contrib/funind/indfun_common.cmx contrib/funind/indfun.cmx \
+    library/global.cmx interp/genarg.cmx \
+    contrib/funind/functional_principles_types.cmx pretyping/evd.cmx \
+    parsing/egrammar.cmx interp/coqlib.cmx interp/constrintern.cmx \
     toplevel/cerrors.cmx 
 contrib/funind/indfun.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    tactics/tacinterp.cmi proofs/tacexpr.cmo library/states.cmi \
-    kernel/sign.cmi contrib/recdef/recdef.cmo \
+    kernel/typeops.cmi interp/topconstr.cmi pretyping/termops.cmi \
+    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
+    proofs/tacmach.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
+    library/states.cmi kernel/sign.cmi contrib/recdef/recdef.cmo \
     contrib/funind/rawterm_to_relation.cmi pretyping/rawterm.cmi \
     parsing/printer.cmi parsing/ppconstr.cmi lib/pp.cmi lib/options.cmi \
     interp/notation.cmi kernel/names.cmi library/nameops.cmi \
@@ -2959,10 +3075,10 @@ contrib/funind/indfun.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
     library/decl_kinds.cmo interp/constrintern.cmi interp/constrextern.cmi \
     toplevel/command.cmi toplevel/cerrors.cmi 
 contrib/funind/indfun.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
-    tactics/tacinterp.cmx proofs/tacexpr.cmx library/states.cmx \
-    kernel/sign.cmx contrib/recdef/recdef.cmx \
+    kernel/typeops.cmx interp/topconstr.cmx pretyping/termops.cmx \
+    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
+    proofs/tacmach.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
+    library/states.cmx kernel/sign.cmx contrib/recdef/recdef.cmx \
     contrib/funind/rawterm_to_relation.cmx pretyping/rawterm.cmx \
     parsing/printer.cmx parsing/ppconstr.cmx lib/pp.cmx lib/options.cmx \
     interp/notation.cmx kernel/names.cmx library/nameops.cmx \
@@ -2977,63 +3093,79 @@ contrib/funind/indfun.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
 contrib/funind/invfun.cmo: toplevel/vernacentries.cmi lib/util.cmi \
     pretyping/typing.cmi pretyping/termops.cmi kernel/term.cmi \
     tactics/tauto.cmo tactics/tactics.cmi tactics/tacticals.cmi \
-    proofs/tactic_debug.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo kernel/sign.cmi lib/rtree.cmi \
-    pretyping/reductionops.cmi pretyping/rawterm.cmi parsing/printer.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi proofs/pfedit.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi tactics/inv.cmi \
-    kernel/inductive.cmi pretyping/indrec.cmi \
-    contrib/funind/indfun_common.cmi tactics/hiddentac.cmi library/global.cmi \
-    interp/genarg.cmi pretyping/evd.cmi tactics/equality.cmi \
-    kernel/environ.cmi kernel/entries.cmi kernel/declarations.cmi \
-    library/decl_kinds.cmo interp/coqlib.cmi toplevel/command.cmi \
-    kernel/closure.cmi toplevel/cerrors.cmi 
+    proofs/tacmach.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
+    kernel/sign.cmi lib/rtree.cmi pretyping/reductionops.cmi \
+    pretyping/rawterm.cmi parsing/printer.cmi parsing/ppconstr.cmi lib/pp.cmi \
+    proofs/pfedit.cmi kernel/names.cmi library/nameops.cmi \
+    library/libnames.cmi tactics/inv.cmi kernel/inductive.cmi \
+    pretyping/indrec.cmi contrib/funind/indfun_common.cmi \
+    tactics/hiddentac.cmi library/global.cmi interp/genarg.cmi \
+    pretyping/evd.cmi tactics/equality.cmi kernel/environ.cmi \
+    kernel/entries.cmi kernel/declarations.cmi library/decl_kinds.cmo \
+    interp/coqlib.cmi toplevel/command.cmi kernel/closure.cmi \
+    toplevel/cerrors.cmi 
 contrib/funind/invfun.cmx: toplevel/vernacentries.cmx lib/util.cmx \
     pretyping/typing.cmx pretyping/termops.cmx kernel/term.cmx \
     tactics/tauto.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    proofs/tactic_debug.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx kernel/sign.cmx lib/rtree.cmx \
-    pretyping/reductionops.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    parsing/ppconstr.cmx lib/pp.cmx proofs/pfedit.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx tactics/inv.cmx \
-    kernel/inductive.cmx pretyping/indrec.cmx \
-    contrib/funind/indfun_common.cmx tactics/hiddentac.cmx library/global.cmx \
-    interp/genarg.cmx pretyping/evd.cmx tactics/equality.cmx \
-    kernel/environ.cmx kernel/entries.cmx kernel/declarations.cmx \
-    library/decl_kinds.cmx interp/coqlib.cmx toplevel/command.cmx \
-    kernel/closure.cmx toplevel/cerrors.cmx 
-contrib/funind/rawtermops.cmo: lib/util.cmi proofs/tactic_debug.cmi \
-    tactics/tacinterp.cmi pretyping/rawterm.cmi parsing/printer.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi pretyping/inductiveops.cmi \
-    contrib/funind/indfun_common.cmi library/global.cmi pretyping/evd.cmi \
-    interp/coqlib.cmi contrib/funind/rawtermops.cmi 
-contrib/funind/rawtermops.cmx: lib/util.cmx proofs/tactic_debug.cmx \
-    tactics/tacinterp.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    parsing/ppconstr.cmx lib/pp.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx pretyping/inductiveops.cmx \
-    contrib/funind/indfun_common.cmx library/global.cmx pretyping/evd.cmx \
-    interp/coqlib.cmx contrib/funind/rawtermops.cmi 
+    proofs/tacmach.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
+    kernel/sign.cmx lib/rtree.cmx pretyping/reductionops.cmx \
+    pretyping/rawterm.cmx parsing/printer.cmx parsing/ppconstr.cmx lib/pp.cmx \
+    proofs/pfedit.cmx kernel/names.cmx library/nameops.cmx \
+    library/libnames.cmx tactics/inv.cmx kernel/inductive.cmx \
+    pretyping/indrec.cmx contrib/funind/indfun_common.cmx \
+    tactics/hiddentac.cmx library/global.cmx interp/genarg.cmx \
+    pretyping/evd.cmx tactics/equality.cmx kernel/environ.cmx \
+    kernel/entries.cmx kernel/declarations.cmx library/decl_kinds.cmx \
+    interp/coqlib.cmx toplevel/command.cmx kernel/closure.cmx \
+    toplevel/cerrors.cmx 
+contrib/funind/merge.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
+    interp/topconstr.cmi kernel/term.cmi tactics/tacinterp.cmi \
+    contrib/funind/rawtermops.cmi pretyping/rawterm.cmi parsing/printer.cmi \
+    pretyping/pretyping.cmi lib/pp.cmi lib/options.cmi kernel/names.cmi \
+    library/nameops.cmi library/libnames.cmi pretyping/inductiveops.cmi \
+    kernel/inductive.cmi library/global.cmi pretyping/evd.cmi \
+    kernel/environ.cmi pretyping/detyping.cmi kernel/declarations.cmi \
+    interp/constrintern.cmi interp/constrextern.cmi toplevel/command.cmi 
+contrib/funind/merge.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
+    interp/topconstr.cmx kernel/term.cmx tactics/tacinterp.cmx \
+    contrib/funind/rawtermops.cmx pretyping/rawterm.cmx parsing/printer.cmx \
+    pretyping/pretyping.cmx lib/pp.cmx lib/options.cmx kernel/names.cmx \
+    library/nameops.cmx library/libnames.cmx pretyping/inductiveops.cmx \
+    kernel/inductive.cmx library/global.cmx pretyping/evd.cmx \
+    kernel/environ.cmx pretyping/detyping.cmx kernel/declarations.cmx \
+    interp/constrintern.cmx interp/constrextern.cmx toplevel/command.cmx 
+contrib/funind/rawtermops.cmo: lib/util.cmi pretyping/rawterm.cmi lib/pp.cmi \
+    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
+    pretyping/inductiveops.cmi contrib/funind/indfun_common.cmi \
+    library/global.cmi pretyping/evd.cmi interp/coqlib.cmi \
+    contrib/funind/rawtermops.cmi 
+contrib/funind/rawtermops.cmx: lib/util.cmx pretyping/rawterm.cmx lib/pp.cmx \
+    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
+    pretyping/inductiveops.cmx contrib/funind/indfun_common.cmx \
+    library/global.cmx pretyping/evd.cmx interp/coqlib.cmx \
+    contrib/funind/rawtermops.cmi 
 contrib/funind/rawterm_to_relation.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    pretyping/typing.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tactic_debug.cmi tactics/tacinterp.cmi lib/system.cmi \
+    pretyping/typing.cmi interp/topconstr.cmi pretyping/termops.cmi \
+    kernel/term.cmi tactics/tacinterp.cmi lib/system.cmi kernel/sign.cmi \
     kernel/reduction.cmi contrib/funind/rawtermops.cmi pretyping/rawterm.cmi \
-    parsing/printer.cmi parsing/ppvernac.cmi parsing/ppconstr.cmi lib/pp.cmi \
-    lib/options.cmi kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi \
-    contrib/funind/indfun_common.cmi library/impargs.cmi library/global.cmi \
-    pretyping/evd.cmi kernel/declarations.cmi interp/coqlib.cmi \
+    parsing/printer.cmi pretyping/pretyping.cmi parsing/ppvernac.cmi \
+    parsing/ppconstr.cmi lib/pp.cmi lib/options.cmi kernel/names.cmi \
+    library/nameops.cmi library/libnames.cmi pretyping/inductiveops.cmi \
+    kernel/inductive.cmi contrib/funind/indfun_common.cmi library/impargs.cmi \
+    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
+    pretyping/detyping.cmi kernel/declarations.cmi interp/coqlib.cmi \
     interp/constrextern.cmi toplevel/command.cmi toplevel/cerrors.cmi \
     contrib/funind/rawterm_to_relation.cmi 
 contrib/funind/rawterm_to_relation.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    pretyping/typing.cmx interp/topconstr.cmx kernel/term.cmx \
-    proofs/tactic_debug.cmx tactics/tacinterp.cmx lib/system.cmx \
+    pretyping/typing.cmx interp/topconstr.cmx pretyping/termops.cmx \
+    kernel/term.cmx tactics/tacinterp.cmx lib/system.cmx kernel/sign.cmx \
     kernel/reduction.cmx contrib/funind/rawtermops.cmx pretyping/rawterm.cmx \
-    parsing/printer.cmx parsing/ppvernac.cmx parsing/ppconstr.cmx lib/pp.cmx \
-    lib/options.cmx kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx \
-    contrib/funind/indfun_common.cmx library/impargs.cmx library/global.cmx \
-    pretyping/evd.cmx kernel/declarations.cmx interp/coqlib.cmx \
+    parsing/printer.cmx pretyping/pretyping.cmx parsing/ppvernac.cmx \
+    parsing/ppconstr.cmx lib/pp.cmx lib/options.cmx kernel/names.cmx \
+    library/nameops.cmx library/libnames.cmx pretyping/inductiveops.cmx \
+    kernel/inductive.cmx contrib/funind/indfun_common.cmx library/impargs.cmx \
+    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
+    pretyping/detyping.cmx kernel/declarations.cmx interp/coqlib.cmx \
     interp/constrextern.cmx toplevel/command.cmx toplevel/cerrors.cmx \
     contrib/funind/rawterm_to_relation.cmi 
 contrib/funind/tacinv.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
@@ -3074,42 +3206,42 @@ contrib/funind/tacinvutils.cmx: lib/util.cmx pretyping/termops.cmx \
     contrib/funind/tacinvutils.cmi 
 contrib/interface/blast.cmo: toplevel/vernacinterp.cmi \
     toplevel/vernacentries.cmi lib/util.cmi pretyping/typing.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi parsing/tactic_printer.cmi pretyping/tacred.cmi \
-    proofs/tacmach.cmi tactics/tacinterp.cmi kernel/sign.cmi \
-    proofs/refiner.cmi kernel/reduction.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi parsing/printer.cmi \
-    parsing/pptactic.cmi lib/pp.cmi proofs/pfedit.cmi parsing/pcoq.cmi \
-    contrib/interface/pbp.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/nameops.cmi proofs/logic.cmi kernel/inductive.cmi \
-    tactics/hipattern.cmi library/global.cmi lib/explore.cmi \
-    pretyping/evd.cmi tactics/equality.cmi kernel/environ.cmi \
+    kernel/typeops.cmi pretyping/termops.cmi kernel/term.cmi \
+    tactics/tactics.cmi tactics/tacticals.cmi parsing/tactic_printer.cmi \
+    pretyping/tacred.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
+    kernel/sign.cmi proofs/refiner.cmi kernel/reduction.cmi \
+    pretyping/rawterm.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
+    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi proofs/pfedit.cmi \
+    parsing/pcoq.cmi contrib/interface/pbp.cmi pretyping/pattern.cmi \
+    kernel/names.cmi library/nameops.cmi proofs/logic.cmi \
+    kernel/inductive.cmi tactics/hipattern.cmi library/global.cmi \
+    lib/explore.cmi pretyping/evd.cmi tactics/equality.cmi kernel/environ.cmi \
     tactics/eauto.cmi library/declare.cmi kernel/declarations.cmi \
     toplevel/command.cmi pretyping/clenv.cmi tactics/auto.cmi \
     contrib/interface/blast.cmi 
 contrib/interface/blast.cmx: toplevel/vernacinterp.cmx \
     toplevel/vernacentries.cmx lib/util.cmx pretyping/typing.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx parsing/tactic_printer.cmx pretyping/tacred.cmx \
-    proofs/tacmach.cmx tactics/tacinterp.cmx kernel/sign.cmx \
-    proofs/refiner.cmx kernel/reduction.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx proofs/proof_trees.cmx parsing/printer.cmx \
-    parsing/pptactic.cmx lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx \
-    contrib/interface/pbp.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/nameops.cmx proofs/logic.cmx kernel/inductive.cmx \
-    tactics/hipattern.cmx library/global.cmx lib/explore.cmx \
-    pretyping/evd.cmx tactics/equality.cmx kernel/environ.cmx \
+    kernel/typeops.cmx pretyping/termops.cmx kernel/term.cmx \
+    tactics/tactics.cmx tactics/tacticals.cmx parsing/tactic_printer.cmx \
+    pretyping/tacred.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
+    kernel/sign.cmx proofs/refiner.cmx kernel/reduction.cmx \
+    pretyping/rawterm.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
+    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx proofs/pfedit.cmx \
+    parsing/pcoq.cmx contrib/interface/pbp.cmx pretyping/pattern.cmx \
+    kernel/names.cmx library/nameops.cmx proofs/logic.cmx \
+    kernel/inductive.cmx tactics/hipattern.cmx library/global.cmx \
+    lib/explore.cmx pretyping/evd.cmx tactics/equality.cmx kernel/environ.cmx \
     tactics/eauto.cmx library/declare.cmx kernel/declarations.cmx \
     toplevel/command.cmx pretyping/clenv.cmx tactics/auto.cmx \
     contrib/interface/blast.cmi 
 contrib/interface/centaur.cmo: contrib/interface/xlate.cmi \
     contrib/interface/vtp.cmi toplevel/vernacinterp.cmi \
     toplevel/vernacexpr.cmo toplevel/vernacentries.cmi toplevel/vernac.cmi \
-    lib/util.cmi contrib/interface/translate.cmi kernel/term.cmi \
-    proofs/tacmach.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    contrib/interface/showproof_ct.cmo contrib/interface/showproof.cmi \
-    parsing/search.cmi proofs/refiner.cmi kernel/reduction.cmi \
-    pretyping/rawterm.cmi toplevel/protectedtoplevel.cmi \
+    lib/util.cmi kernel/typeops.cmi contrib/interface/translate.cmi \
+    kernel/term.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
+    proofs/tacexpr.cmo contrib/interface/showproof_ct.cmo \
+    contrib/interface/showproof.cmi parsing/search.cmi proofs/refiner.cmi \
+    kernel/reduction.cmi pretyping/rawterm.cmi toplevel/protectedtoplevel.cmi \
     proofs/proof_type.cmi proofs/proof_trees.cmi parsing/printer.cmi \
     pretyping/pretyping.cmi parsing/pptactic.cmi lib/pp.cmi proofs/pfedit.cmi \
     parsing/pcoq.cmi contrib/interface/pbp.cmi library/nametab.cmi \
@@ -3125,11 +3257,11 @@ contrib/interface/centaur.cmo: contrib/interface/xlate.cmi \
 contrib/interface/centaur.cmx: contrib/interface/xlate.cmx \
     contrib/interface/vtp.cmx toplevel/vernacinterp.cmx \
     toplevel/vernacexpr.cmx toplevel/vernacentries.cmx toplevel/vernac.cmx \
-    lib/util.cmx contrib/interface/translate.cmx kernel/term.cmx \
-    proofs/tacmach.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    contrib/interface/showproof_ct.cmx contrib/interface/showproof.cmx \
-    parsing/search.cmx proofs/refiner.cmx kernel/reduction.cmx \
-    pretyping/rawterm.cmx toplevel/protectedtoplevel.cmx \
+    lib/util.cmx kernel/typeops.cmx contrib/interface/translate.cmx \
+    kernel/term.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
+    proofs/tacexpr.cmx contrib/interface/showproof_ct.cmx \
+    contrib/interface/showproof.cmx parsing/search.cmx proofs/refiner.cmx \
+    kernel/reduction.cmx pretyping/rawterm.cmx toplevel/protectedtoplevel.cmx \
     proofs/proof_type.cmx proofs/proof_trees.cmx parsing/printer.cmx \
     pretyping/pretyping.cmx parsing/pptactic.cmx lib/pp.cmx proofs/pfedit.cmx \
     parsing/pcoq.cmx contrib/interface/pbp.cmx library/nametab.cmx \
@@ -3164,16 +3296,14 @@ contrib/interface/dad.cmx: toplevel/vernacinterp.cmx toplevel/vernacexpr.cmx \
     interp/constrextern.cmx contrib/interface/dad.cmi 
 contrib/interface/debug_tac.cmo: lib/util.cmi tactics/tacticals.cmi \
     proofs/tacmach.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    proofs/refiner.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi \
-    library/global.cmi interp/genarg.cmi toplevel/cerrors.cmi \
-    contrib/interface/debug_tac.cmi 
+    proofs/proof_type.cmi proofs/proof_trees.cmi parsing/printer.cmi \
+    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi library/global.cmi \
+    interp/genarg.cmi toplevel/cerrors.cmi contrib/interface/debug_tac.cmi 
 contrib/interface/debug_tac.cmx: lib/util.cmx tactics/tacticals.cmx \
     proofs/tacmach.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    proofs/refiner.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx \
-    library/global.cmx interp/genarg.cmx toplevel/cerrors.cmx \
-    contrib/interface/debug_tac.cmi 
+    proofs/proof_type.cmx proofs/proof_trees.cmx parsing/printer.cmx \
+    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx library/global.cmx \
+    interp/genarg.cmx toplevel/cerrors.cmx contrib/interface/debug_tac.cmi 
 contrib/interface/history.cmo: contrib/interface/paths.cmi \
     contrib/interface/history.cmi 
 contrib/interface/history.cmx: contrib/interface/paths.cmx \
@@ -3181,21 +3311,23 @@ contrib/interface/history.cmx: contrib/interface/paths.cmx \
 contrib/interface/line_parser.cmo: contrib/interface/line_parser.cmi 
 contrib/interface/line_parser.cmx: contrib/interface/line_parser.cmi 
 contrib/interface/name_to_ast.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi kernel/term.cmi kernel/sign.cmi kernel/reduction.cmi \
-    parsing/prettyp.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi kernel/inductive.cmi library/impargs.cmi \
-    library/global.cmi kernel/environ.cmi library/declare.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo interp/constrextern.cmi \
-    pretyping/classops.cmi contrib/interface/name_to_ast.cmi 
+    kernel/typeops.cmi interp/topconstr.cmi kernel/term.cmi kernel/sign.cmi \
+    kernel/reduction.cmi parsing/prettyp.cmi lib/pp.cmi library/nametab.cmi \
+    kernel/names.cmi library/nameops.cmi library/libobject.cmi \
+    library/libnames.cmi library/lib.cmi kernel/inductive.cmi \
+    library/impargs.cmi library/global.cmi kernel/environ.cmi \
+    library/declare.cmi kernel/declarations.cmi library/decl_kinds.cmo \
+    interp/constrextern.cmi pretyping/classops.cmi \
+    contrib/interface/name_to_ast.cmi 
 contrib/interface/name_to_ast.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx kernel/term.cmx kernel/sign.cmx kernel/reduction.cmx \
-    parsing/prettyp.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx kernel/inductive.cmx library/impargs.cmx \
-    library/global.cmx kernel/environ.cmx library/declare.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx interp/constrextern.cmx \
-    pretyping/classops.cmx contrib/interface/name_to_ast.cmi 
+    kernel/typeops.cmx interp/topconstr.cmx kernel/term.cmx kernel/sign.cmx \
+    kernel/reduction.cmx parsing/prettyp.cmx lib/pp.cmx library/nametab.cmx \
+    kernel/names.cmx library/nameops.cmx library/libobject.cmx \
+    library/libnames.cmx library/lib.cmx kernel/inductive.cmx \
+    library/impargs.cmx library/global.cmx kernel/environ.cmx \
+    library/declare.cmx kernel/declarations.cmx library/decl_kinds.cmx \
+    interp/constrextern.cmx pretyping/classops.cmx \
+    contrib/interface/name_to_ast.cmi 
 contrib/interface/parse.cmo: contrib/interface/xlate.cmi \
     contrib/interface/vtp.cmi toplevel/vernacexpr.cmo \
     toplevel/vernacentries.cmi lib/util.cmi lib/system.cmi lib/pp.cmi \
@@ -3241,7 +3373,7 @@ contrib/interface/showproof_ct.cmx: contrib/interface/xlate.cmx \
     parsing/printer.cmx lib/pp.cmx toplevel/metasyntax.cmx library/global.cmx \
     contrib/interface/ascent.cmi 
 contrib/interface/showproof.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    pretyping/typing.cmi contrib/interface/translate.cmi \
+    pretyping/typing.cmi kernel/typeops.cmi contrib/interface/translate.cmi \
     pretyping/termops.cmi kernel/term.cmi proofs/tacmach.cmi \
     proofs/tacexpr.cmo kernel/sign.cmi contrib/interface/showproof_ct.cmo \
     pretyping/reductionops.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
@@ -3252,7 +3384,7 @@ contrib/interface/showproof.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
     kernel/declarations.cmi interp/constrintern.cmi pretyping/clenv.cmi \
     contrib/interface/showproof.cmi 
 contrib/interface/showproof.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    pretyping/typing.cmx contrib/interface/translate.cmx \
+    pretyping/typing.cmx kernel/typeops.cmx contrib/interface/translate.cmx \
     pretyping/termops.cmx kernel/term.cmx proofs/tacmach.cmx \
     proofs/tacexpr.cmx kernel/sign.cmx contrib/interface/showproof_ct.cmx \
     pretyping/reductionops.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
@@ -3284,18 +3416,16 @@ contrib/interface/xlate.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
     interp/topconstr.cmi kernel/term.cmi proofs/tacexpr.cmo \
     pretyping/rawterm.cmi parsing/ppconstr.cmi parsing/pcoq.cmi \
     kernel/names.cmi library/libnames.cmi library/goptions.cmi \
-    interp/genarg.cmi contrib/field/field.cmo tactics/extratactics.cmi \
-    tactics/extraargs.cmi parsing/extend.cmi tactics/eauto.cmi \
-    library/decl_kinds.cmo lib/bigint.cmi contrib/interface/ascent.cmi \
-    contrib/interface/xlate.cmi 
+    interp/genarg.cmi tactics/extraargs.cmi parsing/extend.cmi \
+    tactics/eauto.cmi library/decl_kinds.cmo lib/bigint.cmi \
+    contrib/interface/ascent.cmi contrib/interface/xlate.cmi 
 contrib/interface/xlate.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
     interp/topconstr.cmx kernel/term.cmx proofs/tacexpr.cmx \
     pretyping/rawterm.cmx parsing/ppconstr.cmx parsing/pcoq.cmx \
     kernel/names.cmx library/libnames.cmx library/goptions.cmx \
-    interp/genarg.cmx contrib/field/field.cmx tactics/extratactics.cmx \
-    tactics/extraargs.cmx parsing/extend.cmx tactics/eauto.cmx \
-    library/decl_kinds.cmx lib/bigint.cmx contrib/interface/ascent.cmi \
-    contrib/interface/xlate.cmi 
+    interp/genarg.cmx tactics/extraargs.cmx parsing/extend.cmx \
+    tactics/eauto.cmx library/decl_kinds.cmx lib/bigint.cmx \
+    contrib/interface/ascent.cmi contrib/interface/xlate.cmi 
 contrib/jprover/jall.cmo: lib/pp.cmi contrib/jprover/opname.cmi \
     contrib/jprover/jtunify.cmi contrib/jprover/jterm.cmi \
     contrib/jprover/jlogic.cmi contrib/jprover/jall.cmi 
@@ -3368,13 +3498,13 @@ contrib/omega/omega.cmo: lib/util.cmi kernel/names.cmi
 contrib/omega/omega.cmx: lib/util.cmx kernel/names.cmx 
 contrib/recdef/recdef.cmo: toplevel/vernacinterp.cmi \
     toplevel/vernacentries.cmi lib/util.cmi pretyping/typing.cmi \
-    interp/topconstr.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tactic_debug.cmi \
-    pretyping/tacred.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
-    kernel/safe_typing.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/printer.cmi pretyping/pretyping.cmi parsing/ppconstr.cmi \
-    lib/pp.cmi proofs/pfedit.cmi parsing/pcoq.cmi lib/options.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
+    kernel/typeops.cmi interp/topconstr.cmi pretyping/termops.cmi \
+    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
+    proofs/tactic_debug.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
+    tactics/tacinterp.cmi kernel/safe_typing.cmi pretyping/rawterm.cmi \
+    proofs/proof_type.cmi parsing/printer.cmi pretyping/pretyping.cmi \
+    parsing/ppconstr.cmi lib/pp.cmi proofs/pfedit.cmi parsing/pcoq.cmi \
+    lib/options.cmi library/nametab.cmi kernel/names.cmi library/nameops.cmi \
     library/libnames.cmi library/lib.cmi tactics/hiddentac.cmi \
     library/global.cmi interp/genarg.cmi pretyping/evd.cmi \
     tactics/equality.cmi kernel/environ.cmi kernel/entries.cmi \
@@ -3384,13 +3514,13 @@ contrib/recdef/recdef.cmo: toplevel/vernacinterp.cmi \
     kernel/closure.cmi toplevel/cerrors.cmi tactics/auto.cmi 
 contrib/recdef/recdef.cmx: toplevel/vernacinterp.cmx \
     toplevel/vernacentries.cmx lib/util.cmx pretyping/typing.cmx \
-    interp/topconstr.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tactic_debug.cmx \
-    pretyping/tacred.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
-    kernel/safe_typing.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    parsing/printer.cmx pretyping/pretyping.cmx parsing/ppconstr.cmx \
-    lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx lib/options.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
+    kernel/typeops.cmx interp/topconstr.cmx pretyping/termops.cmx \
+    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
+    proofs/tactic_debug.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
+    tactics/tacinterp.cmx kernel/safe_typing.cmx pretyping/rawterm.cmx \
+    proofs/proof_type.cmx parsing/printer.cmx pretyping/pretyping.cmx \
+    parsing/ppconstr.cmx lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx \
+    lib/options.cmx library/nametab.cmx kernel/names.cmx library/nameops.cmx \
     library/libnames.cmx library/lib.cmx tactics/hiddentac.cmx \
     library/global.cmx interp/genarg.cmx pretyping/evd.cmx \
     tactics/equality.cmx kernel/environ.cmx kernel/entries.cmx \
@@ -3399,23 +3529,23 @@ contrib/recdef/recdef.cmx: toplevel/vernacinterp.cmx \
     interp/coqlib.cmx interp/constrintern.cmx toplevel/command.cmx \
     kernel/closure.cmx toplevel/cerrors.cmx tactics/auto.cmx 
 contrib/ring/g_quote.cmo: lib/util.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo proofs/refiner.cmi contrib/ring/quote.cmo \
-    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi interp/genarg.cmi \
-    parsing/egrammar.cmi toplevel/cerrors.cmi 
-contrib/ring/g_quote.cmx: lib/util.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx proofs/refiner.cmx contrib/ring/quote.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx interp/genarg.cmx \
-    parsing/egrammar.cmx toplevel/cerrors.cmx 
-contrib/ring/g_ring.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    tactics/tacinterp.cmi proofs/tacexpr.cmo contrib/ring/ring.cmo \
-    proofs/refiner.cmi contrib/ring/quote.cmo parsing/pptactic.cmi lib/pp.cmi \
+    proofs/tacexpr.cmo contrib/ring/quote.cmo parsing/pptactic.cmi lib/pp.cmi \
     parsing/pcoq.cmi interp/genarg.cmi parsing/egrammar.cmi \
     toplevel/cerrors.cmi 
-contrib/ring/g_ring.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    tactics/tacinterp.cmx proofs/tacexpr.cmx contrib/ring/ring.cmx \
-    proofs/refiner.cmx contrib/ring/quote.cmx parsing/pptactic.cmx lib/pp.cmx \
+contrib/ring/g_quote.cmx: lib/util.cmx tactics/tacinterp.cmx \
+    proofs/tacexpr.cmx contrib/ring/quote.cmx parsing/pptactic.cmx lib/pp.cmx \
     parsing/pcoq.cmx interp/genarg.cmx parsing/egrammar.cmx \
     toplevel/cerrors.cmx 
+contrib/ring/g_ring.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
+    tactics/tacticals.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
+    contrib/ring/ring.cmo proofs/refiner.cmi contrib/ring/quote.cmo \
+    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi interp/genarg.cmi \
+    parsing/egrammar.cmi toplevel/cerrors.cmi 
+contrib/ring/g_ring.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
+    tactics/tacticals.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
+    contrib/ring/ring.cmx proofs/refiner.cmx contrib/ring/quote.cmx \
+    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx interp/genarg.cmx \
+    parsing/egrammar.cmx toplevel/cerrors.cmx 
 contrib/ring/quote.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
     tactics/tactics.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
     proofs/proof_trees.cmi lib/pp.cmi pretyping/pattern.cmi kernel/names.cmi \
@@ -3499,43 +3629,47 @@ contrib/rtauto/refl_tauto.cmx: lib/util.cmx pretyping/termops.cmx \
     kernel/environ.cmx interp/coqlib.cmx kernel/closure.cmx \
     contrib/rtauto/refl_tauto.cmi 
 contrib/setoid_ring/newring.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    pretyping/typing.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo library/summary.cmi tactics/setoid_replace.cmi \
-    pretyping/retyping.cmi proofs/refiner.cmi pretyping/rawterm.cmi \
+    pretyping/typing.cmi interp/topconstr.cmi kernel/term.cmi \
+    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
+    tactics/tacinterp.cmi proofs/tacexpr.cmo library/summary.cmi \
+    tactics/setoid_replace.cmi pretyping/retyping.cmi proofs/refiner.cmi \
+    pretyping/reductionops.cmi pretyping/rawterm.cmi contrib/ring/quote.cmo \
     proofs/proof_type.cmi parsing/printer.cmi pretyping/pretyping.cmi \
-    parsing/pptactic.cmi parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.cmi \
+    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi library/nametab.cmi \
     kernel/names.cmi kernel/mod_subst.cmi library/libobject.cmi \
-    library/lib.cmi parsing/lexer.cmi library/global.cmi interp/genarg.cmi \
-    pretyping/evd.cmi kernel/esubst.cmi kernel/environ.cmi \
-    parsing/egrammar.cmi interp/coqlib.cmi interp/constrintern.cmi \
+    library/libnames.cmi library/lib.cmi parsing/lexer.cmi library/global.cmi \
+    interp/genarg.cmi pretyping/evd.cmi kernel/esubst.cmi kernel/environ.cmi \
+    kernel/entries.cmi parsing/egrammar.cmi library/declare.cmi \
+    library/decl_kinds.cmo interp/coqlib.cmi interp/constrintern.cmi \
     kernel/closure.cmi toplevel/cerrors.cmi 
 contrib/setoid_ring/newring.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    pretyping/typing.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx library/summary.cmx tactics/setoid_replace.cmx \
-    pretyping/retyping.cmx proofs/refiner.cmx pretyping/rawterm.cmx \
+    pretyping/typing.cmx interp/topconstr.cmx kernel/term.cmx \
+    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
+    tactics/tacinterp.cmx proofs/tacexpr.cmx library/summary.cmx \
+    tactics/setoid_replace.cmx pretyping/retyping.cmx proofs/refiner.cmx \
+    pretyping/reductionops.cmx pretyping/rawterm.cmx contrib/ring/quote.cmx \
     proofs/proof_type.cmx parsing/printer.cmx pretyping/pretyping.cmx \
-    parsing/pptactic.cmx parsing/ppconstr.cmx lib/pp.cmx parsing/pcoq.cmx \
+    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx library/nametab.cmx \
     kernel/names.cmx kernel/mod_subst.cmx library/libobject.cmx \
-    library/lib.cmx parsing/lexer.cmx library/global.cmx interp/genarg.cmx \
-    pretyping/evd.cmx kernel/esubst.cmx kernel/environ.cmx \
-    parsing/egrammar.cmx interp/coqlib.cmx interp/constrintern.cmx \
+    library/libnames.cmx library/lib.cmx parsing/lexer.cmx library/global.cmx \
+    interp/genarg.cmx pretyping/evd.cmx kernel/esubst.cmx kernel/environ.cmx \
+    kernel/entries.cmx parsing/egrammar.cmx library/declare.cmx \
+    library/decl_kinds.cmx interp/coqlib.cmx interp/constrintern.cmx \
     kernel/closure.cmx toplevel/cerrors.cmx 
 contrib/subtac/context.cmo: kernel/term.cmi kernel/names.cmi \
     contrib/subtac/context.cmi 
 contrib/subtac/context.cmx: kernel/term.cmx kernel/names.cmx \
     contrib/subtac/context.cmi 
 contrib/subtac/eterm.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi lib/pp.cmi \
-    lib/options.cmi kernel/names.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi library/declare.cmi \
-    library/decl_kinds.cmo contrib/subtac/eterm.cmi 
+    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
+    parsing/printer.cmi lib/pp.cmi lib/options.cmi kernel/names.cmi \
+    library/global.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
+    kernel/environ.cmi contrib/subtac/eterm.cmi 
 contrib/subtac/eterm.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx lib/pp.cmx \
-    lib/options.cmx kernel/names.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx library/declare.cmx \
-    library/decl_kinds.cmx contrib/subtac/eterm.cmi 
+    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
+    parsing/printer.cmx lib/pp.cmx lib/options.cmx kernel/names.cmx \
+    library/global.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
+    kernel/environ.cmx contrib/subtac/eterm.cmi 
 contrib/subtac/g_eterm.cmo: lib/util.cmi proofs/tacmach.cmi \
     tactics/tacinterp.cmi proofs/tacexpr.cmo proofs/refiner.cmi \
     parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi contrib/subtac/eterm.cmi \
@@ -3547,75 +3681,79 @@ contrib/subtac/g_eterm.cmx: lib/util.cmx proofs/tacmach.cmx \
 contrib/subtac/g_subtac.cmo: toplevel/vernacinterp.cmi \
     toplevel/vernacexpr.cmo toplevel/vernacentries.cmi lib/util.cmi \
     interp/topconstr.cmi kernel/term.cmi proofs/tacexpr.cmo \
-    contrib/subtac/subtac.cmi kernel/reduction.cmi proofs/proof_type.cmi \
-    lib/pp.cmi parsing/pcoq.cmi lib/options.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi interp/genarg.cmi \
-    parsing/egrammar.cmi toplevel/cerrors.cmi 
+    contrib/subtac/subtac_obligations.cmi contrib/subtac/subtac.cmi \
+    kernel/reduction.cmi proofs/proof_type.cmi lib/pp.cmi parsing/pcoq.cmi \
+    lib/options.cmi kernel/names.cmi library/nameops.cmi library/libnames.cmi \
+    interp/genarg.cmi parsing/egrammar.cmi toplevel/cerrors.cmi 
 contrib/subtac/g_subtac.cmx: toplevel/vernacinterp.cmx \
     toplevel/vernacexpr.cmx toplevel/vernacentries.cmx lib/util.cmx \
     interp/topconstr.cmx kernel/term.cmx proofs/tacexpr.cmx \
-    contrib/subtac/subtac.cmx kernel/reduction.cmx proofs/proof_type.cmx \
-    lib/pp.cmx parsing/pcoq.cmx lib/options.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx interp/genarg.cmx \
-    parsing/egrammar.cmx toplevel/cerrors.cmx 
+    contrib/subtac/subtac_obligations.cmx contrib/subtac/subtac.cmx \
+    kernel/reduction.cmx proofs/proof_type.cmx lib/pp.cmx parsing/pcoq.cmx \
+    lib/options.cmx kernel/names.cmx library/nameops.cmx library/libnames.cmx \
+    interp/genarg.cmx parsing/egrammar.cmx toplevel/cerrors.cmx 
 contrib/subtac/subtac_coercion.cmo: lib/util.cmi kernel/typeops.cmi \
     pretyping/termops.cmi kernel/term.cmi contrib/subtac/subtac_utils.cmi \
     contrib/subtac/subtac_errors.cmi pretyping/retyping.cmi \
     pretyping/reductionops.cmi kernel/reduction.cmi pretyping/recordops.cmi \
     pretyping/rawterm.cmi parsing/printer.cmi pretyping/pretype_errors.cmi \
-    lib/pp.cmi kernel/names.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi pretyping/evarconv.cmi contrib/subtac/eterm.cmi \
-    kernel/environ.cmi interp/coqlib.cmi contrib/subtac/context.cmi \
-    pretyping/classops.cmi contrib/subtac/subtac_coercion.cmi 
+    lib/pp.cmi kernel/names.cmi library/nameops.cmi library/global.cmi \
+    pretyping/evd.cmi pretyping/evarutil.cmi pretyping/evarconv.cmi \
+    contrib/subtac/eterm.cmi kernel/environ.cmi interp/coqlib.cmi \
+    contrib/subtac/context.cmi pretyping/classops.cmi \
+    contrib/subtac/subtac_coercion.cmi 
 contrib/subtac/subtac_coercion.cmx: lib/util.cmx kernel/typeops.cmx \
     pretyping/termops.cmx kernel/term.cmx contrib/subtac/subtac_utils.cmx \
     contrib/subtac/subtac_errors.cmx pretyping/retyping.cmx \
     pretyping/reductionops.cmx kernel/reduction.cmx pretyping/recordops.cmx \
     pretyping/rawterm.cmx parsing/printer.cmx pretyping/pretype_errors.cmx \
-    lib/pp.cmx kernel/names.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx pretyping/evarconv.cmx contrib/subtac/eterm.cmx \
-    kernel/environ.cmx interp/coqlib.cmx contrib/subtac/context.cmx \
-    pretyping/classops.cmx contrib/subtac/subtac_coercion.cmi 
+    lib/pp.cmx kernel/names.cmx library/nameops.cmx library/global.cmx \
+    pretyping/evd.cmx pretyping/evarutil.cmx pretyping/evarconv.cmx \
+    contrib/subtac/eterm.cmx kernel/environ.cmx interp/coqlib.cmx \
+    contrib/subtac/context.cmx pretyping/classops.cmx \
+    contrib/subtac/subtac_coercion.cmi 
 contrib/subtac/subtac_command.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
     pretyping/typing.cmi interp/topconstr.cmi pretyping/termops.cmi \
     kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
     proofs/tactic_debug.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
     tactics/tacinterp.cmi proofs/tacexpr.cmo interp/syntax_def.cmi \
     contrib/subtac/subtac_utils.cmi contrib/subtac/subtac_pretyping.cmi \
-    library/states.cmi kernel/sign.cmi kernel/safe_typing.cmi \
-    interp/reserve.cmi proofs/refiner.cmi pretyping/reductionops.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
-    pretyping/pretyping.cmi parsing/ppconstr.cmi lib/pp.cmi proofs/pfedit.cmi \
-    pretyping/pattern.cmi lib/options.cmi interp/notation.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    kernel/mod_subst.cmi toplevel/metasyntax.cmi pretyping/matching.cmi \
-    library/libobject.cmi library/libnames.cmi pretyping/inductiveops.cmi \
-    library/impargs.cmi tactics/hiddentac.cmi library/global.cmi \
-    interp/genarg.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    contrib/subtac/eterm.cmi kernel/environ.cmi kernel/entries.cmi \
-    lib/dyn.cmi library/declare.cmi kernel/declarations.cmi \
-    library/decl_kinds.cmo interp/coqlib.cmi interp/constrintern.cmi \
-    toplevel/command.cmi kernel/closure.cmi contrib/subtac/subtac_command.cmi 
+    contrib/subtac/subtac_obligations.cmi library/states.cmi kernel/sign.cmi \
+    kernel/safe_typing.cmi interp/reserve.cmi proofs/refiner.cmi \
+    pretyping/reductionops.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
+    parsing/printer.cmi pretyping/pretyping.cmi parsing/ppconstr.cmi \
+    lib/pp.cmi proofs/pfedit.cmi pretyping/pattern.cmi lib/options.cmi \
+    interp/notation.cmi library/nametab.cmi kernel/names.cmi \
+    library/nameops.cmi kernel/mod_subst.cmi toplevel/metasyntax.cmi \
+    pretyping/matching.cmi library/libobject.cmi library/libnames.cmi \
+    pretyping/inductiveops.cmi library/impargs.cmi tactics/hiddentac.cmi \
+    library/global.cmi interp/genarg.cmi pretyping/evd.cmi \
+    pretyping/evarutil.cmi contrib/subtac/eterm.cmi kernel/environ.cmi \
+    kernel/entries.cmi lib/dyn.cmi library/declare.cmi \
+    kernel/declarations.cmi library/decl_kinds.cmo interp/coqlib.cmi \
+    interp/constrintern.cmi toplevel/command.cmi kernel/closure.cmi \
+    contrib/subtac/subtac_command.cmi 
 contrib/subtac/subtac_command.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
     pretyping/typing.cmx interp/topconstr.cmx pretyping/termops.cmx \
     kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
     proofs/tactic_debug.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
     tactics/tacinterp.cmx proofs/tacexpr.cmx interp/syntax_def.cmx \
     contrib/subtac/subtac_utils.cmx contrib/subtac/subtac_pretyping.cmx \
-    library/states.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    interp/reserve.cmx proofs/refiner.cmx pretyping/reductionops.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
-    pretyping/pretyping.cmx parsing/ppconstr.cmx lib/pp.cmx proofs/pfedit.cmx \
-    pretyping/pattern.cmx lib/options.cmx interp/notation.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx toplevel/metasyntax.cmx pretyping/matching.cmx \
-    library/libobject.cmx library/libnames.cmx pretyping/inductiveops.cmx \
-    library/impargs.cmx tactics/hiddentac.cmx library/global.cmx \
-    interp/genarg.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    contrib/subtac/eterm.cmx kernel/environ.cmx kernel/entries.cmx \
-    lib/dyn.cmx library/declare.cmx kernel/declarations.cmx \
-    library/decl_kinds.cmx interp/coqlib.cmx interp/constrintern.cmx \
-    toplevel/command.cmx kernel/closure.cmx contrib/subtac/subtac_command.cmi 
+    contrib/subtac/subtac_obligations.cmx library/states.cmx kernel/sign.cmx \
+    kernel/safe_typing.cmx interp/reserve.cmx proofs/refiner.cmx \
+    pretyping/reductionops.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
+    parsing/printer.cmx pretyping/pretyping.cmx parsing/ppconstr.cmx \
+    lib/pp.cmx proofs/pfedit.cmx pretyping/pattern.cmx lib/options.cmx \
+    interp/notation.cmx library/nametab.cmx kernel/names.cmx \
+    library/nameops.cmx kernel/mod_subst.cmx toplevel/metasyntax.cmx \
+    pretyping/matching.cmx library/libobject.cmx library/libnames.cmx \
+    pretyping/inductiveops.cmx library/impargs.cmx tactics/hiddentac.cmx \
+    library/global.cmx interp/genarg.cmx pretyping/evd.cmx \
+    pretyping/evarutil.cmx contrib/subtac/eterm.cmx kernel/environ.cmx \
+    kernel/entries.cmx lib/dyn.cmx library/declare.cmx \
+    kernel/declarations.cmx library/decl_kinds.cmx interp/coqlib.cmx \
+    interp/constrintern.cmx toplevel/command.cmx kernel/closure.cmx \
+    contrib/subtac/subtac_command.cmi 
 contrib/subtac/subtac_errors.cmo: lib/util.cmi parsing/printer.cmi lib/pp.cmi \
     contrib/subtac/subtac_errors.cmi 
 contrib/subtac/subtac_errors.cmx: lib/util.cmx parsing/printer.cmx lib/pp.cmx \
@@ -3674,6 +3812,20 @@ contrib/subtac/subtac.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
     lib/dyn.cmx library/decl_kinds.cmx interp/coqlib.cmx \
     contrib/subtac/context.cmx toplevel/command.cmx pretyping/classops.cmx \
     toplevel/cerrors.cmx contrib/subtac/subtac.cmi 
+contrib/subtac/subtac_obligations.cmo: lib/util.cmi kernel/term.cmi \
+    library/summary.cmi contrib/subtac/subtac_utils.cmi lib/pp.cmi \
+    lib/options.cmi kernel/names.cmi library/libobject.cmi \
+    library/libnames.cmi pretyping/evd.cmi kernel/environ.cmi \
+    kernel/entries.cmi library/declare.cmi library/decl_kinds.cmo \
+    toplevel/command.cmi tactics/auto.cmi \
+    contrib/subtac/subtac_obligations.cmi 
+contrib/subtac/subtac_obligations.cmx: lib/util.cmx kernel/term.cmx \
+    library/summary.cmx contrib/subtac/subtac_utils.cmx lib/pp.cmx \
+    lib/options.cmx kernel/names.cmx library/libobject.cmx \
+    library/libnames.cmx pretyping/evd.cmx kernel/environ.cmx \
+    kernel/entries.cmx library/declare.cmx library/decl_kinds.cmx \
+    toplevel/command.cmx tactics/auto.cmx \
+    contrib/subtac/subtac_obligations.cmi 
 contrib/subtac/subtac_pretyping_F.cmo: lib/util.cmi kernel/typeops.cmi \
     kernel/type_errors.cmi pretyping/termops.cmi kernel/term.cmi \
     kernel/sign.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
@@ -3697,7 +3849,8 @@ contrib/subtac/subtac_pretyping_F.cmx: lib/util.cmx kernel/typeops.cmx \
 contrib/subtac/subtac_pretyping.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
     kernel/typeops.cmi kernel/type_errors.cmi interp/topconstr.cmi \
     pretyping/termops.cmi kernel/term.cmi contrib/subtac/subtac_utils.cmi \
-    contrib/subtac/subtac_pretyping_F.cmo contrib/subtac/subtac_errors.cmi \
+    contrib/subtac/subtac_pretyping_F.cmo \
+    contrib/subtac/subtac_obligations.cmi contrib/subtac/subtac_errors.cmi \
     contrib/subtac/subtac_coercion.cmi kernel/sign.cmi \
     pretyping/reductionops.cmi pretyping/recordops.cmi pretyping/rawterm.cmi \
     parsing/printer.cmi pretyping/pretype_errors.cmi lib/pp.cmi \
@@ -3710,7 +3863,8 @@ contrib/subtac/subtac_pretyping.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
 contrib/subtac/subtac_pretyping.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
     kernel/typeops.cmx kernel/type_errors.cmx interp/topconstr.cmx \
     pretyping/termops.cmx kernel/term.cmx contrib/subtac/subtac_utils.cmx \
-    contrib/subtac/subtac_pretyping_F.cmx contrib/subtac/subtac_errors.cmx \
+    contrib/subtac/subtac_pretyping_F.cmx \
+    contrib/subtac/subtac_obligations.cmx contrib/subtac/subtac_errors.cmx \
     contrib/subtac/subtac_coercion.cmx kernel/sign.cmx \
     pretyping/reductionops.cmx pretyping/recordops.cmx pretyping/rawterm.cmx \
     parsing/printer.cmx pretyping/pretype_errors.cmx lib/pp.cmx \
@@ -3722,21 +3876,23 @@ contrib/subtac/subtac_pretyping.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
     contrib/subtac/subtac_pretyping.cmi 
 contrib/subtac/subtac_utils.cmo: lib/util.cmi interp/topconstr.cmi \
     pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacexpr.cmo pretyping/rawterm.cmi \
-    proofs/proof_type.cmi parsing/printer.cmi pretyping/pretype_errors.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi proofs/pfedit.cmi lib/options.cmi \
-    kernel/names.cmi library/libnames.cmi library/global.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi library/decl_kinds.cmo \
-    interp/coqlib.cmi interp/constrextern.cmi toplevel/command.cmi \
+    tactics/tacticals.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
+    pretyping/rawterm.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
+    parsing/printer.cmi pretyping/pretype_errors.cmi parsing/ppconstr.cmi \
+    lib/pp.cmi proofs/pfedit.cmi lib/options.cmi kernel/names.cmi \
+    library/libnames.cmi library/global.cmi pretyping/evd.cmi \
+    pretyping/evarutil.cmi library/decl_kinds.cmo interp/coqlib.cmi \
+    interp/constrextern.cmi toplevel/command.cmi \
     contrib/subtac/subtac_utils.cmi 
 contrib/subtac/subtac_utils.cmx: lib/util.cmx interp/topconstr.cmx \
     pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacexpr.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx parsing/printer.cmx pretyping/pretype_errors.cmx \
-    parsing/ppconstr.cmx lib/pp.cmx proofs/pfedit.cmx lib/options.cmx \
-    kernel/names.cmx library/libnames.cmx library/global.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx library/decl_kinds.cmx \
-    interp/coqlib.cmx interp/constrextern.cmx toplevel/command.cmx \
+    tactics/tacticals.cmx proofs/tacmach.cmx proofs/tacexpr.cmx \
+    pretyping/rawterm.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
+    parsing/printer.cmx pretyping/pretype_errors.cmx parsing/ppconstr.cmx \
+    lib/pp.cmx proofs/pfedit.cmx lib/options.cmx kernel/names.cmx \
+    library/libnames.cmx library/global.cmx pretyping/evd.cmx \
+    pretyping/evarutil.cmx library/decl_kinds.cmx interp/coqlib.cmx \
+    interp/constrextern.cmx toplevel/command.cmx \
     contrib/subtac/subtac_utils.cmi 
 contrib/xml/acic2Xml.cmo: contrib/xml/xml.cmi lib/util.cmi kernel/term.cmi \
     kernel/names.cmi contrib/xml/cic2acic.cmo contrib/xml/acic.cmo 
@@ -3745,7 +3901,7 @@ contrib/xml/acic2Xml.cmx: contrib/xml/xml.cmx lib/util.cmx kernel/term.cmx \
 contrib/xml/acic.cmo: kernel/term.cmi kernel/names.cmi 
 contrib/xml/acic.cmx: kernel/term.cmx kernel/names.cmx 
 contrib/xml/cic2acic.cmo: lib/util.cmi contrib/xml/unshare.cmi \
-    kernel/univ.cmi pretyping/termops.cmi kernel/term.cmi \
+    kernel/univ.cmi kernel/typeops.cmi pretyping/termops.cmi kernel/term.cmi \
     pretyping/reductionops.cmi parsing/printer.cmi lib/pp.cmi \
     library/nametab.cmi kernel/names.cmi library/nameops.cmi \
     library/library.cmi library/libnames.cmi library/lib.cmi \
@@ -3754,7 +3910,7 @@ contrib/xml/cic2acic.cmo: lib/util.cmi contrib/xml/unshare.cmi \
     library/dischargedhypsmap.cmi library/declare.cmi kernel/declarations.cmi \
     contrib/xml/acic.cmo 
 contrib/xml/cic2acic.cmx: lib/util.cmx contrib/xml/unshare.cmx \
-    kernel/univ.cmx pretyping/termops.cmx kernel/term.cmx \
+    kernel/univ.cmx kernel/typeops.cmx pretyping/termops.cmx kernel/term.cmx \
     pretyping/reductionops.cmx parsing/printer.cmx lib/pp.cmx \
     library/nametab.cmx kernel/names.cmx library/nameops.cmx \
     library/library.cmx library/libnames.cmx library/lib.cmx \
@@ -3809,8 +3965,8 @@ contrib/xml/proofTree2Xml.cmx: contrib/xml/xml.cmx lib/util.cmx \
 contrib/xml/unshare.cmo: contrib/xml/unshare.cmi 
 contrib/xml/unshare.cmx: contrib/xml/unshare.cmi 
 contrib/xml/xmlcommand.cmo: contrib/xml/xml.cmi toplevel/vernac.cmi \
-    lib/util.cmi contrib/xml/unshare.cmi kernel/term.cmi proofs/tacmach.cmi \
-    pretyping/recordops.cmi proofs/proof_trees.cmi \
+    lib/util.cmi contrib/xml/unshare.cmi kernel/typeops.cmi kernel/term.cmi \
+    proofs/tacmach.cmi pretyping/recordops.cmi proofs/proof_trees.cmi \
     contrib/xml/proof2aproof.cmo proofs/pfedit.cmi library/nametab.cmi \
     kernel/names.cmi library/library.cmi library/libobject.cmi \
     library/libnames.cmi library/lib.cmi parsing/lexer.cmi \
@@ -3820,8 +3976,8 @@ contrib/xml/xmlcommand.cmo: contrib/xml/xml.cmi toplevel/vernac.cmi \
     config/coq_config.cmi contrib/xml/cic2acic.cmo contrib/xml/acic2Xml.cmo \
     contrib/xml/acic.cmo contrib/xml/xmlcommand.cmi 
 contrib/xml/xmlcommand.cmx: contrib/xml/xml.cmx toplevel/vernac.cmx \
-    lib/util.cmx contrib/xml/unshare.cmx kernel/term.cmx proofs/tacmach.cmx \
-    pretyping/recordops.cmx proofs/proof_trees.cmx \
+    lib/util.cmx contrib/xml/unshare.cmx kernel/typeops.cmx kernel/term.cmx \
+    proofs/tacmach.cmx pretyping/recordops.cmx proofs/proof_trees.cmx \
     contrib/xml/proof2aproof.cmx proofs/pfedit.cmx library/nametab.cmx \
     kernel/names.cmx library/library.cmx library/libobject.cmx \
     library/libnames.cmx library/lib.cmx parsing/lexer.cmx \
@@ -3972,6 +4128,8 @@ parsing/vernacextend.cmo:
 parsing/vernacextend.cmx: 
 parsing/q_constr.cmo: 
 parsing/q_constr.cmx: 
+parsing/g_decl_mode.cmo: parsing/grammar.cma
+parsing/g_decl_mode.cmx: parsing/grammar.cma
 toplevel/mltop.cmo: 
 toplevel/mltop.cmx: 
 lib/pp.cmo: 
@@ -3991,96 +4149,66 @@ tools/coq_makefile.cmx:
 tools/coq-tex.cmo: 
 tools/coq-tex.cmx: 
 coq_fix_code.o: kernel/byterun/coq_fix_code.c \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h \
-  kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/misc.h /usr/lib/ocaml/caml/config.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/memory.h kernel/byterun/coq_instruct.h \
+  kernel/byterun/coq_fix_code.h
 coq_interp.o: kernel/byterun/coq_interp.c kernel/byterun/coq_gc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/alloc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/alloc.h /usr/lib/ocaml/caml/mlvalues.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
+  kernel/byterun/coq_memory.h /usr/lib/ocaml/caml/config.h \
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
   kernel/byterun/coq_jumptbl.h
 coq_memory.o: kernel/byterun/coq_memory.c kernel/byterun/coq_gc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/alloc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/alloc.h /usr/lib/ocaml/caml/mlvalues.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h
+  kernel/byterun/coq_memory.h /usr/lib/ocaml/caml/config.h \
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/memory.h
 coq_values.o: kernel/byterun/coq_values.c kernel/byterun/coq_fix_code.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h kernel/byterun/coq_instruct.h \
-  kernel/byterun/coq_memory.h /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
-  /user/jforest/home//lib/ocaml/caml/alloc.h
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/misc.h \
+  kernel/byterun/coq_instruct.h kernel/byterun/coq_memory.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/fail.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
+  /usr/lib/ocaml/caml/alloc.h
 coq_fix_code.d.o: kernel/byterun/coq_fix_code.c \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h \
-  kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/misc.h /usr/lib/ocaml/caml/config.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/memory.h kernel/byterun/coq_instruct.h \
+  kernel/byterun/coq_fix_code.h
 coq_interp.d.o: kernel/byterun/coq_interp.c kernel/byterun/coq_gc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/alloc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/alloc.h /usr/lib/ocaml/caml/mlvalues.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
+  kernel/byterun/coq_memory.h /usr/lib/ocaml/caml/config.h \
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
   kernel/byterun/coq_jumptbl.h
 coq_memory.d.o: kernel/byterun/coq_memory.c kernel/byterun/coq_gc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/alloc.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/alloc.h /usr/lib/ocaml/caml/mlvalues.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h
+  kernel/byterun/coq_memory.h /usr/lib/ocaml/caml/config.h \
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/memory.h
 coq_values.d.o: kernel/byterun/coq_values.c kernel/byterun/coq_fix_code.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/compatibility.h \
-  /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h kernel/byterun/coq_instruct.h \
-  kernel/byterun/coq_memory.h /user/jforest/home//lib/ocaml/caml/config.h \
-  /user/jforest/home//lib/ocaml/caml/fail.h \
-  /user/jforest/home//lib/ocaml/caml/mlvalues.h \
-  /user/jforest/home//lib/ocaml/caml/misc.h \
-  /user/jforest/home//lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
-  /user/jforest/home//lib/ocaml/caml/alloc.h
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/misc.h \
+  kernel/byterun/coq_instruct.h kernel/byterun/coq_memory.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/fail.h \
+  /usr/lib/ocaml/caml/mlvalues.h /usr/lib/ocaml/caml/misc.h \
+  /usr/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
+  /usr/lib/ocaml/caml/alloc.h