Made pretyping a functor over a coercion implementation. Pretyping.Default uses the original Coercion implementation.

Updated contributions that called pretyping to use the default impl.
Also update subtac using the functor, do some renamings and add interfaces for all files.



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

35 files changed, 5266 insertions, 5351 deletions

diff --git a/.depend b/.depend
index 1401bebe71..77caebd189 100644
--- a/.depend
+++ b/.depend
@@ -1,850 +1,873 @@
 ide/config_parser.cmi: lib/util.cmi 
-ide/coq.cmi: toplevel/vernacexpr.cmo lib/util.cmi kernel/term.cmi \
-    kernel/names.cmi pretyping/evd.cmi kernel/environ.cmi 
-interp/constrextern.cmi: lib/util.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi pretyping/pattern.cmi interp/notation.cmi \
-    library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    kernel/environ.cmi 
-interp/constrintern.cmi: interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/sign.cmi pretyping/rawterm.cmi \
-    pretyping/pretyping.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/libnames.cmi library/impargs.cmi pretyping/evd.cmi \
-    kernel/environ.cmi 
-interp/coqlib.cmi: kernel/term.cmi pretyping/pattern.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi 
-interp/genarg.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi kernel/names.cmi library/libnames.cmi \
-    pretyping/evd.cmi 
-interp/modintern.cmi: interp/topconstr.cmi kernel/environ.cmi \
-    kernel/entries.cmi kernel/declarations.cmi 
-interp/notation.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi interp/ppextend.cmi lib/pp.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi pretyping/classops.cmi \
-    lib/bigint.cmi 
-interp/ppextend.cmi: lib/pp.cmi kernel/names.cmi 
-interp/reserve.cmi: lib/util.cmi pretyping/rawterm.cmi kernel/names.cmi 
-interp/syntax_def.cmi: lib/util.cmi interp/topconstr.cmi \
-    pretyping/rawterm.cmi kernel/names.cmi library/libnames.cmi 
-interp/topconstr.cmi: lib/util.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    lib/pp.cmi kernel/names.cmi kernel/mod_subst.cmi library/libnames.cmi \
-    pretyping/evd.cmi lib/dyn.cmi lib/bigint.cmi 
-kernel/cbytecodes.cmi: kernel/term.cmi kernel/names.cmi 
-kernel/cbytegen.cmi: kernel/term.cmi kernel/pre_env.cmi kernel/names.cmi \
-    kernel/declarations.cmi kernel/cemitcodes.cmi kernel/cbytecodes.cmi 
-kernel/cemitcodes.cmi: kernel/names.cmi kernel/mod_subst.cmi \
-    kernel/cbytecodes.cmi 
-kernel/closure.cmi: kernel/term.cmi lib/pp.cmi kernel/names.cmi \
-    kernel/esubst.cmi kernel/environ.cmi 
-kernel/conv_oracle.cmi: kernel/names.cmi 
-kernel/cooking.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/names.cmi kernel/environ.cmi kernel/declarations.cmi 
-kernel/csymtable.cmi: kernel/term.cmi kernel/pre_env.cmi kernel/names.cmi 
-kernel/declarations.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    lib/rtree.cmi kernel/names.cmi kernel/mod_subst.cmi kernel/cemitcodes.cmi \
-    kernel/cbytecodes.cmi 
-kernel/entries.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
+ide/coq.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
+    kernel/term.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+interp/constrextern.cmi: kernel/environ.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi interp/notation.cmi \
+    pretyping/pattern.cmi pretyping/rawterm.cmi kernel/sign.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi 
+interp/constrintern.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    library/impargs.cmi library/libnames.cmi kernel/names.cmi \
+    pretyping/pattern.cmi pretyping/pretyping.cmi pretyping/rawterm.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi \
+    interp/topconstr.cmi 
+interp/coqlib.cmi: library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi kernel/term.cmi 
+interp/genarg.cmi: pretyping/evd.cmi library/libnames.cmi kernel/names.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi kernel/term.cmi interp/topconstr.cmi \
+    lib/util.cmi 
+interp/modintern.cmi: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi interp/topconstr.cmi 
+interp/notation.cmi: lib/bigint.cmi pretyping/classops.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi lib/pp.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+interp/ppextend.cmi: kernel/names.cmi lib/pp.cmi 
+interp/reserve.cmi: kernel/names.cmi pretyping/rawterm.cmi lib/util.cmi 
+interp/syntax_def.cmi: library/libnames.cmi kernel/names.cmi \
+    pretyping/rawterm.cmi interp/topconstr.cmi lib/util.cmi 
+interp/topconstr.cmi: lib/bigint.cmi lib/dyn.cmi pretyping/evd.cmi \
+    library/libnames.cmi kernel/mod_subst.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi kernel/term.cmi lib/util.cmi 
+kernel/cbytecodes.cmi: kernel/names.cmi kernel/term.cmi 
+kernel/cbytegen.cmi: kernel/cbytecodes.cmi kernel/cemitcodes.cmi \
+    kernel/declarations.cmi kernel/names.cmi kernel/pre_env.cmi \
+    kernel/term.cmi 
+kernel/cemitcodes.cmi: kernel/cbytecodes.cmi kernel/mod_subst.cmi \
     kernel/names.cmi 
-kernel/environ.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/pre_env.cmi kernel/names.cmi kernel/declarations.cmi \
-    kernel/cemitcodes.cmi 
+kernel/closure.cmi: kernel/environ.cmi kernel/esubst.cmi kernel/names.cmi \
+    lib/pp.cmi kernel/term.cmi 
+kernel/conv_oracle.cmi: kernel/names.cmi 
+kernel/cooking.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    kernel/names.cmi kernel/sign.cmi kernel/term.cmi kernel/univ.cmi 
+kernel/csymtable.cmi: kernel/names.cmi kernel/pre_env.cmi kernel/term.cmi 
+kernel/declarations.cmi: kernel/cbytecodes.cmi kernel/cemitcodes.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi lib/rtree.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/univ.cmi 
+kernel/entries.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi 
+kernel/environ.cmi: kernel/cemitcodes.cmi kernel/declarations.cmi \
+    kernel/names.cmi kernel/pre_env.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi 
 kernel/esubst.cmi: lib/util.cmi 
-kernel/indtypes.cmi: kernel/univ.cmi kernel/typeops.cmi kernel/term.cmi \
-    kernel/names.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi 
-kernel/inductive.cmi: kernel/univ.cmi kernel/term.cmi kernel/names.cmi \
-    kernel/environ.cmi kernel/declarations.cmi 
-kernel/modops.cmi: lib/util.cmi kernel/univ.cmi kernel/names.cmi \
-    kernel/mod_subst.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi 
-kernel/mod_subst.cmi: kernel/term.cmi lib/pp.cmi kernel/names.cmi 
-kernel/mod_typing.cmi: kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi 
-kernel/names.cmi: lib/predicate.cmi lib/pp.cmi 
-kernel/pre_env.cmi: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/names.cmi kernel/declarations.cmi 
-kernel/reduction.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
+kernel/indtypes.cmi: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi kernel/names.cmi kernel/term.cmi kernel/typeops.cmi \
+    kernel/univ.cmi 
+kernel/inductive.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    kernel/names.cmi kernel/term.cmi kernel/univ.cmi 
+kernel/modops.cmi: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi kernel/mod_subst.cmi kernel/names.cmi kernel/univ.cmi \
+    lib/util.cmi 
+kernel/mod_subst.cmi: kernel/names.cmi lib/pp.cmi kernel/term.cmi 
+kernel/mod_typing.cmi: kernel/declarations.cmi kernel/entries.cmi \
     kernel/environ.cmi 
-kernel/safe_typing.cmi: kernel/univ.cmi kernel/term.cmi kernel/names.cmi \
-    kernel/environ.cmi kernel/entries.cmi kernel/declarations.cmi \
-    kernel/cooking.cmi 
-kernel/sign.cmi: kernel/term.cmi kernel/names.cmi 
-kernel/subtyping.cmi: kernel/univ.cmi kernel/environ.cmi \
-    kernel/declarations.cmi 
-kernel/term.cmi: kernel/univ.cmi kernel/names.cmi kernel/esubst.cmi 
-kernel/term_typing.cmi: kernel/univ.cmi kernel/typeops.cmi kernel/term.cmi \
-    kernel/names.cmi kernel/inductive.cmi kernel/environ.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/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/vm.cmi: kernel/term.cmi kernel/names.cmi kernel/cemitcodes.cmi \
-    kernel/cbytecodes.cmi 
+kernel/names.cmi: lib/pp.cmi lib/predicate.cmi 
+kernel/pre_env.cmi: kernel/declarations.cmi kernel/names.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/univ.cmi lib/util.cmi 
+kernel/reduction.cmi: kernel/environ.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi 
+kernel/safe_typing.cmi: kernel/cooking.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/environ.cmi kernel/names.cmi kernel/term.cmi \
+    kernel/univ.cmi 
+kernel/sign.cmi: kernel/names.cmi kernel/term.cmi 
+kernel/subtyping.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    kernel/univ.cmi 
+kernel/term.cmi: kernel/esubst.cmi kernel/names.cmi kernel/univ.cmi 
+kernel/term_typing.cmi: kernel/cooking.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/environ.cmi kernel/inductive.cmi \
+    kernel/names.cmi kernel/term.cmi kernel/typeops.cmi kernel/univ.cmi 
+kernel/type_errors.cmi: kernel/environ.cmi kernel/names.cmi kernel/term.cmi 
+kernel/typeops.cmi: kernel/entries.cmi kernel/environ.cmi kernel/names.cmi \
+    kernel/sign.cmi kernel/term.cmi kernel/univ.cmi 
+kernel/univ.cmi: kernel/names.cmi lib/pp.cmi 
+kernel/vconv.cmi: kernel/environ.cmi kernel/names.cmi kernel/reduction.cmi \
+    kernel/term.cmi kernel/vm.cmi 
+kernel/vm.cmi: kernel/cbytecodes.cmi kernel/cemitcodes.cmi kernel/names.cmi \
+    kernel/term.cmi 
 lib/bigint.cmi: lib/pp.cmi 
 lib/pp.cmi: lib/pp_control.cmi 
-library/declare.cmi: kernel/term.cmi kernel/sign.cmi kernel/safe_typing.cmi \
-    library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    kernel/indtypes.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo 
-library/declaremods.cmi: lib/util.cmi kernel/safe_typing.cmi lib/pp.cmi \
-    kernel/names.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi kernel/environ.cmi kernel/entries.cmi 
-library/dischargedhypsmap.cmi: kernel/term.cmi library/nametab.cmi \
-    library/libnames.cmi kernel/environ.cmi 
-library/global.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/safe_typing.cmi kernel/names.cmi library/libnames.cmi \
-    kernel/indtypes.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi 
-library/goptions.cmi: lib/util.cmi kernel/term.cmi lib/pp.cmi \
-    library/nametab.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi 
-library/impargs.cmi: interp/topconstr.cmi kernel/term.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi kernel/environ.cmi 
-library/lib.cmi: lib/util.cmi kernel/term.cmi library/summary.cmi \
-    kernel/sign.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libobject.cmi library/libnames.cmi 
-library/libnames.cmi: lib/util.cmi kernel/term.cmi lib/predicate.cmi \
-    lib/pp.cmi kernel/names.cmi kernel/mod_subst.cmi 
-library/libobject.cmi: kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi 
-library/library.cmi: lib/util.cmi lib/system.cmi lib/pp.cmi kernel/names.cmi \
-    library/libobject.cmi library/libnames.cmi 
-library/nameops.cmi: kernel/term.cmi lib/pp.cmi kernel/names.cmi 
-library/nametab.cmi: lib/util.cmi lib/pp.cmi kernel/names.cmi \
-    library/libnames.cmi 
+library/declare.cmi: library/decl_kinds.cmo kernel/declarations.cmi \
+    kernel/entries.cmi kernel/environ.cmi kernel/indtypes.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi kernel/term.cmi 
+library/declaremods.cmi: kernel/entries.cmi kernel/environ.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    kernel/names.cmi lib/pp.cmi kernel/safe_typing.cmi lib/util.cmi 
+library/dischargedhypsmap.cmi: kernel/environ.cmi library/libnames.cmi \
+    library/nametab.cmi kernel/term.cmi 
+library/global.cmi: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi kernel/indtypes.cmi library/libnames.cmi \
+    kernel/names.cmi kernel/safe_typing.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi 
+library/goptions.cmi: library/libnames.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi library/nametab.cmi lib/pp.cmi kernel/term.cmi \
+    lib/util.cmi 
+library/impargs.cmi: kernel/environ.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi kernel/term.cmi interp/topconstr.cmi 
+library/lib.cmi: library/libnames.cmi library/libobject.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi kernel/sign.cmi library/summary.cmi \
+    kernel/term.cmi lib/util.cmi 
+library/libnames.cmi: kernel/mod_subst.cmi kernel/names.cmi lib/pp.cmi \
+    lib/predicate.cmi kernel/term.cmi lib/util.cmi 
+library/libobject.cmi: library/libnames.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi 
+library/library.cmi: library/libnames.cmi library/libobject.cmi \
+    kernel/names.cmi lib/pp.cmi lib/system.cmi lib/util.cmi 
+library/nameops.cmi: kernel/names.cmi lib/pp.cmi kernel/term.cmi 
+library/nametab.cmi: library/libnames.cmi kernel/names.cmi lib/pp.cmi \
+    lib/util.cmi 
 lib/rtree.cmi: lib/pp.cmi 
 lib/system.cmi: lib/pp.cmi 
-lib/util.cmi: lib/pp.cmi lib/compat.cmo 
-parsing/egrammar.cmi: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo pretyping/rawterm.cmi \
-    interp/ppextend.cmi parsing/pcoq.cmi kernel/names.cmi \
-    kernel/mod_subst.cmi interp/genarg.cmi parsing/extend.cmi 
+lib/util.cmi: lib/compat.cmo lib/pp.cmi 
+parsing/egrammar.cmi: parsing/extend.cmi interp/genarg.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi parsing/pcoq.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    interp/topconstr.cmi lib/util.cmi toplevel/vernacexpr.cmo 
 parsing/extend.cmi: lib/util.cmi 
-parsing/g_minicoq.cmi: kernel/term.cmi lib/pp.cmi kernel/names.cmi \
-    kernel/environ.cmi 
-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 
-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/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 \
-    kernel/environ.cmi 
-parsing/ppvernac.cmi: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi pretyping/rawterm.cmi parsing/pptactic.cmi \
-    interp/ppextend.cmi parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi interp/genarg.cmi 
-parsing/prettyp.cmi: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/safe_typing.cmi pretyping/reductionops.cmi \
-    lib/pp.cmi library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    library/lib.cmi library/impargs.cmi kernel/environ.cmi \
-    pretyping/classops.cmi 
-parsing/printer.cmi: pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi lib/pp.cmi \
-    pretyping/pattern.cmi library/nametab.cmi kernel/names.cmi \
-    library/libnames.cmi pretyping/evd.cmi kernel/environ.cmi 
-parsing/printmod.cmi: lib/pp.cmi kernel/names.cmi 
-parsing/q_util.cmi: lib/util.cmi parsing/pcoq.cmi 
-parsing/search.cmi: kernel/term.cmi lib/pp.cmi pretyping/pattern.cmi \
-    library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    kernel/environ.cmi 
-parsing/tactic_printer.cmi: proofs/tacexpr.cmo kernel/sign.cmi \
-    proofs/proof_type.cmi lib/pp.cmi pretyping/evd.cmi 
-pretyping/cases.cmi: lib/util.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    kernel/names.cmi pretyping/inductiveops.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi 
-pretyping/cbv.cmi: kernel/term.cmi kernel/names.cmi kernel/esubst.cmi \
-    kernel/environ.cmi kernel/closure.cmi 
-pretyping/classops.cmi: kernel/term.cmi lib/pp.cmi library/nametab.cmi \
-    kernel/names.cmi kernel/mod_subst.cmi library/libnames.cmi \
-    pretyping/evd.cmi kernel/environ.cmi library/decl_kinds.cmo 
-pretyping/clenv.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi 
-pretyping/coercion.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi kernel/names.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi 
-pretyping/detyping.cmi: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    kernel/sign.cmi pretyping/rawterm.cmi kernel/names.cmi \
-    kernel/mod_subst.cmi kernel/environ.cmi 
-pretyping/evarconv.cmi: kernel/term.cmi kernel/sign.cmi \
-    pretyping/reductionops.cmi pretyping/evd.cmi kernel/environ.cmi 
-pretyping/evarutil.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/reductionops.cmi pretyping/rawterm.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 
-pretyping/indrec.cmi: kernel/term.cmi kernel/names.cmi \
-    pretyping/inductiveops.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/declarations.cmi 
-pretyping/inductiveops.cmi: kernel/term.cmi kernel/sign.cmi kernel/names.cmi \
-    kernel/mod_subst.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/declarations.cmi 
-pretyping/matching.cmi: pretyping/termops.cmi kernel/term.cmi \
-    pretyping/pattern.cmi kernel/names.cmi pretyping/evd.cmi \
-    kernel/environ.cmi 
-pretyping/pattern.cmi: kernel/term.cmi kernel/sign.cmi pretyping/rawterm.cmi \
-    lib/pp.cmi library/nametab.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi kernel/environ.cmi 
-pretyping/pretype_errors.cmi: lib/util.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi kernel/names.cmi \
-    pretyping/inductiveops.cmi pretyping/evd.cmi kernel/environ.cmi 
-pretyping/pretyping.cmi: kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi kernel/names.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi lib/dyn.cmi 
-pretyping/rawterm.cmi: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    pretyping/evd.cmi lib/dyn.cmi 
-pretyping/recordops.cmi: kernel/term.cmi library/nametab.cmi kernel/names.cmi \
-    library/library.cmi library/libobject.cmi library/libnames.cmi \
-    pretyping/classops.cmi 
-pretyping/reductionops.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/names.cmi pretyping/evd.cmi kernel/environ.cmi kernel/closure.cmi 
-pretyping/retyping.cmi: pretyping/termops.cmi kernel/term.cmi \
-    pretyping/evd.cmi kernel/environ.cmi 
-pretyping/tacred.cmi: kernel/type_errors.cmi kernel/term.cmi \
-    pretyping/reductionops.cmi pretyping/rawterm.cmi kernel/names.cmi \
-    library/libnames.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/closure.cmi 
-pretyping/termops.cmi: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi lib/pp.cmi kernel/names.cmi kernel/environ.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 
-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/evar_refiner.cmi: interp/topconstr.cmi kernel/term.cmi \
-    proofs/refiner.cmi pretyping/rawterm.cmi kernel/names.cmi \
-    pretyping/evd.cmi kernel/environ.cmi 
-proofs/logic.cmi: kernel/term.cmi kernel/sign.cmi proofs/proof_type.cmi \
-    kernel/names.cmi pretyping/evd.cmi kernel/environ.cmi 
-proofs/pfedit.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi lib/pp.cmi \
-    kernel/names.cmi pretyping/evd.cmi kernel/environ.cmi kernel/entries.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 
-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 
-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 \
-    kernel/sign.cmi proofs/proof_type.cmi proofs/proof_trees.cmi lib/pp.cmi \
-    pretyping/evd.cmi kernel/environ.cmi 
-proofs/tacmach.cmi: interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi proofs/tacexpr.cmo kernel/sign.cmi proofs/refiner.cmi \
-    kernel/reduction.cmi proofs/redexpr.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi lib/pp.cmi kernel/names.cmi \
-    pretyping/evd.cmi kernel/environ.cmi 
-proofs/tactic_debug.cmi: kernel/term.cmi proofs/tacexpr.cmo \
-    proofs/proof_type.cmi lib/pp.cmi pretyping/pattern.cmi kernel/names.cmi \
-    pretyping/evd.cmi kernel/environ.cmi 
-tactics/auto.cmi: toplevel/vernacexpr.cmo lib/util.cmi kernel/term.cmi \
-    proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi lib/pp.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/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/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 \
-    proofs/proof_type.cmi tactics/auto.cmi 
-tactics/elim.cmi: kernel/term.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi kernel/names.cmi \
-    interp/genarg.cmi 
-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 
-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/extratactics.cmi: kernel/term.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.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 \
-    interp/genarg.cmi 
-tactics/hipattern.cmi: lib/util.cmi kernel/term.cmi proofs/tacmach.cmi \
-    kernel/sign.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    pretyping/pattern.cmi kernel/names.cmi pretyping/evd.cmi \
-    interp/coqlib.cmi 
-tactics/inv.cmi: kernel/term.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi kernel/names.cmi interp/genarg.cmi 
-tactics/leminv.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi kernel/names.cmi 
-tactics/nbtermdn.cmi: kernel/term.cmi pretyping/pattern.cmi \
-    library/libnames.cmi tactics/btermdn.cmi 
-tactics/refine.cmi: proofs/tacmach.cmi pretyping/evd.cmi 
-tactics/setoid_replace.cmi: interp/topconstr.cmi kernel/term.cmi \
-    proofs/proof_type.cmi lib/pp.cmi kernel/names.cmi 
-tactics/tacinterp.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tactic_debug.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
-    proofs/redexpr.cmi proofs/proof_type.cmi lib/pp.cmi library/nametab.cmi \
-    kernel/names.cmi kernel/mod_subst.cmi library/libnames.cmi \
-    interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi lib/dyn.cmi 
-tactics/tacticals.cmi: kernel/term.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
-    kernel/sign.cmi kernel/reduction.cmi proofs/proof_type.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi interp/genarg.cmi \
-    pretyping/clenv.cmi 
-tactics/tactics.cmi: interp/topconstr.cmi kernel/term.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
-    kernel/sign.cmi kernel/reduction.cmi proofs/redexpr.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi interp/genarg.cmi pretyping/evd.cmi \
-    proofs/evar_refiner.cmi kernel/environ.cmi pretyping/clenv.cmi 
-tactics/termdn.cmi: kernel/term.cmi pretyping/pattern.cmi \
-    library/libnames.cmi 
-toplevel/cerrors.cmi: lib/util.cmi lib/pp.cmi 
-toplevel/class.cmi: kernel/term.cmi proofs/tacexpr.cmo library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi library/declare.cmi \
-    library/decl_kinds.cmo pretyping/classops.cmi 
-toplevel/command.cmi: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi kernel/term.cmi proofs/tacexpr.cmo \
-    proofs/redexpr.cmi pretyping/rawterm.cmi library/nametab.cmi \
-    kernel/names.cmi library/library.cmi library/libnames.cmi \
-    pretyping/evd.cmi kernel/environ.cmi kernel/entries.cmi \
-    library/declare.cmi library/decl_kinds.cmo 
+parsing/g_minicoq.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/term.cmi 
+parsing/lexer.cmi: lib/pp.cmi lib/util.cmi 
+parsing/pcoq.cmi: lib/bigint.cmi library/decl_kinds.cmo parsing/extend.cmi \
+    interp/genarg.cmi library/libnames.cmi kernel/names.cmi \
+    pretyping/rawterm.cmi proofs/tacexpr.cmo interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/ppconstr.cmi: kernel/environ.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+parsing/pptactic.cmi: kernel/environ.cmi interp/genarg.cmi \
+    library/libnames.cmi lib/pp.cmi interp/ppextend.cmi \
+    pretyping/pretyping.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi interp/topconstr.cmi 
+parsing/ppvernac.cmi: interp/genarg.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi parsing/pcoq.cmi \
+    lib/pp.cmi parsing/ppconstr.cmi interp/ppextend.cmi parsing/pptactic.cmi \
+    pretyping/rawterm.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/prettyp.cmi: pretyping/classops.cmi kernel/environ.cmi \
+    library/impargs.cmi library/lib.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi pretyping/reductionops.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+parsing/printer.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi 
+parsing/printmod.cmi: kernel/names.cmi lib/pp.cmi 
+parsing/q_util.cmi: parsing/pcoq.cmi lib/util.cmi 
+parsing/search.cmi: kernel/environ.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/pattern.cmi lib/pp.cmi kernel/term.cmi 
+parsing/tactic_printer.cmi: pretyping/evd.cmi lib/pp.cmi \
+    proofs/proof_type.cmi kernel/sign.cmi proofs/tacexpr.cmo 
+pretyping/cases.cmi: pretyping/coercion.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi pretyping/inductiveops.cmi \
+    kernel/names.cmi pretyping/rawterm.cmi kernel/term.cmi lib/util.cmi 
+pretyping/cbv.cmi: kernel/closure.cmi kernel/environ.cmi kernel/esubst.cmi \
+    kernel/names.cmi kernel/term.cmi 
+pretyping/classops.cmi: library/decl_kinds.cmo kernel/environ.cmi \
+    pretyping/evd.cmi library/libnames.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi library/nametab.cmi lib/pp.cmi kernel/term.cmi 
+pretyping/clenv.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/mod_subst.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi 
+pretyping/coercion.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/names.cmi pretyping/rawterm.cmi kernel/sign.cmi \
+    kernel/term.cmi lib/util.cmi 
+pretyping/detyping.cmi: kernel/environ.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+pretyping/evarconv.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    pretyping/reductionops.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/evarutil.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
+    pretyping/rawterm.cmi pretyping/reductionops.cmi kernel/sign.cmi \
+    kernel/term.cmi lib/util.cmi 
+pretyping/evd.cmi: kernel/environ.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi lib/pp.cmi kernel/reduction.cmi \
+    kernel/sign.cmi kernel/term.cmi lib/util.cmi 
+pretyping/indrec.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi pretyping/inductiveops.cmi kernel/names.cmi \
+    kernel/term.cmi 
+pretyping/inductiveops.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi kernel/mod_subst.cmi kernel/names.cmi kernel/sign.cmi \
+    kernel/term.cmi 
+pretyping/matching.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
+    pretyping/pattern.cmi kernel/term.cmi pretyping/termops.cmi 
+pretyping/pattern.cmi: kernel/environ.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi library/nametab.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/pretype_errors.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    pretyping/inductiveops.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi 
+pretyping/pretyping.cmi: pretyping/cases.cmi pretyping/coercion.cmi \
+    lib/dyn.cmi kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    kernel/names.cmi pretyping/rawterm.cmi kernel/sign.cmi kernel/term.cmi 
+pretyping/rawterm.cmi: lib/dyn.cmi pretyping/evd.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi lib/util.cmi 
+pretyping/recordops.cmi: pretyping/classops.cmi library/libnames.cmi \
+    library/libobject.cmi library/library.cmi kernel/names.cmi \
+    library/nametab.cmi kernel/term.cmi 
+pretyping/reductionops.cmi: kernel/closure.cmi kernel/environ.cmi \
+    pretyping/evd.cmi kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi 
+pretyping/retyping.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/term.cmi \
+    pretyping/termops.cmi 
+pretyping/tacred.cmi: kernel/closure.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/libnames.cmi kernel/names.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi kernel/term.cmi kernel/type_errors.cmi 
+pretyping/termops.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/sign.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi 
+pretyping/typing.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/term.cmi 
+pretyping/unification.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    kernel/term.cmi 
+proofs/clenvtac.cmi: pretyping/clenv.cmi pretyping/evd.cmi kernel/names.cmi \
+    proofs/proof_type.cmi kernel/sign.cmi kernel/term.cmi lib/util.cmi 
+proofs/evar_refiner.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    kernel/names.cmi pretyping/rawterm.cmi proofs/refiner.cmi kernel/term.cmi \
+    interp/topconstr.cmi 
+proofs/logic.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
+    proofs/proof_type.cmi kernel/sign.cmi kernel/term.cmi 
+proofs/pfedit.cmi: library/decl_kinds.cmo kernel/entries.cmi \
+    kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+proofs/proof_trees.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
+    lib/pp.cmi proofs/proof_type.cmi kernel/sign.cmi kernel/term.cmi \
+    lib/util.cmi 
+proofs/proof_type.cmi: kernel/environ.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    kernel/term.cmi lib/util.cmi 
+proofs/redexpr.cmi: kernel/closure.cmi kernel/names.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi kernel/term.cmi 
+proofs/refiner.cmi: kernel/environ.cmi pretyping/evd.cmi lib/pp.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi pretyping/termops.cmi 
+proofs/tacmach.cmi: kernel/environ.cmi pretyping/evd.cmi kernel/names.cmi \
+    lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi proofs/redexpr.cmi kernel/reduction.cmi \
+    proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi 
+proofs/tactic_debug.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi 
+tactics/auto.cmi: tactics/btermdn.cmi pretyping/clenv.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/libnames.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi kernel/sign.cmi proofs/tacexpr.cmo \
+    proofs/tacmach.cmi kernel/term.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+tactics/autorewrite.cmi: kernel/names.cmi proofs/tacexpr.cmo \
+    proofs/tacmach.cmi kernel/term.cmi 
+tactics/btermdn.cmi: pretyping/pattern.cmi kernel/term.cmi 
+tactics/contradiction.cmi: kernel/names.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi kernel/term.cmi 
+tactics/dhyp.cmi: kernel/names.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    interp/topconstr.cmi toplevel/vernacexpr.cmo 
+tactics/eauto.cmi: tactics/auto.cmi proofs/proof_type.cmi proofs/tacexpr.cmo \
+    kernel/term.cmi interp/topconstr.cmi 
+tactics/elim.cmi: interp/genarg.cmi kernel/names.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    kernel/term.cmi 
+tactics/equality.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    tactics/hipattern.cmi kernel/names.cmi pretyping/pattern.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi 
+tactics/evar_tactics.cmi: kernel/names.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi 
+tactics/extraargs.cmi: kernel/names.cmi parsing/pcoq.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi tactics/setoid_replace.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+tactics/extratactics.cmi: interp/genarg.cmi kernel/names.cmi parsing/pcoq.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    kernel/term.cmi interp/topconstr.cmi 
+tactics/hiddentac.cmi: interp/genarg.cmi kernel/names.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/redexpr.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    kernel/term.cmi 
+tactics/hipattern.cmi: interp/coqlib.cmi pretyping/evd.cmi kernel/names.cmi \
+    pretyping/pattern.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi lib/util.cmi 
+tactics/inv.cmi: interp/genarg.cmi kernel/names.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi 
+tactics/leminv.cmi: kernel/names.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+tactics/nbtermdn.cmi: tactics/btermdn.cmi library/libnames.cmi \
+    pretyping/pattern.cmi kernel/term.cmi 
+tactics/refine.cmi: pretyping/evd.cmi proofs/tacmach.cmi 
+tactics/setoid_replace.cmi: kernel/names.cmi lib/pp.cmi proofs/proof_type.cmi \
+    kernel/term.cmi interp/topconstr.cmi 
+tactics/tacinterp.cmi: lib/dyn.cmi kernel/environ.cmi pretyping/evd.cmi \
+    interp/genarg.cmi library/libnames.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi library/nametab.cmi lib/pp.cmi proofs/proof_type.cmi \
+    proofs/redexpr.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    proofs/tactic_debug.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+tactics/tacticals.cmi: pretyping/clenv.cmi interp/genarg.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
+    kernel/reduction.cmi kernel/sign.cmi proofs/tacexpr.cmo \
+    proofs/tacmach.cmi kernel/term.cmi 
+tactics/tactics.cmi: pretyping/clenv.cmi kernel/environ.cmi \
+    proofs/evar_refiner.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/redexpr.cmi \
+    kernel/reduction.cmi kernel/sign.cmi proofs/tacexpr.cmo \
+    proofs/tacmach.cmi tactics/tacticals.cmi kernel/term.cmi \
+    interp/topconstr.cmi 
+tactics/termdn.cmi: library/libnames.cmi pretyping/pattern.cmi \
+    kernel/term.cmi 
+toplevel/cerrors.cmi: lib/pp.cmi lib/util.cmi 
+toplevel/class.cmi: pretyping/classops.cmi library/decl_kinds.cmo \
+    library/declare.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi proofs/tacexpr.cmo kernel/term.cmi 
+toplevel/command.cmi: library/decl_kinds.cmo library/declare.cmi \
+    kernel/entries.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/libnames.cmi library/library.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/rawterm.cmi proofs/redexpr.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
 toplevel/coqinit.cmi: kernel/names.cmi 
-toplevel/discharge.cmi: kernel/sign.cmi kernel/entries.cmi \
-    kernel/declarations.cmi kernel/cooking.cmi 
-toplevel/fhimsg.cmi: kernel/type_errors.cmi kernel/term.cmi kernel/sign.cmi \
-    lib/pp.cmi kernel/names.cmi kernel/environ.cmi 
-toplevel/himsg.cmi: kernel/type_errors.cmi pretyping/tacred.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi kernel/names.cmi proofs/logic.cmi \
-    kernel/indtypes.cmi pretyping/indrec.cmi kernel/environ.cmi \
-    pretyping/cases.cmi 
-toplevel/metasyntax.cmi: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo interp/ppextend.cmi \
-    interp/notation.cmi library/libnames.cmi parsing/extend.cmi \
-    interp/constrintern.cmi pretyping/classops.cmi 
-toplevel/mltop.cmi: kernel/names.cmi library/libobject.cmi 
+toplevel/discharge.cmi: kernel/cooking.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/sign.cmi 
+toplevel/fhimsg.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/sign.cmi kernel/term.cmi kernel/type_errors.cmi 
+toplevel/himsg.cmi: pretyping/cases.cmi kernel/environ.cmi \
+    pretyping/indrec.cmi kernel/indtypes.cmi proofs/logic.cmi \
+    kernel/names.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
+    pretyping/tacred.cmi kernel/type_errors.cmi 
+toplevel/metasyntax.cmi: pretyping/classops.cmi interp/constrintern.cmi \
+    parsing/extend.cmi library/libnames.cmi interp/notation.cmi \
+    interp/ppextend.cmi proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+toplevel/mltop.cmi: library/libobject.cmi kernel/names.cmi 
 toplevel/protectedtoplevel.cmi: lib/pp.cmi 
-toplevel/record.cmi: toplevel/vernacexpr.cmo interp/topconstr.cmi \
-    kernel/term.cmi kernel/sign.cmi kernel/names.cmi 
-toplevel/searchisos.cmi: kernel/term.cmi kernel/names.cmi \
-    library/libobject.cmi 
-toplevel/toplevel.cmi: lib/pp.cmi parsing/pcoq.cmi 
-toplevel/vernacentries.cmi: toplevel/vernacinterp.cmi toplevel/vernacexpr.cmo \
-    interp/topconstr.cmi kernel/term.cmi kernel/names.cmi \
-    library/libnames.cmi pretyping/evd.cmi kernel/environ.cmi 
+toplevel/record.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    interp/topconstr.cmi toplevel/vernacexpr.cmo 
+toplevel/searchisos.cmi: library/libobject.cmi kernel/names.cmi \
+    kernel/term.cmi 
+toplevel/toplevel.cmi: parsing/pcoq.cmi lib/pp.cmi 
+toplevel/vernacentries.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    library/libnames.cmi kernel/names.cmi kernel/term.cmi \
+    interp/topconstr.cmi toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi 
 toplevel/vernacinterp.cmi: proofs/tacexpr.cmo 
-toplevel/vernac.cmi: toplevel/vernacexpr.cmo lib/util.cmi parsing/pcoq.cmi 
-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/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 
-contrib/correctness/pcicenv.cmi: kernel/term.cmi kernel/sign.cmi \
-    kernel/names.cmi 
+toplevel/vernac.cmi: parsing/pcoq.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+toplevel/whelp.cmi: kernel/environ.cmi kernel/names.cmi kernel/term.cmi \
+    interp/topconstr.cmi 
+contrib/cc/ccalgo.cmi: kernel/names.cmi lib/pp.cmi kernel/term.cmi \
+    lib/util.cmi 
+contrib/cc/ccproof.cmi: contrib/cc/ccalgo.cmi kernel/names.cmi 
+contrib/cc/cctac.cmi: proofs/proof_type.cmi kernel/term.cmi 
+contrib/correctness/past.cmi: kernel/names.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+contrib/correctness/pcicenv.cmi: kernel/names.cmi kernel/sign.cmi \
+    kernel/term.cmi 
 contrib/correctness/pcic.cmi: pretyping/rawterm.cmi 
 contrib/correctness/pdb.cmi: kernel/names.cmi 
-contrib/correctness/peffect.cmi: lib/pp.cmi kernel/names.cmi 
-contrib/correctness/penv.cmi: kernel/term.cmi kernel/names.cmi \
-    library/libnames.cmi 
-contrib/correctness/perror.cmi: lib/util.cmi lib/pp.cmi kernel/names.cmi 
+contrib/correctness/peffect.cmi: kernel/names.cmi lib/pp.cmi 
+contrib/correctness/penv.cmi: library/libnames.cmi kernel/names.cmi \
+    kernel/term.cmi 
+contrib/correctness/perror.cmi: kernel/names.cmi lib/pp.cmi lib/util.cmi 
 contrib/correctness/pextract.cmi: kernel/names.cmi 
-contrib/correctness/pmisc.cmi: lib/util.cmi interp/topconstr.cmi \
-    kernel/term.cmi lib/pp.cmi kernel/names.cmi 
+contrib/correctness/pmisc.cmi: kernel/names.cmi lib/pp.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
 contrib/correctness/pmlize.cmi: kernel/names.cmi 
-contrib/correctness/pmonad.cmi: kernel/term.cmi kernel/names.cmi 
+contrib/correctness/pmonad.cmi: kernel/names.cmi kernel/term.cmi 
 contrib/correctness/pred.cmi: kernel/term.cmi 
-contrib/correctness/prename.cmi: lib/pp.cmi kernel/names.cmi 
-contrib/correctness/psyntax.cmi: interp/topconstr.cmi parsing/pcoq.cmi 
+contrib/correctness/prename.cmi: kernel/names.cmi lib/pp.cmi 
+contrib/correctness/psyntax.cmi: parsing/pcoq.cmi interp/topconstr.cmi 
 contrib/correctness/ptactic.cmi: proofs/tacmach.cmi 
-contrib/correctness/ptype.cmi: kernel/term.cmi kernel/names.cmi 
-contrib/correctness/ptyping.cmi: interp/topconstr.cmi kernel/term.cmi \
-    kernel/names.cmi 
-contrib/correctness/putil.cmi: kernel/term.cmi lib/pp.cmi kernel/names.cmi 
+contrib/correctness/ptype.cmi: kernel/names.cmi kernel/term.cmi 
+contrib/correctness/ptyping.cmi: kernel/names.cmi kernel/term.cmi \
+    interp/topconstr.cmi 
+contrib/correctness/putil.cmi: kernel/names.cmi lib/pp.cmi kernel/term.cmi 
 contrib/correctness/pwp.cmi: kernel/term.cmi 
 contrib/dp/dp_cvcl.cmi: contrib/dp/fol.cmi 
-contrib/dp/dp.cmi: proofs/proof_type.cmi library/libnames.cmi 
+contrib/dp/dp.cmi: library/libnames.cmi proofs/proof_type.cmi 
 contrib/dp/dp_simplify.cmi: contrib/dp/fol.cmi 
 contrib/dp/dp_sorts.cmi: contrib/dp/fol.cmi 
 contrib/dp/dp_zenon.cmi: contrib/dp/fol.cmi 
-contrib/extraction/common.cmi: kernel/names.cmi contrib/extraction/mlutil.cmi \
-    contrib/extraction/miniml.cmi 
-contrib/extraction/extract_env.cmi: kernel/names.cmi library/libnames.cmi 
-contrib/extraction/extraction.cmi: kernel/term.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi kernel/environ.cmi \
-    kernel/declarations.cmi 
-contrib/extraction/haskell.cmi: lib/pp.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi 
-contrib/extraction/miniml.cmi: lib/util.cmi lib/pp.cmi kernel/names.cmi \
-    library/libnames.cmi 
-contrib/extraction/mlutil.cmi: lib/util.cmi kernel/term.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi 
-contrib/extraction/modutil.cmi: kernel/names.cmi kernel/mod_subst.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi kernel/environ.cmi \
-    kernel/declarations.cmi 
-contrib/extraction/ocaml.cmi: lib/pp.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi 
-contrib/extraction/scheme.cmi: lib/pp.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi 
-contrib/extraction/table.cmi: kernel/term.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi kernel/environ.cmi 
-contrib/first-order/formula.cmi: kernel/term.cmi proofs/tacmach.cmi \
-    kernel/sign.cmi proofs/proof_type.cmi kernel/names.cmi \
-    library/libnames.cmi kernel/closure.cmi 
-contrib/first-order/ground.cmi: proofs/tacmach.cmi \
-    contrib/first-order/sequent.cmi proofs/proof_type.cmi 
-contrib/first-order/instances.cmi: contrib/first-order/unify.cmi \
-    kernel/term.cmi proofs/tacmach.cmi contrib/first-order/sequent.cmi \
-    contrib/first-order/rules.cmi kernel/names.cmi library/libnames.cmi \
-    contrib/first-order/formula.cmi 
-contrib/first-order/rules.cmi: kernel/term.cmi proofs/tacmach.cmi \
-    contrib/first-order/sequent.cmi kernel/names.cmi library/libnames.cmi 
-contrib/first-order/sequent.cmi: lib/util.cmi kernel/term.cmi \
-    proofs/tacmach.cmi proofs/proof_type.cmi kernel/names.cmi \
-    library/libnames.cmi lib/heap.cmi contrib/first-order/formula.cmi \
-    tactics/auto.cmi 
-contrib/first-order/unify.cmi: kernel/term.cmi 
-contrib/funind/indfun_common.cmi: kernel/term.cmi pretyping/rawterm.cmi \
-    lib/pp.cmi kernel/names.cmi library/libnames.cmi 
-contrib/funind/new_arg_principle.cmi: kernel/term.cmi proofs/tacmach.cmi \
-    pretyping/rawterm.cmi kernel/names.cmi 
-contrib/funind/rawtermops.cmi: lib/util.cmi pretyping/rawterm.cmi \
-    kernel/names.cmi library/libnames.cmi 
-contrib/funind/rawterm_to_relation.cmi: interp/topconstr.cmi \
-    pretyping/rawterm.cmi kernel/names.cmi 
-contrib/funind/tacinvutils.cmi: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    proofs/tacmach.cmi tactics/tacinterp.cmi tactics/refine.cmi \
-    pretyping/reductionops.cmi proofs/proof_type.cmi parsing/printer.cmi \
-    lib/pp.cmi kernel/names.cmi pretyping/inductiveops.cmi pretyping/evd.cmi \
-    tactics/equality.cmi interp/coqlib.cmi 
-contrib/interface/blast.cmi: proofs/tacexpr.cmo proofs/proof_type.cmi 
-contrib/interface/dad.cmi: interp/topconstr.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo proofs/proof_type.cmi 
-contrib/interface/debug_tac.cmi: proofs/tacmach.cmi proofs/tacexpr.cmo \
-    proofs/proof_type.cmi pretyping/evd.cmi 
-contrib/interface/name_to_ast.cmi: toplevel/vernacexpr.cmo \
-    library/libnames.cmi 
-contrib/interface/pbp.cmi: proofs/tacexpr.cmo proofs/proof_type.cmi \
+contrib/extraction/common.cmi: contrib/extraction/miniml.cmi \
+    contrib/extraction/mlutil.cmi kernel/names.cmi 
+contrib/extraction/extract_env.cmi: library/libnames.cmi kernel/names.cmi 
+contrib/extraction/extraction.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    library/libnames.cmi contrib/extraction/miniml.cmi kernel/names.cmi \
+    kernel/term.cmi 
+contrib/extraction/haskell.cmi: contrib/extraction/miniml.cmi \
+    kernel/names.cmi lib/pp.cmi 
+contrib/extraction/miniml.cmi: library/libnames.cmi kernel/names.cmi \
+    lib/pp.cmi lib/util.cmi 
+contrib/extraction/mlutil.cmi: library/libnames.cmi \
+    contrib/extraction/miniml.cmi kernel/names.cmi kernel/term.cmi \
+    lib/util.cmi 
+contrib/extraction/modutil.cmi: kernel/declarations.cmi kernel/environ.cmi \
+    library/libnames.cmi contrib/extraction/miniml.cmi kernel/mod_subst.cmi \
     kernel/names.cmi 
-contrib/interface/showproof.cmi: toplevel/vernacinterp.cmi lib/util.cmi \
-    pretyping/typing.cmi kernel/term.cmi kernel/sign.cmi \
-    contrib/interface/showproof_ct.cmo kernel/reduction.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi parsing/printer.cmi \
-    lib/pp.cmi proofs/pfedit.cmi kernel/names.cmi kernel/inductive.cmi \
-    pretyping/evd.cmi kernel/environ.cmi kernel/declarations.cmi \
-    pretyping/clenv.cmi contrib/interface/ascent.cmi 
-contrib/interface/translate.cmi: kernel/term.cmi proofs/proof_type.cmi \
-    pretyping/evd.cmi kernel/environ.cmi contrib/interface/ascent.cmi 
+contrib/extraction/ocaml.cmi: library/libnames.cmi \
+    contrib/extraction/miniml.cmi kernel/names.cmi lib/pp.cmi 
+contrib/extraction/scheme.cmi: contrib/extraction/miniml.cmi kernel/names.cmi \
+    lib/pp.cmi 
+contrib/extraction/table.cmi: kernel/environ.cmi library/libnames.cmi \
+    contrib/extraction/miniml.cmi kernel/names.cmi kernel/term.cmi 
+contrib/first-order/formula.cmi: kernel/closure.cmi library/libnames.cmi \
+    kernel/names.cmi proofs/proof_type.cmi kernel/sign.cmi proofs/tacmach.cmi \
+    kernel/term.cmi 
+contrib/first-order/ground.cmi: proofs/proof_type.cmi \
+    contrib/first-order/sequent.cmi proofs/tacmach.cmi 
+contrib/first-order/instances.cmi: contrib/first-order/formula.cmi \
+    library/libnames.cmi kernel/names.cmi contrib/first-order/rules.cmi \
+    contrib/first-order/sequent.cmi proofs/tacmach.cmi kernel/term.cmi \
+    contrib/first-order/unify.cmi 
+contrib/first-order/rules.cmi: library/libnames.cmi kernel/names.cmi \
+    contrib/first-order/sequent.cmi proofs/tacmach.cmi kernel/term.cmi 
+contrib/first-order/sequent.cmi: tactics/auto.cmi \
+    contrib/first-order/formula.cmi lib/heap.cmi library/libnames.cmi \
+    kernel/names.cmi proofs/proof_type.cmi proofs/tacmach.cmi kernel/term.cmi \
+    lib/util.cmi 
+contrib/first-order/unify.cmi: kernel/term.cmi 
+contrib/funind/indfun_common.cmi: library/libnames.cmi kernel/names.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi kernel/term.cmi 
+contrib/funind/new_arg_principle.cmi: kernel/names.cmi pretyping/rawterm.cmi \
+    proofs/tacmach.cmi kernel/term.cmi 
+contrib/funind/rawtermops.cmi: library/libnames.cmi kernel/names.cmi \
+    pretyping/rawterm.cmi lib/util.cmi 
+contrib/funind/rawterm_to_relation.cmi: kernel/names.cmi \
+    pretyping/rawterm.cmi interp/topconstr.cmi 
+contrib/funind/tacinvutils.cmi: interp/coqlib.cmi tactics/equality.cmi \
+    pretyping/evd.cmi pretyping/inductiveops.cmi kernel/names.cmi lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
+    tactics/refine.cmi tactics/tacinterp.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+contrib/interface/blast.cmi: proofs/proof_type.cmi proofs/tacexpr.cmo 
+contrib/interface/dad.cmi: proofs/proof_type.cmi proofs/tacexpr.cmo \
+    proofs/tacmach.cmi interp/topconstr.cmi 
+contrib/interface/debug_tac.cmi: pretyping/evd.cmi proofs/proof_type.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi 
+contrib/interface/name_to_ast.cmi: library/libnames.cmi \
+    toplevel/vernacexpr.cmo 
+contrib/interface/pbp.cmi: kernel/names.cmi proofs/proof_type.cmi \
+    proofs/tacexpr.cmo 
+contrib/interface/showproof.cmi: contrib/interface/ascent.cmi \
+    pretyping/clenv.cmi kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi kernel/inductive.cmi kernel/names.cmi proofs/pfedit.cmi \
+    lib/pp.cmi parsing/printer.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi kernel/reduction.cmi \
+    contrib/interface/showproof_ct.cmo kernel/sign.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacinterp.cmi 
+contrib/interface/translate.cmi: contrib/interface/ascent.cmi \
+    kernel/environ.cmi pretyping/evd.cmi proofs/proof_type.cmi \
+    kernel/term.cmi 
 contrib/interface/vtp.cmi: contrib/interface/ascent.cmi 
-contrib/interface/xlate.cmi: toplevel/vernacexpr.cmo interp/topconstr.cmi \
-    proofs/tacexpr.cmo kernel/names.cmi contrib/interface/ascent.cmi 
-contrib/jprover/jall.cmi: contrib/jprover/opname.cmi \
-    contrib/jprover/jterm.cmi contrib/jprover/jlogic.cmi 
+contrib/interface/xlate.cmi: contrib/interface/ascent.cmi kernel/names.cmi \
+    proofs/tacexpr.cmo interp/topconstr.cmi toplevel/vernacexpr.cmo 
+contrib/jprover/jall.cmi: contrib/jprover/jlogic.cmi \
+    contrib/jprover/jterm.cmi contrib/jprover/opname.cmi 
 contrib/jprover/jlogic.cmi: contrib/jprover/jterm.cmi 
 contrib/jprover/jterm.cmi: contrib/jprover/opname.cmi 
-contrib/rtauto/refl_tauto.cmi: kernel/term.cmi proofs/tacmach.cmi \
-    proofs/proof_type.cmi contrib/rtauto/proof_search.cmi kernel/names.cmi 
-contrib/subtac/eterm.cmi: proofs/tacmach.cmi pretyping/evd.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 \
-    proofs/proof_type.cmi contrib/xml/proof2aproof.cmo library/libnames.cmi \
-    pretyping/evd.cmi contrib/xml/acic.cmo 
+contrib/rtauto/refl_tauto.cmi: kernel/names.cmi \
+    contrib/rtauto/proof_search.cmi proofs/proof_type.cmi proofs/tacmach.cmi \
+    kernel/term.cmi 
+contrib/subtac/context.cmi: kernel/names.cmi kernel/term.cmi 
+contrib/subtac/eterm.cmi: pretyping/evd.cmi proofs/tacmach.cmi 
+contrib/subtac/subtac_coercion.cmi: pretyping/coercion.cmi 
+contrib/subtac/subtac_command.cmi: interp/constrintern.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/libnames.cmi \
+    kernel/names.cmi lib/pp.cmi pretyping/pretyping.cmi pretyping/rawterm.cmi \
+    kernel/term.cmi interp/topconstr.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+contrib/subtac/subtac_errors.cmi: lib/pp.cmi lib/util.cmi 
+contrib/subtac/subtac_interp_fixpoint.cmi: library/libnames.cmi \
+    kernel/names.cmi lib/pp.cmi pretyping/rawterm.cmi interp/topconstr.cmi \
+    lib/util.cmi 
+contrib/subtac/subtac.cmi: kernel/names.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+contrib/subtac/subtac_pretyping.cmi: kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi kernel/names.cmi pretyping/pretyping.cmi \
+    kernel/sign.cmi kernel/term.cmi interp/topconstr.cmi 
+contrib/subtac/subtac_utils.cmi: interp/coqlib.cmi library/decl_kinds.cmo \
+    kernel/environ.cmi pretyping/evd.cmi library/libnames.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+contrib/xml/doubleTypeInference.cmi: contrib/xml/acic.cmo kernel/environ.cmi \
+    pretyping/evd.cmi kernel/names.cmi kernel/term.cmi 
+contrib/xml/xmlcommand.cmi: contrib/xml/acic.cmo pretyping/evd.cmi \
+    library/libnames.cmi contrib/xml/proof2aproof.cmo proofs/proof_type.cmi \
+    kernel/term.cmi contrib/xml/xml.cmi 
 ide/utils/configwin.cmi: ide/utils/config_file.cmi 
 tools/coqdoc/index.cmi: tools/coqdoc/cdglobals.cmo 
-tools/coqdoc/output.cmi: tools/coqdoc/index.cmi tools/coqdoc/cdglobals.cmo 
-tools/coqdoc/pretty.cmi: tools/coqdoc/index.cmi tools/coqdoc/cdglobals.cmo 
+tools/coqdoc/output.cmi: tools/coqdoc/cdglobals.cmo tools/coqdoc/index.cmi 
+tools/coqdoc/pretty.cmi: tools/coqdoc/cdglobals.cmo tools/coqdoc/index.cmi 
 config/coq_config.cmo: config/coq_config.cmi 
 config/coq_config.cmx: config/coq_config.cmi 
-dev/db_printers.cmo: lib/pp.cmi kernel/names.cmi 
-dev/db_printers.cmx: lib/pp.cmx kernel/names.cmx 
-dev/top_printers.cmo: toplevel/vernacinterp.cmi lib/util.cmi kernel/univ.cmi \
-    pretyping/termops.cmi kernel/term.cmi parsing/tactic_printer.cmi \
-    lib/system.cmi kernel/sign.cmi proofs/refiner.cmi proofs/proof_trees.cmi \
-    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi proofs/pfedit.cmi \
-    parsing/pcoq.cmi kernel/names.cmi library/nameops.cmi proofs/logic.cmi \
-    library/libobject.cmi library/libnames.cmi library/goptions.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi \
-    parsing/egrammar.cmi kernel/declarations.cmi interp/constrintern.cmi \
-    interp/constrextern.cmi kernel/closure.cmi pretyping/clenv.cmi \
-    toplevel/cerrors.cmi lib/bigint.cmi 
-dev/top_printers.cmx: toplevel/vernacinterp.cmx lib/util.cmx kernel/univ.cmx \
-    pretyping/termops.cmx kernel/term.cmx parsing/tactic_printer.cmx \
-    lib/system.cmx kernel/sign.cmx proofs/refiner.cmx proofs/proof_trees.cmx \
-    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx proofs/pfedit.cmx \
-    parsing/pcoq.cmx kernel/names.cmx library/nameops.cmx proofs/logic.cmx \
-    library/libobject.cmx library/libnames.cmx library/goptions.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.cmx kernel/environ.cmx \
-    parsing/egrammar.cmx kernel/declarations.cmx interp/constrintern.cmx \
-    interp/constrextern.cmx kernel/closure.cmx pretyping/clenv.cmx \
-    toplevel/cerrors.cmx lib/bigint.cmx 
-dev/vm_printers.cmo: kernel/vm.cmi kernel/term.cmi kernel/names.cmi \
-    kernel/cemitcodes.cmi kernel/cbytecodes.cmi 
-dev/vm_printers.cmx: kernel/vm.cmx kernel/term.cmx kernel/names.cmx \
-    kernel/cemitcodes.cmx kernel/cbytecodes.cmx 
-ide/blaster_window.cmo: ide/ideutils.cmi ide/coq.cmi 
-ide/blaster_window.cmx: ide/ideutils.cmx ide/coq.cmx 
-ide/command_windows.cmo: ide/ideutils.cmi ide/coq_commands.cmo ide/coq.cmi \
+dev/db_printers.cmo: kernel/names.cmi lib/pp.cmi 
+dev/db_printers.cmx: kernel/names.cmx lib/pp.cmx 
+dev/top_printers.cmo: lib/bigint.cmi toplevel/cerrors.cmi pretyping/clenv.cmi \
+    kernel/closure.cmi interp/constrextern.cmi interp/constrintern.cmi \
+    kernel/declarations.cmi parsing/egrammar.cmi kernel/environ.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    library/goptions.cmi library/libnames.cmi library/libobject.cmi \
+    proofs/logic.cmi library/nameops.cmi kernel/names.cmi parsing/pcoq.cmi \
+    proofs/pfedit.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/refiner.cmi kernel/sign.cmi lib/system.cmi \
+    parsing/tactic_printer.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/univ.cmi lib/util.cmi toplevel/vernacinterp.cmi 
+dev/top_printers.cmx: lib/bigint.cmx toplevel/cerrors.cmx pretyping/clenv.cmx \
+    kernel/closure.cmx interp/constrextern.cmx interp/constrintern.cmx \
+    kernel/declarations.cmx parsing/egrammar.cmx kernel/environ.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    library/goptions.cmx library/libnames.cmx library/libobject.cmx \
+    proofs/logic.cmx library/nameops.cmx kernel/names.cmx parsing/pcoq.cmx \
+    proofs/pfedit.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/refiner.cmx kernel/sign.cmx lib/system.cmx \
+    parsing/tactic_printer.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/univ.cmx lib/util.cmx toplevel/vernacinterp.cmx 
+dev/vm_printers.cmo: kernel/cbytecodes.cmi kernel/cemitcodes.cmi \
+    kernel/names.cmi kernel/term.cmi kernel/vm.cmi 
+dev/vm_printers.cmx: kernel/cbytecodes.cmx kernel/cemitcodes.cmx \
+    kernel/names.cmx kernel/term.cmx kernel/vm.cmx 
+ide/blaster_window.cmo: ide/coq.cmi ide/ideutils.cmi 
+ide/blaster_window.cmx: ide/coq.cmx ide/ideutils.cmx 
+ide/command_windows.cmo: ide/coq.cmi ide/coq_commands.cmo ide/ideutils.cmi \
     ide/command_windows.cmi 
-ide/command_windows.cmx: ide/ideutils.cmx ide/coq_commands.cmx ide/coq.cmx \
+ide/command_windows.cmx: ide/coq.cmx ide/coq_commands.cmx ide/ideutils.cmx \
     ide/command_windows.cmi 
-ide/config_lexer.cmo: lib/util.cmi ide/config_parser.cmi 
-ide/config_lexer.cmx: lib/util.cmx ide/config_parser.cmx 
+ide/config_lexer.cmo: ide/config_parser.cmi lib/util.cmi 
+ide/config_lexer.cmx: ide/config_parser.cmx lib/util.cmx 
 ide/config_parser.cmo: lib/util.cmi ide/config_parser.cmi 
 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 proofs/pfedit.cmi ide/ideutils.cmi \
-    ide/highlight.cmo ide/find_phrase.cmo 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 proofs/pfedit.cmx ide/ideutils.cmx \
-    ide/highlight.cmx ide/find_phrase.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 library/states.cmi \
-    proofs/refiner.cmi pretyping/reductionops.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 
-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 library/states.cmx \
-    proofs/refiner.cmx pretyping/reductionops.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 
+ide/coqide.cmo: ide/blaster_window.cmo ide/command_windows.cmi ide/coq.cmi \
+    ide/coq_commands.cmo ide/find_phrase.cmo ide/highlight.cmo \
+    ide/ideutils.cmi proofs/pfedit.cmi ide/preferences.cmi lib/system.cmi \
+    ide/undo.cmi lib/util.cmi toplevel/vernacexpr.cmo ide/coqide.cmi 
+ide/coqide.cmx: ide/blaster_window.cmx ide/command_windows.cmx ide/coq.cmx \
+    ide/coq_commands.cmx ide/find_phrase.cmx ide/highlight.cmx \
+    ide/ideutils.cmx proofs/pfedit.cmx ide/preferences.cmx lib/system.cmx \
+    ide/undo.cmx lib/util.cmx toplevel/vernacexpr.cmx ide/coqide.cmi 
+ide/coq.cmo: toplevel/cerrors.cmi config/coq_config.cmi toplevel/coqtop.cmi \
+    kernel/declarations.cmi kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/global.cmi tactics/hipattern.cmi \
+    ide/ideutils.cmi library/lib.cmi library/libnames.cmi library/library.cmi \
+    toplevel/mltop.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
+    pretyping/reductionops.cmi proofs/refiner.cmi library/states.cmi \
+    tactics/tacinterp.cmi proofs/tacmach.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi toplevel/vernac.cmi \
+    toplevel/vernacentries.cmi toplevel/vernacexpr.cmo ide/coq.cmi 
+ide/coq.cmx: toplevel/cerrors.cmx config/coq_config.cmx toplevel/coqtop.cmx \
+    kernel/declarations.cmx kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/global.cmx tactics/hipattern.cmx \
+    ide/ideutils.cmx library/lib.cmx library/libnames.cmx library/library.cmx \
+    toplevel/mltop.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx parsing/printer.cmx \
+    pretyping/reductionops.cmx proofs/refiner.cmx library/states.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx toplevel/vernac.cmx \
+    toplevel/vernacentries.cmx toplevel/vernacexpr.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/highlight.cmo: ide/ideutils.cmi 
 ide/highlight.cmx: ide/ideutils.cmx 
-ide/ideutils.cmo: ide/utf8_convert.cmo lib/system.cmi ide/preferences.cmi \
-    lib/pp_control.cmi lib/options.cmi config/coq_config.cmi ide/ideutils.cmi 
-ide/ideutils.cmx: ide/utf8_convert.cmx lib/system.cmx ide/preferences.cmx \
-    lib/pp_control.cmx lib/options.cmx config/coq_config.cmx ide/ideutils.cmi 
-ide/preferences.cmo: lib/util.cmi lib/system.cmi lib/options.cmi \
-    ide/utils/configwin.cmi ide/config_lexer.cmo ide/preferences.cmi 
-ide/preferences.cmx: lib/util.cmx lib/system.cmx lib/options.cmx \
-    ide/utils/configwin.cmx ide/config_lexer.cmx ide/preferences.cmi 
+ide/ideutils.cmo: config/coq_config.cmi lib/options.cmi lib/pp_control.cmi \
+    ide/preferences.cmi lib/system.cmi ide/utf8_convert.cmo ide/ideutils.cmi 
+ide/ideutils.cmx: config/coq_config.cmx lib/options.cmx lib/pp_control.cmx \
+    ide/preferences.cmx lib/system.cmx ide/utf8_convert.cmx ide/ideutils.cmi 
+ide/preferences.cmo: ide/config_lexer.cmo ide/utils/configwin.cmi \
+    lib/options.cmi lib/system.cmi lib/util.cmi ide/preferences.cmi 
+ide/preferences.cmx: ide/config_lexer.cmx ide/utils/configwin.cmx \
+    lib/options.cmx lib/system.cmx lib/util.cmx ide/preferences.cmi 
 ide/undo.cmo: ide/ideutils.cmi ide/undo.cmi 
 ide/undo.cmx: ide/ideutils.cmx ide/undo.cmi 
-interp/constrextern.cmo: lib/util.cmi kernel/univ.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi interp/reserve.cmi \
-    pretyping/recordops.cmi pretyping/rawterm.cmi lib/pp.cmi \
-    pretyping/pattern.cmi lib/options.cmi interp/notation.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi kernel/inductive.cmi library/impargs.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    pretyping/detyping.cmi kernel/declarations.cmi pretyping/classops.cmi \
-    lib/bigint.cmi interp/constrextern.cmi 
-interp/constrextern.cmx: lib/util.cmx kernel/univ.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx interp/reserve.cmx \
-    pretyping/recordops.cmx pretyping/rawterm.cmx lib/pp.cmx \
-    pretyping/pattern.cmx lib/options.cmx interp/notation.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx kernel/inductive.cmx library/impargs.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    pretyping/detyping.cmx kernel/declarations.cmx pretyping/classops.cmx \
-    lib/bigint.cmx interp/constrextern.cmi 
-interp/constrintern.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi interp/syntax_def.cmi \
-    kernel/sign.cmi interp/reserve.cmi pretyping/recordops.cmi \
-    pretyping/rawterm.cmi pretyping/pretyping.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi pretyping/pattern.cmi \
-    lib/options.cmi interp/notation.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi library/lib.cmi \
-    parsing/lexer.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
-    library/impargs.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/declarations.cmi pretyping/cases.cmi \
-    lib/bigint.cmi interp/constrintern.cmi 
-interp/constrintern.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx interp/syntax_def.cmx \
-    kernel/sign.cmx interp/reserve.cmx pretyping/recordops.cmx \
-    pretyping/rawterm.cmx pretyping/pretyping.cmx \
-    pretyping/pretype_errors.cmx lib/pp.cmx pretyping/pattern.cmx \
-    lib/options.cmx interp/notation.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx library/lib.cmx \
-    parsing/lexer.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
-    library/impargs.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx pretyping/cases.cmx \
-    lib/bigint.cmx interp/constrintern.cmi 
-interp/coqlib.cmo: lib/util.cmi kernel/term.cmi lib/pp.cmi \
-    pretyping/pattern.cmi library/nametab.cmi kernel/names.cmi \
-    library/library.cmi library/libnames.cmi interp/coqlib.cmi 
-interp/coqlib.cmx: lib/util.cmx kernel/term.cmx lib/pp.cmx \
-    pretyping/pattern.cmx library/nametab.cmx kernel/names.cmx \
-    library/library.cmx library/libnames.cmx interp/coqlib.cmi 
-interp/genarg.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/evd.cmi interp/genarg.cmi 
-interp/genarg.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/evd.cmx interp/genarg.cmi 
-interp/modintern.cmo: lib/util.cmi interp/topconstr.cmi lib/pp.cmi \
-    library/nametab.cmi kernel/names.cmi kernel/modops.cmi \
-    library/libnames.cmi pretyping/evd.cmi kernel/entries.cmi \
-    interp/constrintern.cmi interp/modintern.cmi 
-interp/modintern.cmx: lib/util.cmx interp/topconstr.cmx lib/pp.cmx \
-    library/nametab.cmx kernel/names.cmx kernel/modops.cmx \
-    library/libnames.cmx pretyping/evd.cmx kernel/entries.cmx \
-    interp/constrintern.cmx interp/modintern.cmi 
-interp/notation.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    library/summary.cmi pretyping/reductionops.cmi pretyping/rawterm.cmi \
-    interp/ppextend.cmi lib/pp.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi lib/gmapl.cmi lib/gmap.cmi library/global.cmi \
-    pretyping/classops.cmi lib/bigint.cmi interp/notation.cmi 
-interp/notation.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
-    library/summary.cmx pretyping/reductionops.cmx pretyping/rawterm.cmx \
-    interp/ppextend.cmx lib/pp.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx lib/gmapl.cmx lib/gmap.cmx library/global.cmx \
-    pretyping/classops.cmx lib/bigint.cmx interp/notation.cmi 
-interp/ppextend.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi \
+interp/constrextern.cmo: lib/bigint.cmi pretyping/classops.cmi \
+    kernel/declarations.cmi pretyping/detyping.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi library/impargs.cmi \
+    kernel/inductive.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi interp/notation.cmi lib/options.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi interp/reserve.cmi kernel/sign.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi \
+    kernel/univ.cmi lib/util.cmi interp/constrextern.cmi 
+interp/constrextern.cmx: lib/bigint.cmx pretyping/classops.cmx \
+    kernel/declarations.cmx pretyping/detyping.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx library/impargs.cmx \
+    kernel/inductive.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx interp/notation.cmx lib/options.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    pretyping/recordops.cmx interp/reserve.cmx kernel/sign.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx \
+    kernel/univ.cmx lib/util.cmx interp/constrextern.cmi 
+interp/constrintern.cmo: lib/bigint.cmi pretyping/cases.cmi \
+    kernel/declarations.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi library/impargs.cmi kernel/inductive.cmi \
+    pretyping/inductiveops.cmi parsing/lexer.cmi library/lib.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi interp/notation.cmi lib/options.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
+    pretyping/pretyping.cmi pretyping/rawterm.cmi pretyping/recordops.cmi \
+    interp/reserve.cmi kernel/sign.cmi interp/syntax_def.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
+    interp/constrintern.cmi 
+interp/constrintern.cmx: lib/bigint.cmx pretyping/cases.cmx \
+    kernel/declarations.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/global.cmx library/impargs.cmx kernel/inductive.cmx \
+    pretyping/inductiveops.cmx parsing/lexer.cmx library/lib.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx interp/notation.cmx lib/options.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
+    pretyping/pretyping.cmx pretyping/rawterm.cmx pretyping/recordops.cmx \
+    interp/reserve.cmx kernel/sign.cmx interp/syntax_def.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx lib/util.cmx \
+    interp/constrintern.cmi 
+interp/coqlib.cmo: library/libnames.cmi library/library.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/pattern.cmi lib/pp.cmi kernel/term.cmi \
+    lib/util.cmi interp/coqlib.cmi 
+interp/coqlib.cmx: library/libnames.cmx library/library.cmx kernel/names.cmx \
+    library/nametab.cmx pretyping/pattern.cmx lib/pp.cmx kernel/term.cmx \
+    lib/util.cmx interp/coqlib.cmi 
+interp/genarg.cmo: pretyping/evd.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi interp/genarg.cmi 
+interp/genarg.cmx: pretyping/evd.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx pretyping/rawterm.cmx kernel/term.cmx \
+    interp/topconstr.cmx lib/util.cmx interp/genarg.cmi 
+interp/modintern.cmo: interp/constrintern.cmi kernel/entries.cmi \
+    pretyping/evd.cmi library/libnames.cmi kernel/modops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi interp/topconstr.cmi lib/util.cmi \
+    interp/modintern.cmi 
+interp/modintern.cmx: interp/constrintern.cmx kernel/entries.cmx \
+    pretyping/evd.cmx library/libnames.cmx kernel/modops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx interp/topconstr.cmx lib/util.cmx \
+    interp/modintern.cmi 
+interp/notation.cmo: lib/bigint.cmi pretyping/classops.cmi library/global.cmi \
+    lib/gmap.cmi lib/gmapl.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi kernel/names.cmi library/nametab.cmi \
+    lib/options.cmi lib/pp.cmi interp/ppextend.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi library/summary.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi interp/notation.cmi 
+interp/notation.cmx: lib/bigint.cmx pretyping/classops.cmx library/global.cmx \
+    lib/gmap.cmx lib/gmapl.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx kernel/names.cmx library/nametab.cmx \
+    lib/options.cmx lib/pp.cmx interp/ppextend.cmx pretyping/rawterm.cmx \
+    pretyping/reductionops.cmx library/summary.cmx kernel/term.cmx \
+    interp/topconstr.cmx lib/util.cmx interp/notation.cmi 
+interp/ppextend.cmo: kernel/names.cmi lib/pp.cmi lib/util.cmi \
     interp/ppextend.cmi 
-interp/ppextend.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx \
+interp/ppextend.cmx: kernel/names.cmx lib/pp.cmx lib/util.cmx \
     interp/ppextend.cmi 
-interp/reserve.cmo: lib/util.cmi library/summary.cmi pretyping/rawterm.cmi \
-    lib/pp.cmi kernel/names.cmi library/nameops.cmi library/libobject.cmi \
-    library/lib.cmi pretyping/evd.cmi interp/reserve.cmi 
-interp/reserve.cmx: lib/util.cmx library/summary.cmx pretyping/rawterm.cmx \
-    lib/pp.cmx kernel/names.cmx library/nameops.cmx library/libobject.cmx \
-    library/lib.cmx pretyping/evd.cmx interp/reserve.cmi 
-interp/syntax_def.cmo: lib/util.cmi interp/topconstr.cmi library/summary.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi interp/notation.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi library/libobject.cmi \
-    library/libnames.cmi library/lib.cmi interp/syntax_def.cmi 
-interp/syntax_def.cmx: lib/util.cmx interp/topconstr.cmx library/summary.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx interp/notation.cmx library/nametab.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 
-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 
-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 \
-    kernel/names.cmi kernel/declarations.cmi kernel/cemitcodes.cmi \
-    kernel/cbytecodes.cmi kernel/cbytegen.cmi 
-kernel/cbytegen.cmx: lib/util.cmx kernel/term.cmx kernel/pre_env.cmx \
-    kernel/names.cmx kernel/declarations.cmx kernel/cemitcodes.cmx \
-    kernel/cbytecodes.cmx kernel/cbytegen.cmi 
-kernel/cemitcodes.cmo: kernel/term.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    kernel/copcodes.cmo kernel/cbytecodes.cmi kernel/cemitcodes.cmi 
-kernel/cemitcodes.cmx: kernel/term.cmx kernel/names.cmx kernel/mod_subst.cmx \
-    kernel/copcodes.cmx kernel/cbytecodes.cmx kernel/cemitcodes.cmi 
-kernel/closure.cmo: lib/util.cmi kernel/term.cmi kernel/sign.cmi lib/pp.cmi \
-    kernel/names.cmi kernel/esubst.cmi kernel/environ.cmi \
-    kernel/declarations.cmi kernel/closure.cmi 
-kernel/closure.cmx: lib/util.cmx kernel/term.cmx kernel/sign.cmx lib/pp.cmx \
-    kernel/names.cmx kernel/esubst.cmx kernel/environ.cmx \
-    kernel/declarations.cmx kernel/closure.cmi 
+interp/reserve.cmo: pretyping/evd.cmi library/lib.cmi library/libobject.cmi \
+    library/nameops.cmi kernel/names.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    library/summary.cmi lib/util.cmi interp/reserve.cmi 
+interp/reserve.cmx: pretyping/evd.cmx library/lib.cmx library/libobject.cmx \
+    library/nameops.cmx kernel/names.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    library/summary.cmx lib/util.cmx interp/reserve.cmi 
+interp/syntax_def.cmo: library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi interp/notation.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    library/summary.cmi interp/topconstr.cmi lib/util.cmi \
+    interp/syntax_def.cmi 
+interp/syntax_def.cmx: library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx interp/notation.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    library/summary.cmx interp/topconstr.cmx lib/util.cmx \
+    interp/syntax_def.cmi 
+interp/topconstr.cmo: lib/bigint.cmi pretyping/detyping.cmi lib/dyn.cmi \
+    pretyping/evd.cmi library/libnames.cmi kernel/mod_subst.cmi \
+    library/nameops.cmi kernel/names.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    kernel/term.cmi lib/util.cmi interp/topconstr.cmi 
+interp/topconstr.cmx: lib/bigint.cmx pretyping/detyping.cmx lib/dyn.cmx \
+    pretyping/evd.cmx library/libnames.cmx kernel/mod_subst.cmx \
+    library/nameops.cmx kernel/names.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    kernel/term.cmx lib/util.cmx interp/topconstr.cmi 
+kernel/cbytecodes.cmo: kernel/names.cmi kernel/term.cmi kernel/cbytecodes.cmi 
+kernel/cbytecodes.cmx: kernel/names.cmx kernel/term.cmx kernel/cbytecodes.cmi 
+kernel/cbytegen.cmo: kernel/cbytecodes.cmi kernel/cemitcodes.cmi \
+    kernel/declarations.cmi kernel/names.cmi kernel/pre_env.cmi \
+    kernel/term.cmi lib/util.cmi kernel/cbytegen.cmi 
+kernel/cbytegen.cmx: kernel/cbytecodes.cmx kernel/cemitcodes.cmx \
+    kernel/declarations.cmx kernel/names.cmx kernel/pre_env.cmx \
+    kernel/term.cmx lib/util.cmx kernel/cbytegen.cmi 
+kernel/cemitcodes.cmo: kernel/cbytecodes.cmi kernel/copcodes.cmo \
+    kernel/mod_subst.cmi kernel/names.cmi kernel/term.cmi \
+    kernel/cemitcodes.cmi 
+kernel/cemitcodes.cmx: kernel/cbytecodes.cmx kernel/copcodes.cmx \
+    kernel/mod_subst.cmx kernel/names.cmx kernel/term.cmx \
+    kernel/cemitcodes.cmi 
+kernel/closure.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    kernel/esubst.cmi kernel/names.cmi lib/pp.cmi kernel/sign.cmi \
+    kernel/term.cmi lib/util.cmi kernel/closure.cmi 
+kernel/closure.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    kernel/esubst.cmx kernel/names.cmx lib/pp.cmx kernel/sign.cmx \
+    kernel/term.cmx lib/util.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/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 
-kernel/csymtable.cmx: kernel/vm.cmx kernel/term.cmx kernel/pre_env.cmx \
-    kernel/names.cmx kernel/declarations.cmx kernel/cemitcodes.cmx \
-    kernel/cbytegen.cmx kernel/cbytecodes.cmx kernel/csymtable.cmi 
-kernel/declarations.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi lib/rtree.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    kernel/cemitcodes.cmi kernel/cbytecodes.cmi kernel/declarations.cmi 
-kernel/declarations.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx lib/rtree.cmx kernel/names.cmx kernel/mod_subst.cmx \
-    kernel/cemitcodes.cmx kernel/cbytecodes.cmx kernel/declarations.cmi 
-kernel/entries.cmo: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/names.cmi kernel/entries.cmi 
-kernel/entries.cmx: kernel/univ.cmx kernel/term.cmx kernel/sign.cmx \
-    kernel/names.cmx kernel/entries.cmi 
-kernel/environ.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/pre_env.cmi kernel/names.cmi \
-    kernel/declarations.cmi kernel/csymtable.cmi kernel/cbytegen.cmi \
+kernel/cooking.cmo: kernel/cemitcodes.cmi kernel/declarations.cmi \
+    kernel/environ.cmi kernel/names.cmi lib/pp.cmi kernel/reduction.cmi \
+    kernel/sign.cmi kernel/term.cmi lib/util.cmi kernel/cooking.cmi 
+kernel/cooking.cmx: kernel/cemitcodes.cmx kernel/declarations.cmx \
+    kernel/environ.cmx kernel/names.cmx lib/pp.cmx kernel/reduction.cmx \
+    kernel/sign.cmx kernel/term.cmx lib/util.cmx kernel/cooking.cmi 
+kernel/csymtable.cmo: kernel/cbytecodes.cmi kernel/cbytegen.cmi \
+    kernel/cemitcodes.cmi kernel/declarations.cmi kernel/names.cmi \
+    kernel/pre_env.cmi kernel/term.cmi kernel/vm.cmi kernel/csymtable.cmi 
+kernel/csymtable.cmx: kernel/cbytecodes.cmx kernel/cbytegen.cmx \
+    kernel/cemitcodes.cmx kernel/declarations.cmx kernel/names.cmx \
+    kernel/pre_env.cmx kernel/term.cmx kernel/vm.cmx kernel/csymtable.cmi 
+kernel/declarations.cmo: kernel/cbytecodes.cmi kernel/cemitcodes.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi lib/rtree.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/univ.cmi lib/util.cmi kernel/declarations.cmi 
+kernel/declarations.cmx: kernel/cbytecodes.cmx kernel/cemitcodes.cmx \
+    kernel/mod_subst.cmx kernel/names.cmx lib/rtree.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/univ.cmx lib/util.cmx kernel/declarations.cmi 
+kernel/entries.cmo: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi kernel/entries.cmi 
+kernel/entries.cmx: kernel/names.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/univ.cmx kernel/entries.cmi 
+kernel/environ.cmo: kernel/cbytegen.cmi kernel/csymtable.cmi \
+    kernel/declarations.cmi kernel/names.cmi kernel/pre_env.cmi \
+    kernel/sign.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi \
     kernel/environ.cmi 
-kernel/environ.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/pre_env.cmx kernel/names.cmx \
-    kernel/declarations.cmx kernel/csymtable.cmx kernel/cbytegen.cmx \
+kernel/environ.cmx: kernel/cbytegen.cmx kernel/csymtable.cmx \
+    kernel/declarations.cmx kernel/names.cmx kernel/pre_env.cmx \
+    kernel/sign.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
     kernel/environ.cmi 
 kernel/esubst.cmo: lib/util.cmi kernel/esubst.cmi 
 kernel/esubst.cmx: lib/util.cmx kernel/esubst.cmi 
-kernel/indtypes.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/term.cmi kernel/sign.cmi lib/rtree.cmi kernel/reduction.cmi \
-    kernel/names.cmi kernel/inductive.cmi kernel/environ.cmi \
-    kernel/entries.cmi kernel/declarations.cmi kernel/indtypes.cmi 
-kernel/indtypes.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/term.cmx kernel/sign.cmx lib/rtree.cmx kernel/reduction.cmx \
-    kernel/names.cmx kernel/inductive.cmx kernel/environ.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/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/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 \
+kernel/indtypes.cmo: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi kernel/inductive.cmi kernel/names.cmi \
+    kernel/reduction.cmi lib/rtree.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/typeops.cmi kernel/univ.cmi lib/util.cmi kernel/indtypes.cmi 
+kernel/indtypes.cmx: kernel/declarations.cmx kernel/entries.cmx \
+    kernel/environ.cmx kernel/inductive.cmx kernel/names.cmx \
+    kernel/reduction.cmx lib/rtree.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/typeops.cmx kernel/univ.cmx lib/util.cmx kernel/indtypes.cmi 
+kernel/inductive.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    kernel/names.cmi kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi kernel/univ.cmi lib/util.cmi kernel/inductive.cmi 
+kernel/inductive.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    kernel/names.cmx kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/type_errors.cmx kernel/univ.cmx lib/util.cmx kernel/inductive.cmi 
+kernel/modops.cmo: kernel/cemitcodes.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/environ.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi lib/pp.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi \
     kernel/modops.cmi 
-kernel/modops.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx lib/pp.cmx \
-    kernel/names.cmx kernel/mod_subst.cmx kernel/environ.cmx \
-    kernel/entries.cmx kernel/declarations.cmx kernel/cemitcodes.cmx \
+kernel/modops.cmx: kernel/cemitcodes.cmx kernel/declarations.cmx \
+    kernel/entries.cmx kernel/environ.cmx kernel/mod_subst.cmx \
+    kernel/names.cmx lib/pp.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
     kernel/modops.cmi 
-kernel/mod_subst.cmo: lib/util.cmi kernel/term.cmi lib/pp.cmi \
-    kernel/names.cmi kernel/mod_subst.cmi 
-kernel/mod_subst.cmx: lib/util.cmx kernel/term.cmx lib/pp.cmx \
-    kernel/names.cmx kernel/mod_subst.cmi 
-kernel/mod_typing.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/term_typing.cmi kernel/subtyping.cmi kernel/reduction.cmi \
-    kernel/names.cmi kernel/modops.cmi kernel/mod_subst.cmi \
-    kernel/environ.cmi kernel/entries.cmi kernel/declarations.cmi \
-    kernel/cemitcodes.cmi kernel/mod_typing.cmi 
-kernel/mod_typing.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/term_typing.cmx kernel/subtyping.cmx kernel/reduction.cmx \
-    kernel/names.cmx kernel/modops.cmx kernel/mod_subst.cmx \
-    kernel/environ.cmx kernel/entries.cmx kernel/declarations.cmx \
-    kernel/cemitcodes.cmx kernel/mod_typing.cmi 
-kernel/names.cmo: lib/util.cmi lib/predicate.cmi lib/pp.cmi lib/hashcons.cmi \
+kernel/mod_subst.cmo: kernel/names.cmi lib/pp.cmi kernel/term.cmi \
+    lib/util.cmi kernel/mod_subst.cmi 
+kernel/mod_subst.cmx: kernel/names.cmx lib/pp.cmx kernel/term.cmx \
+    lib/util.cmx kernel/mod_subst.cmi 
+kernel/mod_typing.cmo: kernel/cemitcodes.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/environ.cmi kernel/mod_subst.cmi \
+    kernel/modops.cmi kernel/names.cmi kernel/reduction.cmi \
+    kernel/subtyping.cmi kernel/term_typing.cmi kernel/typeops.cmi \
+    kernel/univ.cmi lib/util.cmi kernel/mod_typing.cmi 
+kernel/mod_typing.cmx: kernel/cemitcodes.cmx kernel/declarations.cmx \
+    kernel/entries.cmx kernel/environ.cmx kernel/mod_subst.cmx \
+    kernel/modops.cmx kernel/names.cmx kernel/reduction.cmx \
+    kernel/subtyping.cmx kernel/term_typing.cmx kernel/typeops.cmx \
+    kernel/univ.cmx lib/util.cmx kernel/mod_typing.cmi 
+kernel/names.cmo: lib/hashcons.cmi lib/pp.cmi lib/predicate.cmi lib/util.cmi \
     kernel/names.cmi 
-kernel/names.cmx: lib/util.cmx lib/predicate.cmx lib/pp.cmx lib/hashcons.cmx \
+kernel/names.cmx: lib/hashcons.cmx lib/pp.cmx lib/predicate.cmx lib/util.cmx \
     kernel/names.cmi 
-kernel/pre_env.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/names.cmi kernel/declarations.cmi \
-    kernel/pre_env.cmi 
-kernel/pre_env.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/names.cmx kernel/declarations.cmx \
-    kernel/pre_env.cmi 
-kernel/reduction.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/names.cmi kernel/esubst.cmi kernel/environ.cmi \
-    kernel/declarations.cmi kernel/conv_oracle.cmi kernel/closure.cmi \
-    kernel/reduction.cmi 
-kernel/reduction.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/names.cmx kernel/esubst.cmx kernel/environ.cmx \
-    kernel/declarations.cmx kernel/conv_oracle.cmx kernel/closure.cmx \
-    kernel/reduction.cmi 
-kernel/safe_typing.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/type_errors.cmi kernel/term_typing.cmi kernel/term.cmi \
-    kernel/subtyping.cmi kernel/sign.cmi kernel/reduction.cmi \
-    kernel/names.cmi kernel/modops.cmi kernel/mod_typing.cmi \
-    kernel/inductive.cmi kernel/indtypes.cmi kernel/environ.cmi \
-    kernel/entries.cmi kernel/declarations.cmi kernel/cooking.cmi \
+kernel/pre_env.cmo: kernel/declarations.cmi kernel/names.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/univ.cmi lib/util.cmi kernel/pre_env.cmi 
+kernel/pre_env.cmx: kernel/declarations.cmx kernel/names.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/univ.cmx lib/util.cmx kernel/pre_env.cmi 
+kernel/reduction.cmo: kernel/closure.cmi kernel/conv_oracle.cmi \
+    kernel/declarations.cmi kernel/environ.cmi kernel/esubst.cmi \
+    kernel/names.cmi kernel/sign.cmi kernel/term.cmi kernel/univ.cmi \
+    lib/util.cmi kernel/reduction.cmi 
+kernel/reduction.cmx: kernel/closure.cmx kernel/conv_oracle.cmx \
+    kernel/declarations.cmx kernel/environ.cmx kernel/esubst.cmx \
+    kernel/names.cmx kernel/sign.cmx kernel/term.cmx kernel/univ.cmx \
+    lib/util.cmx kernel/reduction.cmi 
+kernel/safe_typing.cmo: kernel/cooking.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/environ.cmi kernel/indtypes.cmi \
+    kernel/inductive.cmi kernel/mod_typing.cmi kernel/modops.cmi \
+    kernel/names.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/subtyping.cmi kernel/term.cmi kernel/term_typing.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi kernel/univ.cmi lib/util.cmi \
     kernel/safe_typing.cmi 
-kernel/safe_typing.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/type_errors.cmx kernel/term_typing.cmx kernel/term.cmx \
-    kernel/subtyping.cmx kernel/sign.cmx kernel/reduction.cmx \
-    kernel/names.cmx kernel/modops.cmx kernel/mod_typing.cmx \
-    kernel/inductive.cmx kernel/indtypes.cmx kernel/environ.cmx \
-    kernel/entries.cmx kernel/declarations.cmx kernel/cooking.cmx \
+kernel/safe_typing.cmx: kernel/cooking.cmx kernel/declarations.cmx \
+    kernel/entries.cmx kernel/environ.cmx kernel/indtypes.cmx \
+    kernel/inductive.cmx kernel/mod_typing.cmx kernel/modops.cmx \
+    kernel/names.cmx kernel/reduction.cmx kernel/sign.cmx \
+    kernel/subtyping.cmx kernel/term.cmx kernel/term_typing.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx kernel/univ.cmx lib/util.cmx \
     kernel/safe_typing.cmi 
-kernel/sign.cmo: lib/util.cmi kernel/term.cmi kernel/names.cmi \
+kernel/sign.cmo: kernel/names.cmi kernel/term.cmi lib/util.cmi \
     kernel/sign.cmi 
-kernel/sign.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
+kernel/sign.cmx: kernel/names.cmx kernel/term.cmx lib/util.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/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/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 \
-    lib/hashcons.cmi kernel/esubst.cmi kernel/term.cmi 
-kernel/term.cmx: lib/util.cmx kernel/univ.cmx lib/pp.cmx kernel/names.cmx \
-    lib/hashcons.cmx kernel/esubst.cmx kernel/term.cmi 
-kernel/term_typing.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/type_errors.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/reduction.cmi kernel/names.cmi kernel/inductive.cmi \
-    kernel/indtypes.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi kernel/cooking.cmi kernel/cemitcodes.cmi \
+kernel/subtyping.cmo: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi kernel/inductive.cmi kernel/mod_subst.cmi \
+    kernel/modops.cmi kernel/names.cmi kernel/reduction.cmi kernel/term.cmi \
+    kernel/univ.cmi lib/util.cmi kernel/subtyping.cmi 
+kernel/subtyping.cmx: kernel/declarations.cmx kernel/entries.cmx \
+    kernel/environ.cmx kernel/inductive.cmx kernel/mod_subst.cmx \
+    kernel/modops.cmx kernel/names.cmx kernel/reduction.cmx kernel/term.cmx \
+    kernel/univ.cmx lib/util.cmx kernel/subtyping.cmi 
+kernel/term.cmo: kernel/esubst.cmi lib/hashcons.cmi kernel/names.cmi \
+    lib/pp.cmi kernel/univ.cmi lib/util.cmi kernel/term.cmi 
+kernel/term.cmx: kernel/esubst.cmx lib/hashcons.cmx kernel/names.cmx \
+    lib/pp.cmx kernel/univ.cmx lib/util.cmx kernel/term.cmi 
+kernel/term_typing.cmo: kernel/cemitcodes.cmi kernel/cooking.cmi \
+    kernel/declarations.cmi kernel/entries.cmi kernel/environ.cmi \
+    kernel/indtypes.cmi kernel/inductive.cmi kernel/names.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi kernel/univ.cmi lib/util.cmi \
     kernel/term_typing.cmi 
-kernel/term_typing.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/type_errors.cmx kernel/term.cmx kernel/sign.cmx \
-    kernel/reduction.cmx kernel/names.cmx kernel/inductive.cmx \
-    kernel/indtypes.cmx kernel/environ.cmx kernel/entries.cmx \
-    kernel/declarations.cmx kernel/cooking.cmx kernel/cemitcodes.cmx \
+kernel/term_typing.cmx: kernel/cemitcodes.cmx kernel/cooking.cmx \
+    kernel/declarations.cmx kernel/entries.cmx kernel/environ.cmx \
+    kernel/indtypes.cmx kernel/inductive.cmx kernel/names.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx kernel/univ.cmx lib/util.cmx \
     kernel/term_typing.cmi 
-kernel/type_errors.cmo: kernel/term.cmi kernel/sign.cmi kernel/reduction.cmi \
-    kernel/names.cmi kernel/environ.cmi kernel/type_errors.cmi 
-kernel/type_errors.cmx: kernel/term.cmx kernel/sign.cmx kernel/reduction.cmx \
-    kernel/names.cmx kernel/environ.cmx kernel/type_errors.cmi 
-kernel/typeops.cmo: lib/util.cmi kernel/univ.cmi kernel/type_errors.cmi \
-    kernel/term.cmi kernel/sign.cmi kernel/reduction.cmi kernel/names.cmi \
-    kernel/inductive.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi kernel/typeops.cmi 
-kernel/typeops.cmx: lib/util.cmx kernel/univ.cmx kernel/type_errors.cmx \
-    kernel/term.cmx kernel/sign.cmx kernel/reduction.cmx kernel/names.cmx \
-    kernel/inductive.cmx kernel/environ.cmx kernel/entries.cmx \
-    kernel/declarations.cmx kernel/typeops.cmi 
-kernel/univ.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi lib/hashcons.cmi \
+kernel/type_errors.cmo: kernel/environ.cmi kernel/names.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi 
+kernel/type_errors.cmx: kernel/environ.cmx kernel/names.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/type_errors.cmi 
+kernel/typeops.cmo: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi kernel/inductive.cmi kernel/names.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi kernel/univ.cmi lib/util.cmi kernel/typeops.cmi 
+kernel/typeops.cmx: kernel/declarations.cmx kernel/entries.cmx \
+    kernel/environ.cmx kernel/inductive.cmx kernel/names.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/type_errors.cmx kernel/univ.cmx lib/util.cmx kernel/typeops.cmi 
+kernel/univ.cmo: lib/hashcons.cmi kernel/names.cmi lib/pp.cmi lib/util.cmi \
     kernel/univ.cmi 
-kernel/univ.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx lib/hashcons.cmx \
+kernel/univ.cmx: lib/hashcons.cmx kernel/names.cmx lib/pp.cmx lib/util.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/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 \
-    kernel/conv_oracle.cmx kernel/cbytecodes.cmx kernel/vm.cmi 
+kernel/vconv.cmo: kernel/closure.cmi kernel/conv_oracle.cmi \
+    kernel/csymtable.cmi kernel/declarations.cmi kernel/environ.cmi \
+    kernel/inductive.cmi kernel/names.cmi kernel/reduction.cmi \
+    kernel/term.cmi kernel/univ.cmi lib/util.cmi kernel/vm.cmi \
+    kernel/vconv.cmi 
+kernel/vconv.cmx: kernel/closure.cmx kernel/conv_oracle.cmx \
+    kernel/csymtable.cmx kernel/declarations.cmx kernel/environ.cmx \
+    kernel/inductive.cmx kernel/names.cmx kernel/reduction.cmx \
+    kernel/term.cmx kernel/univ.cmx lib/util.cmx kernel/vm.cmx \
+    kernel/vconv.cmi 
+kernel/vm.cmo: kernel/cbytecodes.cmi kernel/conv_oracle.cmi kernel/names.cmi \
+    kernel/term.cmi lib/util.cmi kernel/vm.cmi 
+kernel/vm.cmx: kernel/cbytecodes.cmx kernel/conv_oracle.cmx kernel/names.cmx \
+    kernel/term.cmx lib/util.cmx kernel/vm.cmi 
 lib/bigint.cmo: lib/pp.cmi lib/bigint.cmi 
 lib/bigint.cmx: lib/pp.cmx lib/bigint.cmi 
 lib/bstack.cmo: lib/util.cmi lib/bstack.cmi 
 lib/bstack.cmx: lib/util.cmx lib/bstack.cmi 
 lib/dyn.cmo: lib/util.cmi lib/dyn.cmi 
 lib/dyn.cmx: lib/util.cmx lib/dyn.cmi 
-lib/edit.cmo: lib/util.cmi lib/pp.cmi lib/bstack.cmi lib/edit.cmi 
-lib/edit.cmx: lib/util.cmx lib/pp.cmx lib/bstack.cmx lib/edit.cmi 
+lib/edit.cmo: lib/bstack.cmi lib/pp.cmi lib/util.cmi lib/edit.cmi 
+lib/edit.cmx: lib/bstack.cmx lib/pp.cmx lib/util.cmx lib/edit.cmi 
 lib/explore.cmo: lib/explore.cmi 
 lib/explore.cmx: lib/explore.cmi 
-lib/gmapl.cmo: lib/util.cmi lib/gmap.cmi lib/gmapl.cmi 
-lib/gmapl.cmx: lib/util.cmx lib/gmap.cmx lib/gmapl.cmi 
+lib/gmapl.cmo: lib/gmap.cmi lib/util.cmi lib/gmapl.cmi 
+lib/gmapl.cmx: lib/gmap.cmx lib/util.cmx lib/gmapl.cmi 
 lib/gmap.cmo: lib/gmap.cmi 
 lib/gmap.cmx: lib/gmap.cmi 
 lib/gset.cmo: lib/gset.cmi 
@@ -863,2203 +886,2199 @@ lib/predicate.cmo: lib/predicate.cmi
 lib/predicate.cmx: lib/predicate.cmi 
 lib/profile.cmo: lib/profile.cmi 
 lib/profile.cmx: lib/profile.cmi 
-library/declare.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/type_errors.cmi kernel/term.cmi library/summary.cmi \
-    kernel/sign.cmi kernel/safe_typing.cmi kernel/reduction.cmi lib/pp.cmi \
-    lib/options.cmi interp/notation.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi kernel/inductive.cmi kernel/indtypes.cmi \
-    library/impargs.cmi library/global.cmi kernel/environ.cmi \
-    kernel/entries.cmi library/dischargedhypsmap.cmi toplevel/discharge.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo kernel/cooking.cmi \
-    library/declare.cmi 
-library/declare.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/type_errors.cmx kernel/term.cmx library/summary.cmx \
-    kernel/sign.cmx kernel/safe_typing.cmx kernel/reduction.cmx lib/pp.cmx \
-    lib/options.cmx interp/notation.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx kernel/inductive.cmx kernel/indtypes.cmx \
-    library/impargs.cmx library/global.cmx kernel/environ.cmx \
-    kernel/entries.cmx library/dischargedhypsmap.cmx toplevel/discharge.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx kernel/cooking.cmx \
-    library/declare.cmi 
-library/declaremods.cmo: lib/util.cmi library/summary.cmi \
-    kernel/subtyping.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    kernel/modops.cmi kernel/mod_typing.cmi kernel/mod_subst.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    library/global.cmi kernel/environ.cmi kernel/entries.cmi \
-    kernel/declarations.cmi library/declaremods.cmi 
-library/declaremods.cmx: lib/util.cmx library/summary.cmx \
-    kernel/subtyping.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    kernel/modops.cmx kernel/mod_typing.cmx kernel/mod_subst.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    library/global.cmx kernel/environ.cmx kernel/entries.cmx \
-    kernel/declarations.cmx library/declaremods.cmi 
+library/declare.cmo: kernel/cooking.cmi library/decl_kinds.cmo \
+    kernel/declarations.cmi toplevel/discharge.cmi \
+    library/dischargedhypsmap.cmi kernel/entries.cmi kernel/environ.cmi \
+    library/global.cmi library/impargs.cmi kernel/indtypes.cmi \
+    kernel/inductive.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi interp/notation.cmi lib/options.cmi lib/pp.cmi \
+    kernel/reduction.cmi kernel/safe_typing.cmi kernel/sign.cmi \
+    library/summary.cmi kernel/term.cmi kernel/type_errors.cmi \
+    kernel/typeops.cmi kernel/univ.cmi lib/util.cmi library/declare.cmi 
+library/declare.cmx: kernel/cooking.cmx library/decl_kinds.cmx \
+    kernel/declarations.cmx toplevel/discharge.cmx \
+    library/dischargedhypsmap.cmx kernel/entries.cmx kernel/environ.cmx \
+    library/global.cmx library/impargs.cmx kernel/indtypes.cmx \
+    kernel/inductive.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx interp/notation.cmx lib/options.cmx lib/pp.cmx \
+    kernel/reduction.cmx kernel/safe_typing.cmx kernel/sign.cmx \
+    library/summary.cmx kernel/term.cmx kernel/type_errors.cmx \
+    kernel/typeops.cmx kernel/univ.cmx lib/util.cmx library/declare.cmi 
+library/declaremods.cmo: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi library/global.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi kernel/mod_subst.cmi \
+    kernel/mod_typing.cmi kernel/modops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi kernel/subtyping.cmi library/summary.cmi \
+    lib/util.cmi library/declaremods.cmi 
+library/declaremods.cmx: kernel/declarations.cmx kernel/entries.cmx \
+    kernel/environ.cmx library/global.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx kernel/mod_subst.cmx \
+    kernel/mod_typing.cmx kernel/modops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx kernel/subtyping.cmx library/summary.cmx \
+    lib/util.cmx library/declaremods.cmi 
 library/decl_kinds.cmo: lib/util.cmi 
 library/decl_kinds.cmx: lib/util.cmx 
-library/dischargedhypsmap.cmo: lib/util.cmi kernel/term.cmi \
-    library/summary.cmi kernel/reduction.cmi library/nametab.cmi \
-    kernel/names.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi kernel/inductive.cmi kernel/environ.cmi \
-    kernel/declarations.cmi library/dischargedhypsmap.cmi 
-library/dischargedhypsmap.cmx: lib/util.cmx kernel/term.cmx \
-    library/summary.cmx kernel/reduction.cmx library/nametab.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/dischargedhypsmap.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    kernel/inductive.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi kernel/names.cmi library/nametab.cmi \
+    kernel/reduction.cmi library/summary.cmi kernel/term.cmi lib/util.cmi \
+    library/dischargedhypsmap.cmi 
+library/dischargedhypsmap.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    kernel/inductive.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx kernel/names.cmx library/nametab.cmx \
+    kernel/reduction.cmx library/summary.cmx kernel/term.cmx lib/util.cmx \
+    library/dischargedhypsmap.cmi 
+library/global.cmo: kernel/environ.cmi kernel/inductive.cmi \
+    library/libnames.cmi kernel/names.cmi kernel/safe_typing.cmi \
+    kernel/sign.cmi library/summary.cmi kernel/term.cmi lib/util.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.cmx: kernel/environ.cmx kernel/inductive.cmx \
+    library/libnames.cmx kernel/names.cmx kernel/safe_typing.cmx \
+    kernel/sign.cmx library/summary.cmx kernel/term.cmx lib/util.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 \
-    library/goptions.cmi 
-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/goptions.cmo: library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi kernel/mod_subst.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi library/summary.cmi kernel/term.cmi \
+    lib/util.cmi library/goptions.cmi 
+library/goptions.cmx: library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx kernel/mod_subst.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx library/summary.cmx kernel/term.cmx \
+    lib/util.cmx library/goptions.cmi 
+library/impargs.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    library/global.cmi kernel/inductive.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi kernel/reduction.cmi library/summary.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi lib/util.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.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    library/global.cmx kernel/inductive.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx kernel/reduction.cmx library/summary.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx lib/util.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 \
-    library/libnames.cmi kernel/cooking.cmi library/lib.cmi 
-library/lib.cmx: lib/util.cmx kernel/term.cmx library/summary.cmx \
-    kernel/sign.cmx lib/pp.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libobject.cmx \
-    library/libnames.cmx kernel/cooking.cmx library/lib.cmi 
-library/libnames.cmo: lib/util.cmi kernel/term.cmi lib/predicate.cmi \
-    lib/pp.cmi kernel/names.cmi library/nameops.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi 
-library/libnames.cmx: lib/util.cmx kernel/term.cmx lib/predicate.cmx \
-    lib/pp.cmx kernel/names.cmx library/nameops.cmx kernel/mod_subst.cmx \
-    library/libnames.cmi 
-library/libobject.cmo: lib/util.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi lib/dyn.cmi library/libobject.cmi 
-library/libobject.cmx: lib/util.cmx kernel/names.cmx kernel/mod_subst.cmx \
-    library/libnames.cmx lib/dyn.cmx library/libobject.cmi 
-library/library.cmo: lib/util.cmi lib/system.cmi library/summary.cmi \
-    kernel/safe_typing.cmi lib/pp.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi library/libobject.cmi \
-    library/libnames.cmi library/lib.cmi library/declaremods.cmi \
+library/lib.cmo: kernel/cooking.cmi library/libnames.cmi \
+    library/libobject.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi lib/pp.cmi kernel/sign.cmi \
+    library/summary.cmi kernel/term.cmi lib/util.cmi library/lib.cmi 
+library/lib.cmx: kernel/cooking.cmx library/libnames.cmx \
+    library/libobject.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx lib/pp.cmx kernel/sign.cmx \
+    library/summary.cmx kernel/term.cmx lib/util.cmx library/lib.cmi 
+library/libnames.cmo: kernel/mod_subst.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi lib/predicate.cmi kernel/term.cmi \
+    lib/util.cmi library/libnames.cmi 
+library/libnames.cmx: kernel/mod_subst.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx lib/predicate.cmx kernel/term.cmx \
+    lib/util.cmx library/libnames.cmi 
+library/libobject.cmo: lib/dyn.cmi library/libnames.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi lib/util.cmi library/libobject.cmi 
+library/libobject.cmx: lib/dyn.cmx library/libnames.cmx kernel/mod_subst.cmx \
+    kernel/names.cmx lib/util.cmx library/libobject.cmi 
+library/library.cmo: library/declaremods.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi lib/pp.cmi \
+    kernel/safe_typing.cmi library/summary.cmi lib/system.cmi lib/util.cmi \
     library/library.cmi 
-library/library.cmx: lib/util.cmx lib/system.cmx library/summary.cmx \
-    kernel/safe_typing.cmx lib/pp.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libobject.cmx \
-    library/libnames.cmx library/lib.cmx library/declaremods.cmx \
+library/library.cmx: library/declaremods.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
+    kernel/safe_typing.cmx library/summary.cmx lib/system.cmx lib/util.cmx \
     library/library.cmi 
-library/nameops.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi \
+library/nameops.cmo: kernel/names.cmi lib/pp.cmi lib/util.cmi \
     library/nameops.cmi 
-library/nameops.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx \
+library/nameops.cmx: kernel/names.cmx lib/pp.cmx lib/util.cmx \
     library/nameops.cmi 
-library/nametab.cmo: lib/util.cmi library/summary.cmi lib/pp.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    kernel/declarations.cmi library/nametab.cmi 
-library/nametab.cmx: lib/util.cmx library/summary.cmx lib/pp.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    kernel/declarations.cmx library/nametab.cmi 
-library/states.cmo: lib/system.cmi library/summary.cmi library/library.cmi \
-    library/lib.cmi library/states.cmi 
-library/states.cmx: lib/system.cmx library/summary.cmx library/library.cmx \
-    library/lib.cmx library/states.cmi 
-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 
+library/nametab.cmo: kernel/declarations.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi lib/pp.cmi library/summary.cmi \
+    lib/util.cmi library/nametab.cmi 
+library/nametab.cmx: kernel/declarations.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx lib/pp.cmx library/summary.cmx \
+    lib/util.cmx library/nametab.cmi 
+library/states.cmo: library/lib.cmi library/library.cmi library/summary.cmi \
+    lib/system.cmi library/states.cmi 
+library/states.cmx: library/lib.cmx library/library.cmx library/summary.cmx \
+    lib/system.cmx library/states.cmi 
+library/summary.cmo: lib/dyn.cmi lib/pp.cmi lib/util.cmi library/summary.cmi 
+library/summary.cmx: lib/dyn.cmx lib/pp.cmx lib/util.cmx library/summary.cmi 
+lib/rtree.cmo: lib/pp.cmi lib/util.cmi lib/rtree.cmi 
+lib/rtree.cmx: lib/pp.cmx lib/util.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 
-lib/tlm.cmx: lib/gset.cmx lib/gmap.cmx lib/tlm.cmi 
-lib/util.cmo: lib/pp.cmi lib/compat.cmo lib/util.cmi 
-lib/util.cmx: lib/pp.cmx lib/compat.cmx lib/util.cmi 
-parsing/argextend.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    parsing/q_util.cmi parsing/q_coqast.cmo parsing/pcoq.cmi \
-    interp/genarg.cmi 
-parsing/argextend.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    parsing/q_util.cmx parsing/q_coqast.cmx parsing/pcoq.cmx \
-    interp/genarg.cmx 
-parsing/egrammar.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo library/summary.cmi lib/pp.cmi \
-    parsing/pcoq.cmi interp/notation.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi parsing/lexer.cmi interp/genarg.cmi \
-    parsing/extend.cmi lib/bigint.cmi parsing/egrammar.cmi 
-parsing/egrammar.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx proofs/tacexpr.cmx library/summary.cmx lib/pp.cmx \
-    parsing/pcoq.cmx interp/notation.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx parsing/lexer.cmx interp/genarg.cmx \
-    parsing/extend.cmx lib/bigint.cmx parsing/egrammar.cmi 
-parsing/extend.cmo: lib/util.cmi interp/topconstr.cmi interp/ppextend.cmi \
-    lib/pp.cmi kernel/names.cmi interp/genarg.cmi parsing/extend.cmi 
-parsing/extend.cmx: lib/util.cmx interp/topconstr.cmx interp/ppextend.cmx \
-    lib/pp.cmx kernel/names.cmx interp/genarg.cmx parsing/extend.cmi 
-parsing/g_ascii_syntax.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi interp/notation.cmi \
-    kernel/names.cmi library/libnames.cmi interp/coqlib.cmi lib/bigint.cmi 
-parsing/g_ascii_syntax.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx interp/notation.cmx \
-    kernel/names.cmx library/libnames.cmx interp/coqlib.cmx lib/bigint.cmx 
-parsing/g_constr.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi \
-    library/libnames.cmi parsing/lexer.cmi lib/bigint.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_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 interp/genarg.cmi 
-parsing/g_ltac.cmx: toplevel/vernacexpr.cmx lib/util.cmx interp/topconstr.cmx \
-    proofs/tacexpr.cmx pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx \
-    kernel/names.cmx interp/genarg.cmx 
-parsing/g_minicoq.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    lib/pp.cmi kernel/names.cmi parsing/lexer.cmi kernel/environ.cmi \
+lib/system.cmo: config/coq_config.cmi lib/pp.cmi lib/util.cmi lib/system.cmi 
+lib/system.cmx: config/coq_config.cmx lib/pp.cmx lib/util.cmx lib/system.cmi 
+lib/tlm.cmo: lib/gmap.cmi lib/gset.cmi lib/tlm.cmi 
+lib/tlm.cmx: lib/gmap.cmx lib/gset.cmx lib/tlm.cmi 
+lib/util.cmo: lib/compat.cmo lib/pp.cmi lib/util.cmi 
+lib/util.cmx: lib/compat.cmx lib/pp.cmx lib/util.cmi 
+parsing/argextend.cmo: interp/genarg.cmi parsing/pcoq.cmi \
+    parsing/q_coqast.cmo parsing/q_util.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/argextend.cmx: interp/genarg.cmx parsing/pcoq.cmx \
+    parsing/q_coqast.cmx parsing/q_util.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx 
+parsing/egrammar.cmo: lib/bigint.cmi parsing/extend.cmi interp/genarg.cmi \
+    parsing/lexer.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi interp/notation.cmi parsing/pcoq.cmi lib/pp.cmi \
+    library/summary.cmi proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo parsing/egrammar.cmi 
+parsing/egrammar.cmx: lib/bigint.cmx parsing/extend.cmx interp/genarg.cmx \
+    parsing/lexer.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx interp/notation.cmx parsing/pcoq.cmx lib/pp.cmx \
+    library/summary.cmx proofs/tacexpr.cmx interp/topconstr.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx parsing/egrammar.cmi 
+parsing/extend.cmo: interp/genarg.cmi kernel/names.cmi lib/pp.cmi \
+    interp/ppextend.cmi interp/topconstr.cmi lib/util.cmi parsing/extend.cmi 
+parsing/extend.cmx: interp/genarg.cmx kernel/names.cmx lib/pp.cmx \
+    interp/ppextend.cmx interp/topconstr.cmx lib/util.cmx parsing/extend.cmi 
+parsing/g_ascii_syntax.cmo: lib/bigint.cmi interp/coqlib.cmi \
+    library/libnames.cmi kernel/names.cmi interp/notation.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi interp/topconstr.cmi \
+    lib/util.cmi 
+parsing/g_ascii_syntax.cmx: lib/bigint.cmx interp/coqlib.cmx \
+    library/libnames.cmx kernel/names.cmx interp/notation.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx interp/topconstr.cmx \
+    lib/util.cmx 
+parsing/g_constr.cmo: lib/bigint.cmi parsing/lexer.cmi library/libnames.cmi \
+    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+parsing/g_constr.cmx: lib/bigint.cmx parsing/lexer.cmx library/libnames.cmx \
+    kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    kernel/term.cmx interp/topconstr.cmx lib/util.cmx 
+parsing/g_ltac.cmo: interp/genarg.cmi kernel/names.cmi parsing/pcoq.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/g_ltac.cmx: interp/genarg.cmx kernel/names.cmx parsing/pcoq.cmx \
+    lib/pp.cmx pretyping/rawterm.cmx proofs/tacexpr.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_minicoq.cmo: kernel/environ.cmi parsing/lexer.cmi kernel/names.cmi \
+    lib/pp.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi \
     parsing/g_minicoq.cmi 
-parsing/g_minicoq.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    lib/pp.cmx kernel/names.cmx parsing/lexer.cmx kernel/environ.cmx \
+parsing/g_minicoq.cmx: kernel/environ.cmx parsing/lexer.cmx kernel/names.cmx \
+    lib/pp.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
     parsing/g_minicoq.cmi 
-parsing/g_natsyntax.cmo: lib/util.cmi pretyping/rawterm.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.cmi interp/notation.cmi kernel/names.cmi \
-    library/libnames.cmi interp/coqlib.cmi lib/bigint.cmi \
+parsing/g_natsyntax.cmo: lib/bigint.cmi interp/coqlib.cmi \
+    library/libnames.cmi kernel/names.cmi interp/notation.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi lib/util.cmi \
     parsing/g_natsyntax.cmi 
-parsing/g_natsyntax.cmx: lib/util.cmx pretyping/rawterm.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.cmx interp/notation.cmx kernel/names.cmx \
-    library/libnames.cmx interp/coqlib.cmx lib/bigint.cmx \
+parsing/g_natsyntax.cmx: lib/bigint.cmx interp/coqlib.cmx \
+    library/libnames.cmx kernel/names.cmx interp/notation.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx lib/util.cmx \
     parsing/g_natsyntax.cmi 
-parsing/g_prim.cmo: lib/util.cmi interp/topconstr.cmi lib/pp.cmi \
-    parsing/pcoq.cmi library/nametab.cmi kernel/names.cmi \
-    library/libnames.cmi parsing/lexer.cmi lib/bigint.cmi 
-parsing/g_prim.cmx: lib/util.cmx interp/topconstr.cmx lib/pp.cmx \
-    parsing/pcoq.cmx library/nametab.cmx kernel/names.cmx \
-    library/libnames.cmx parsing/lexer.cmx lib/bigint.cmx 
-parsing/g_proofs.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi kernel/term.cmi proofs/tacexpr.cmo lib/pp.cmi \
-    parsing/pcoq.cmi interp/genarg.cmi parsing/g_vernac.cmo 
-parsing/g_proofs.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx kernel/term.cmx proofs/tacexpr.cmx lib/pp.cmx \
-    parsing/pcoq.cmx interp/genarg.cmx parsing/g_vernac.cmx 
-parsing/g_rsyntax.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi interp/notation.cmi \
-    kernel/names.cmi library/libnames.cmi lib/bigint.cmi 
-parsing/g_rsyntax.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx interp/notation.cmx \
-    kernel/names.cmx library/libnames.cmx lib/bigint.cmx 
-parsing/g_string_syntax.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi interp/notation.cmi \
-    kernel/names.cmi library/libnames.cmi parsing/g_ascii_syntax.cmo \
-    interp/coqlib.cmi 
-parsing/g_string_syntax.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx interp/notation.cmx \
-    kernel/names.cmx library/libnames.cmx parsing/g_ascii_syntax.cmx \
-    interp/coqlib.cmx 
-parsing/g_tactic.cmo: lib/util.cmi interp/topconstr.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi \
-    parsing/lexer.cmi interp/genarg.cmi 
-parsing/g_tactic.cmx: lib/util.cmx interp/topconstr.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx \
-    parsing/lexer.cmx interp/genarg.cmx 
-parsing/g_vernac.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi pretyping/recordops.cmi interp/ppextend.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 
-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 
-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 interp/genarg.cmi 
-parsing/g_xml.cmx: lib/util.cmx kernel/term.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx interp/genarg.cmx 
-parsing/g_zsyntax.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi interp/notation.cmi \
-    kernel/names.cmi library/libnames.cmi lib/bigint.cmi \
-    parsing/g_zsyntax.cmi 
-parsing/g_zsyntax.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx interp/notation.cmx \
-    kernel/names.cmx library/libnames.cmx lib/bigint.cmx \
-    parsing/g_zsyntax.cmi 
-parsing/lexer.cmo: lib/util.cmi lib/pp.cmi lib/options.cmi parsing/lexer.cmi 
-parsing/lexer.cmx: lib/util.cmx lib/pp.cmx lib/options.cmx parsing/lexer.cmi 
-parsing/pcoq.cmo: lib/util.cmi interp/topconstr.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi interp/ppextend.cmi lib/pp.cmi lib/options.cmi \
-    kernel/names.cmi library/libnames.cmi parsing/lexer.cmi interp/genarg.cmi \
-    parsing/extend.cmi library/decl_kinds.cmo parsing/pcoq.cmi 
-parsing/pcoq.cmx: lib/util.cmx interp/topconstr.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx interp/ppextend.cmx lib/pp.cmx lib/options.cmx \
-    kernel/names.cmx library/libnames.cmx parsing/lexer.cmx interp/genarg.cmx \
-    parsing/extend.cmx library/decl_kinds.cmx parsing/pcoq.cmi 
-parsing/ppconstr.cmo: lib/util.cmi kernel/univ.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    interp/ppextend.cmi lib/pp.cmi pretyping/pattern.cmi lib/options.cmi \
-    interp/notation.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi interp/genarg.cmi \
-    pretyping/evd.cmi interp/constrextern.cmi lib/bigint.cmi \
+parsing/g_prim.cmo: lib/bigint.cmi parsing/lexer.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi parsing/pcoq.cmi lib/pp.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/g_prim.cmx: lib/bigint.cmx parsing/lexer.cmx library/libnames.cmx \
+    kernel/names.cmx library/nametab.cmx parsing/pcoq.cmx lib/pp.cmx \
+    interp/topconstr.cmx lib/util.cmx 
+parsing/g_proofs.cmo: parsing/g_vernac.cmo interp/genarg.cmi parsing/pcoq.cmi \
+    lib/pp.cmi proofs/tacexpr.cmo kernel/term.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/g_proofs.cmx: parsing/g_vernac.cmx interp/genarg.cmx parsing/pcoq.cmx \
+    lib/pp.cmx proofs/tacexpr.cmx kernel/term.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_rsyntax.cmo: lib/bigint.cmi library/libnames.cmi kernel/names.cmi \
+    interp/notation.cmi parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/g_rsyntax.cmx: lib/bigint.cmx library/libnames.cmx kernel/names.cmx \
+    interp/notation.cmx parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    interp/topconstr.cmx lib/util.cmx 
+parsing/g_string_syntax.cmo: interp/coqlib.cmi parsing/g_ascii_syntax.cmo \
+    library/libnames.cmi kernel/names.cmi interp/notation.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi interp/topconstr.cmi \
+    lib/util.cmi 
+parsing/g_string_syntax.cmx: interp/coqlib.cmx parsing/g_ascii_syntax.cmx \
+    library/libnames.cmx kernel/names.cmx interp/notation.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx interp/topconstr.cmx \
+    lib/util.cmx 
+parsing/g_tactic.cmo: interp/genarg.cmi parsing/lexer.cmi kernel/names.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/g_tactic.cmx: interp/genarg.cmx parsing/lexer.cmx kernel/names.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx proofs/tacexpr.cmx \
+    interp/topconstr.cmx lib/util.cmx 
+parsing/g_vernac.cmo: toplevel/class.cmi library/decl_kinds.cmo \
+    parsing/extend.cmi parsing/g_constr.cmo interp/genarg.cmi \
+    library/goptions.cmi parsing/lexer.cmi library/nameops.cmi \
+    kernel/names.cmi lib/options.cmi parsing/pcoq.cmi lib/pp.cmi \
+    interp/ppextend.cmi pretyping/recordops.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/g_vernac.cmx: toplevel/class.cmx library/decl_kinds.cmx \
+    parsing/extend.cmx parsing/g_constr.cmx interp/genarg.cmx \
+    library/goptions.cmx parsing/lexer.cmx library/nameops.cmx \
+    kernel/names.cmx lib/options.cmx parsing/pcoq.cmx lib/pp.cmx \
+    interp/ppextend.cmx pretyping/recordops.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_xml.cmo: interp/genarg.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi lib/util.cmi 
+parsing/g_xml.cmx: interp/genarg.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx kernel/term.cmx lib/util.cmx 
+parsing/g_zsyntax.cmo: lib/bigint.cmi library/libnames.cmi kernel/names.cmi \
+    interp/notation.cmi parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    interp/topconstr.cmi lib/util.cmi parsing/g_zsyntax.cmi 
+parsing/g_zsyntax.cmx: lib/bigint.cmx library/libnames.cmx kernel/names.cmx \
+    interp/notation.cmx parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    interp/topconstr.cmx lib/util.cmx parsing/g_zsyntax.cmi 
+parsing/lexer.cmo: lib/options.cmi lib/pp.cmi lib/util.cmi parsing/lexer.cmi 
+parsing/lexer.cmx: lib/options.cmx lib/pp.cmx lib/util.cmx parsing/lexer.cmi 
+parsing/pcoq.cmo: library/decl_kinds.cmo parsing/extend.cmi interp/genarg.cmi \
+    parsing/lexer.cmi library/libnames.cmi kernel/names.cmi lib/options.cmi \
+    lib/pp.cmi interp/ppextend.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    interp/topconstr.cmi lib/util.cmi parsing/pcoq.cmi 
+parsing/pcoq.cmx: library/decl_kinds.cmx parsing/extend.cmx interp/genarg.cmx \
+    parsing/lexer.cmx library/libnames.cmx kernel/names.cmx lib/options.cmx \
+    lib/pp.cmx interp/ppextend.cmx pretyping/rawterm.cmx proofs/tacexpr.cmx \
+    interp/topconstr.cmx lib/util.cmx parsing/pcoq.cmi 
+parsing/ppconstr.cmo: lib/bigint.cmi interp/constrextern.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    interp/notation.cmi lib/options.cmi pretyping/pattern.cmi lib/pp.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi kernel/univ.cmi lib/util.cmi \
     parsing/ppconstr.cmi 
-parsing/ppconstr.cmx: lib/util.cmx kernel/univ.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx pretyping/rawterm.cmx \
-    interp/ppextend.cmx lib/pp.cmx pretyping/pattern.cmx lib/options.cmx \
-    interp/notation.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx interp/genarg.cmx \
-    pretyping/evd.cmx interp/constrextern.cmx lib/bigint.cmx \
+parsing/ppconstr.cmx: lib/bigint.cmx interp/constrextern.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    interp/notation.cmx lib/options.cmx pretyping/pattern.cmx lib/pp.cmx \
+    interp/ppextend.cmx pretyping/rawterm.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx kernel/univ.cmx lib/util.cmx \
     parsing/ppconstr.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 proofs/proof_type.cmi parsing/printer.cmi \
-    interp/ppextend.cmi parsing/ppconstr.cmi lib/pp.cmi pretyping/pattern.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi library/global.cmi interp/genarg.cmi \
-    kernel/environ.cmi parsing/egrammar.cmi lib/dyn.cmi kernel/closure.cmi \
+parsing/pptactic.cmo: kernel/closure.cmi lib/dyn.cmi parsing/egrammar.cmi \
+    kernel/environ.cmi interp/genarg.cmi library/global.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/pattern.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    interp/ppextend.cmi parsing/printer.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi proofs/tacexpr.cmo proofs/tactic_debug.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
     parsing/pptactic.cmi 
-parsing/pptactic.cmx: lib/util.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx proofs/tactic_debug.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
-    interp/ppextend.cmx parsing/ppconstr.cmx lib/pp.cmx pretyping/pattern.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx library/global.cmx interp/genarg.cmx \
-    kernel/environ.cmx parsing/egrammar.cmx lib/dyn.cmx kernel/closure.cmx \
+parsing/pptactic.cmx: kernel/closure.cmx lib/dyn.cmx parsing/egrammar.cmx \
+    kernel/environ.cmx interp/genarg.cmx library/global.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx pretyping/pattern.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    interp/ppextend.cmx parsing/printer.cmx proofs/proof_type.cmx \
+    pretyping/rawterm.cmx proofs/tacexpr.cmx proofs/tactic_debug.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx lib/util.cmx \
     parsing/pptactic.cmi 
-parsing/ppvernac.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi parsing/pptactic.cmi interp/ppextend.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 \
-    interp/modintern.cmi library/libnames.cmi library/lib.cmi \
-    library/impargs.cmi library/goptions.cmi library/global.cmi \
-    interp/genarg.cmi parsing/extend.cmi parsing/egrammar.cmi \
-    library/declaremods.cmi library/decl_kinds.cmo parsing/ppvernac.cmi 
-parsing/ppvernac.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx parsing/pptactic.cmx interp/ppextend.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 \
-    interp/modintern.cmx library/libnames.cmx library/lib.cmx \
-    library/impargs.cmx library/goptions.cmx library/global.cmx \
-    interp/genarg.cmx parsing/extend.cmx parsing/egrammar.cmx \
-    library/declaremods.cmx library/decl_kinds.cmx parsing/ppvernac.cmi 
-parsing/prettyp.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    interp/syntax_def.cmi kernel/sign.cmi kernel/safe_typing.cmi \
-    pretyping/reductionops.cmi kernel/reduction.cmi pretyping/recordops.cmi \
-    parsing/printmod.cmi parsing/printer.cmi lib/pp.cmi interp/notation.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi library/impargs.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    library/declare.cmi kernel/declarations.cmi kernel/conv_oracle.cmi \
-    interp/constrextern.cmi pretyping/classops.cmi parsing/prettyp.cmi 
-parsing/prettyp.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    interp/syntax_def.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    pretyping/reductionops.cmx kernel/reduction.cmx pretyping/recordops.cmx \
-    parsing/printmod.cmx parsing/printer.cmx lib/pp.cmx interp/notation.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx library/impargs.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    library/declare.cmx kernel/declarations.cmx kernel/conv_oracle.cmx \
-    interp/constrextern.cmx pretyping/classops.cmx parsing/prettyp.cmi 
-parsing/printer.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    kernel/sign.cmi proofs/refiner.cmi proofs/proof_type.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi proofs/pfedit.cmi lib/options.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 
-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 
-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 
-parsing/printmod.cmx: lib/util.cmx lib/pp.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    library/global.cmx kernel/declarations.cmx parsing/printmod.cmi 
-parsing/q_constr.cmo: lib/util.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    parsing/q_util.cmi pretyping/pattern.cmi kernel/names.cmi 
-parsing/q_constr.cmx: lib/util.cmx kernel/term.cmx pretyping/rawterm.cmx \
-    parsing/q_util.cmx pretyping/pattern.cmx kernel/names.cmx 
-parsing/q_coqast.cmo: lib/util.cmi interp/topconstr.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi parsing/q_util.cmi parsing/pcoq.cmi \
-    kernel/names.cmi library/libnames.cmi interp/genarg.cmi 
-parsing/q_coqast.cmx: lib/util.cmx interp/topconstr.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx parsing/q_util.cmx parsing/pcoq.cmx \
-    kernel/names.cmx library/libnames.cmx interp/genarg.cmx 
-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/tacextend.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 
-parsing/tacextend.cmx: lib/util.cmx parsing/q_util.cmx parsing/q_coqast.cmx \
-    lib/pp_control.cmx lib/pp.cmx interp/genarg.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/ppvernac.cmo: library/decl_kinds.cmo library/declaremods.cmi \
+    parsing/egrammar.cmi parsing/extend.cmi interp/genarg.cmi \
+    library/global.cmi library/goptions.cmi library/impargs.cmi \
+    library/lib.cmi library/libnames.cmi interp/modintern.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    interp/ppextend.cmi parsing/pptactic.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo parsing/ppvernac.cmi 
+parsing/ppvernac.cmx: library/decl_kinds.cmx library/declaremods.cmx \
+    parsing/egrammar.cmx parsing/extend.cmx interp/genarg.cmx \
+    library/global.cmx library/goptions.cmx library/impargs.cmx \
+    library/lib.cmx library/libnames.cmx interp/modintern.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    interp/ppextend.cmx parsing/pptactic.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx parsing/ppvernac.cmi 
+parsing/prettyp.cmo: pretyping/classops.cmi interp/constrextern.cmi \
+    kernel/conv_oracle.cmi kernel/declarations.cmi library/declare.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    library/impargs.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    interp/notation.cmi lib/pp.cmi parsing/printer.cmi parsing/printmod.cmi \
+    pretyping/recordops.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi interp/syntax_def.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi parsing/prettyp.cmi 
+parsing/prettyp.cmx: pretyping/classops.cmx interp/constrextern.cmx \
+    kernel/conv_oracle.cmx kernel/declarations.cmx library/declare.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    library/impargs.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    interp/notation.cmx lib/pp.cmx parsing/printer.cmx parsing/printmod.cmx \
+    pretyping/recordops.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    kernel/safe_typing.cmx kernel/sign.cmx interp/syntax_def.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx parsing/prettyp.cmi 
+parsing/printer.cmo: interp/constrextern.cmi library/declare.cmi \
+    kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi proofs/pfedit.cmi \
+    lib/pp.cmi parsing/ppconstr.cmi proofs/proof_type.cmi proofs/refiner.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
+    parsing/printer.cmi 
+parsing/printer.cmx: interp/constrextern.cmx library/declare.cmx \
+    kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx proofs/pfedit.cmx \
+    lib/pp.cmx parsing/ppconstr.cmx proofs/proof_type.cmx proofs/refiner.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
+    parsing/printer.cmi 
+parsing/printmod.cmo: kernel/declarations.cmi library/global.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi lib/util.cmi parsing/printmod.cmi 
+parsing/printmod.cmx: kernel/declarations.cmx library/global.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx lib/util.cmx parsing/printmod.cmi 
+parsing/q_constr.cmo: kernel/names.cmi pretyping/pattern.cmi \
+    parsing/q_util.cmi pretyping/rawterm.cmi kernel/term.cmi lib/util.cmi 
+parsing/q_constr.cmx: kernel/names.cmx pretyping/pattern.cmx \
+    parsing/q_util.cmx pretyping/rawterm.cmx kernel/term.cmx lib/util.cmx 
+parsing/q_coqast.cmo: interp/genarg.cmi library/libnames.cmi kernel/names.cmi \
+    parsing/pcoq.cmi parsing/q_util.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi 
+parsing/q_coqast.cmx: interp/genarg.cmx library/libnames.cmx kernel/names.cmx \
+    parsing/pcoq.cmx parsing/q_util.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx interp/topconstr.cmx lib/util.cmx 
+parsing/q_util.cmo: interp/genarg.cmi parsing/pcoq.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo parsing/q_util.cmi 
+parsing/q_util.cmx: interp/genarg.cmx parsing/pcoq.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx parsing/q_util.cmi 
+parsing/search.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    library/declare.cmi library/declaremods.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi library/libobject.cmi pretyping/matching.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
+    pretyping/rawterm.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi lib/util.cmi parsing/search.cmi 
+parsing/search.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    library/declare.cmx library/declaremods.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx library/libobject.cmx pretyping/matching.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
+    pretyping/rawterm.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx lib/util.cmx parsing/search.cmi 
+parsing/tacextend.cmo: parsing/argextend.cmo interp/genarg.cmi lib/pp.cmi \
+    lib/pp_control.cmi parsing/q_coqast.cmo parsing/q_util.cmi lib/util.cmi 
+parsing/tacextend.cmx: parsing/argextend.cmx interp/genarg.cmx lib/pp.cmx \
+    lib/pp_control.cmx parsing/q_coqast.cmx parsing/q_util.cmx lib/util.cmx 
+parsing/tactic_printer.cmo: kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi proofs/logic.cmi lib/pp.cmi parsing/pptactic.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo lib/util.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.cmx: kernel/environ.cmx pretyping/evd.cmx \
+    library/global.cmx proofs/logic.cmx lib/pp.cmx parsing/pptactic.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    proofs/refiner.cmx kernel/sign.cmx proofs/tacexpr.cmx lib/util.cmx \
     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 
-parsing/vernacextend.cmx: lib/util.cmx parsing/q_util.cmx \
-    parsing/q_coqast.cmx lib/pp_control.cmx lib/pp.cmx interp/genarg.cmx \
-    parsing/argextend.cmx 
-pretyping/cases.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 pretyping/rawterm.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi kernel/names.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/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 \
-    pretyping/pretype_errors.cmx lib/pp.cmx kernel/names.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/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 
-pretyping/cbv.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx lib/pp.cmx \
-    kernel/names.cmx pretyping/evd.cmx kernel/esubst.cmx kernel/environ.cmx \
-    kernel/conv_oracle.cmx kernel/closure.cmx pretyping/cbv.cmi 
-pretyping/classops.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    pretyping/tacred.cmi library/summary.cmi pretyping/reductionops.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/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/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 \
-    pretyping/retyping.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    pretyping/rawterm.cmi pretyping/pretype_errors.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    kernel/mod_subst.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi pretyping/coercion.cmi \
+parsing/vernacextend.cmo: parsing/argextend.cmo interp/genarg.cmi lib/pp.cmi \
+    lib/pp_control.cmi parsing/q_coqast.cmo parsing/q_util.cmi lib/util.cmi 
+parsing/vernacextend.cmx: parsing/argextend.cmx interp/genarg.cmx lib/pp.cmx \
+    lib/pp_control.cmx parsing/q_coqast.cmx parsing/q_util.cmx lib/util.cmx 
+pretyping/cases.cmo: pretyping/coercion.cmi kernel/declarations.cmi \
+    kernel/environ.cmi pretyping/evarconv.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/global.cmi kernel/inductive.cmi \
+    pretyping/inductiveops.cmi library/nameops.cmi kernel/names.cmi \
+    lib/pp.cmi pretyping/pretype_errors.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi pretyping/retyping.cmi kernel/sign.cmi \
+    kernel/term.cmi pretyping/termops.cmi kernel/type_errors.cmi \
+    kernel/typeops.cmi lib/util.cmi pretyping/cases.cmi 
+pretyping/cases.cmx: pretyping/coercion.cmx kernel/declarations.cmx \
+    kernel/environ.cmx pretyping/evarconv.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/global.cmx kernel/inductive.cmx \
+    pretyping/inductiveops.cmx library/nameops.cmx kernel/names.cmx \
+    lib/pp.cmx pretyping/pretype_errors.cmx pretyping/rawterm.cmx \
+    pretyping/reductionops.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    kernel/term.cmx pretyping/termops.cmx kernel/type_errors.cmx \
+    kernel/typeops.cmx lib/util.cmx pretyping/cases.cmi 
+pretyping/cbv.cmo: kernel/closure.cmi kernel/conv_oracle.cmi \
+    kernel/environ.cmi kernel/esubst.cmi pretyping/evd.cmi kernel/names.cmi \
+    lib/pp.cmi kernel/term.cmi kernel/univ.cmi lib/util.cmi pretyping/cbv.cmi 
+pretyping/cbv.cmx: kernel/closure.cmx kernel/conv_oracle.cmx \
+    kernel/environ.cmx kernel/esubst.cmx pretyping/evd.cmx kernel/names.cmx \
+    lib/pp.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx pretyping/cbv.cmi 
+pretyping/classops.cmo: library/decl_kinds.cmo kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi lib/gmap.cmi library/goptions.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    library/library.cmi kernel/mod_subst.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi library/summary.cmi pretyping/tacred.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi pretyping/classops.cmi 
+pretyping/classops.cmx: library/decl_kinds.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx lib/gmap.cmx library/goptions.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    library/library.cmx kernel/mod_subst.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    pretyping/reductionops.cmx library/summary.cmx pretyping/tacred.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx pretyping/classops.cmi 
+pretyping/clenv.cmo: pretyping/coercion.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
+    pretyping/rawterm.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi kernel/sign.cmi proofs/tacexpr.cmo \
+    pretyping/tacred.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi pretyping/unification.cmi lib/util.cmi \
     pretyping/clenv.cmi 
-pretyping/clenv.cmx: lib/util.cmx pretyping/unification.cmx \
-    pretyping/typing.cmx pretyping/termops.cmx kernel/term.cmx \
-    pretyping/tacred.cmx proofs/tacexpr.cmx kernel/sign.cmx \
-    pretyping/retyping.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    pretyping/rawterm.cmx pretyping/pretype_errors.cmx lib/pp.cmx \
-    pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx pretyping/coercion.cmx \
+pretyping/clenv.cmx: pretyping/coercion.cmx kernel/environ.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
+    pretyping/rawterm.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx kernel/sign.cmx proofs/tacexpr.cmx \
+    pretyping/tacred.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx pretyping/unification.cmx lib/util.cmx \
     pretyping/clenv.cmi 
-pretyping/coercion.cmo: 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 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 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 \
-    kernel/mod_subst.cmi library/libnames.cmi pretyping/inductiveops.cmi \
-    kernel/inductive.cmi library/goptions.cmi library/global.cmi \
-    pretyping/evd.cmi kernel/environ.cmi kernel/declarations.cmi \
-    pretyping/detyping.cmi 
-pretyping/detyping.cmx: lib/util.cmx kernel/univ.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/sign.cmx pretyping/rawterm.cmx lib/pp.cmx \
-    lib/options.cmx library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx library/libnames.cmx pretyping/inductiveops.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/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 \
-    pretyping/pretype_errors.cmi lib/pp.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/evd.cmi kernel/environ.cmi \
-    pretyping/evarutil.cmi 
-pretyping/evarutil.cmx: lib/util.cmx kernel/univ.cmx pretyping/typing.cmx \
-    kernel/typeops.cmx pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx \
-    pretyping/reductionops.cmx kernel/reduction.cmx \
-    pretyping/pretype_errors.cmx lib/pp.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/evd.cmx kernel/environ.cmx \
-    pretyping/evarutil.cmi 
-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 \
-    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 \
-    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 \
-    kernel/safe_typing.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    lib/pp.cmi lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi pretyping/inductiveops.cmi \
-    kernel/inductive.cmi library/global.cmi kernel/environ.cmi \
-    kernel/entries.cmi kernel/declarations.cmi pretyping/indrec.cmi 
-pretyping/indrec.cmx: lib/util.cmx kernel/typeops.cmx kernel/type_errors.cmx \
-    pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx \
-    kernel/safe_typing.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    lib/pp.cmx lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx pretyping/inductiveops.cmx \
-    kernel/inductive.cmx library/global.cmx kernel/environ.cmx \
-    kernel/entries.cmx kernel/declarations.cmx pretyping/indrec.cmi 
-pretyping/inductiveops.cmo: lib/util.cmi kernel/univ.cmi \
-    pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/reductionops.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    kernel/inductive.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/declarations.cmi pretyping/inductiveops.cmi 
-pretyping/inductiveops.cmx: lib/util.cmx kernel/univ.cmx \
-    pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx \
-    pretyping/reductionops.cmx kernel/names.cmx kernel/mod_subst.cmx \
-    kernel/inductive.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx pretyping/inductiveops.cmi 
-pretyping/matching.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    pretyping/reductionops.cmi pretyping/rawterm.cmi pretyping/pattern.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    kernel/environ.cmi pretyping/matching.cmi 
-pretyping/matching.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    pretyping/reductionops.cmx pretyping/rawterm.cmx pretyping/pattern.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    kernel/environ.cmx pretyping/matching.cmi 
-pretyping/pattern.cmo: lib/util.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    lib/pp.cmi lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi kernel/mod_subst.cmi library/libnames.cmi \
-    kernel/environ.cmi pretyping/pattern.cmi 
-pretyping/pattern.cmx: lib/util.cmx kernel/term.cmx pretyping/rawterm.cmx \
-    lib/pp.cmx lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx kernel/mod_subst.cmx library/libnames.cmx \
-    kernel/environ.cmx pretyping/pattern.cmi 
-pretyping/pretype_errors.cmo: lib/util.cmi kernel/type_errors.cmi \
-    pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/reductionops.cmi kernel/reduction.cmi pretyping/rawterm.cmi \
-    library/nametab.cmi kernel/names.cmi pretyping/inductiveops.cmi \
-    pretyping/evd.cmi kernel/environ.cmi pretyping/pretype_errors.cmi 
-pretyping/pretype_errors.cmx: lib/util.cmx kernel/type_errors.cmx \
-    pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx \
-    pretyping/reductionops.cmx kernel/reduction.cmx pretyping/rawterm.cmx \
-    library/nametab.cmx kernel/names.cmx pretyping/inductiveops.cmx \
-    pretyping/evd.cmx kernel/environ.cmx pretyping/pretype_errors.cmi 
-pretyping/pretyping.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 \
-    pretyping/recordops.cmi pretyping/rawterm.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi pretyping/pattern.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi pretyping/evarconv.cmi kernel/environ.cmi \
-    lib/dyn.cmi kernel/declarations.cmi pretyping/coercion.cmi \
-    pretyping/classops.cmi pretyping/cases.cmi pretyping/pretyping.cmi 
-pretyping/pretyping.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/recordops.cmx pretyping/rawterm.cmx \
-    pretyping/pretype_errors.cmx lib/pp.cmx pretyping/pattern.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx pretyping/evarconv.cmx kernel/environ.cmx \
-    lib/dyn.cmx kernel/declarations.cmx pretyping/coercion.cmx \
-    pretyping/classops.cmx pretyping/cases.cmx pretyping/pretyping.cmi 
-pretyping/rawterm.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    pretyping/evd.cmi lib/dyn.cmi pretyping/rawterm.cmi 
-pretyping/rawterm.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx library/nametab.cmx kernel/names.cmx library/libnames.cmx \
-    pretyping/evd.cmx lib/dyn.cmx pretyping/rawterm.cmi 
-pretyping/recordops.cmo: lib/util.cmi kernel/typeops.cmi \
-    pretyping/termops.cmi kernel/term.cmi library/summary.cmi \
-    pretyping/reductionops.cmi lib/pp.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi kernel/mod_subst.cmi \
-    library/library.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi pretyping/inductiveops.cmi library/global.cmi \
-    pretyping/evd.cmi kernel/environ.cmi kernel/declarations.cmi \
-    pretyping/classops.cmi pretyping/recordops.cmi 
-pretyping/recordops.cmx: lib/util.cmx kernel/typeops.cmx \
-    pretyping/termops.cmx kernel/term.cmx library/summary.cmx \
-    pretyping/reductionops.cmx lib/pp.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx kernel/mod_subst.cmx \
-    library/library.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx pretyping/inductiveops.cmx library/global.cmx \
-    pretyping/evd.cmx kernel/environ.cmx kernel/declarations.cmx \
-    pretyping/classops.cmx pretyping/recordops.cmi 
-pretyping/reductionops.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 pretyping/evd.cmi \
-    kernel/esubst.cmi kernel/environ.cmi kernel/declarations.cmi \
-    kernel/closure.cmi pretyping/reductionops.cmi 
-pretyping/reductionops.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 pretyping/evd.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/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/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 \
-    pretyping/rawterm.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi kernel/inductive.cmi \
-    pretyping/evd.cmi kernel/environ.cmi kernel/declarations.cmi \
-    kernel/conv_oracle.cmi kernel/closure.cmi pretyping/cbv.cmi \
+pretyping/coercion.cmo: pretyping/classops.cmi kernel/environ.cmi \
+    pretyping/evarconv.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    kernel/names.cmi pretyping/pretype_errors.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi kernel/term.cmi kernel/typeops.cmi lib/util.cmi \
+    pretyping/coercion.cmi 
+pretyping/coercion.cmx: pretyping/classops.cmx kernel/environ.cmx \
+    pretyping/evarconv.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    kernel/names.cmx pretyping/pretype_errors.cmx pretyping/rawterm.cmx \
+    pretyping/recordops.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx kernel/term.cmx kernel/typeops.cmx lib/util.cmx \
+    pretyping/coercion.cmi 
+pretyping/detyping.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi library/goptions.cmi \
+    kernel/inductive.cmi pretyping/inductiveops.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi kernel/univ.cmi \
+    lib/util.cmi pretyping/detyping.cmi 
+pretyping/detyping.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx library/goptions.cmx \
+    kernel/inductive.cmx pretyping/inductiveops.cmx library/libnames.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx kernel/univ.cmx \
+    lib/util.cmx pretyping/detyping.cmi 
+pretyping/evarconv.cmo: pretyping/classops.cmi kernel/closure.cmi \
+    kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/libnames.cmi kernel/names.cmi pretyping/recordops.cmi \
+    kernel/reduction.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi pretyping/evarconv.cmi 
+pretyping/evarconv.cmx: pretyping/classops.cmx kernel/closure.cmx \
+    kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/libnames.cmx kernel/names.cmx pretyping/recordops.cmx \
+    kernel/reduction.cmx pretyping/reductionops.cmx kernel/term.cmx \
+    pretyping/typing.cmx lib/util.cmx pretyping/evarconv.cmi 
+pretyping/evarutil.cmo: kernel/environ.cmi pretyping/evd.cmi \
+    library/nameops.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi kernel/reduction.cmi \
+    pretyping/reductionops.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/typeops.cmi pretyping/typing.cmi \
+    kernel/univ.cmi lib/util.cmi pretyping/evarutil.cmi 
+pretyping/evarutil.cmx: kernel/environ.cmx pretyping/evd.cmx \
+    library/nameops.cmx kernel/names.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx kernel/reduction.cmx \
+    pretyping/reductionops.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/typeops.cmx pretyping/typing.cmx \
+    kernel/univ.cmx lib/util.cmx pretyping/evarutil.cmi 
+pretyping/evd.cmo: kernel/environ.cmi library/global.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/univ.cmi lib/util.cmi pretyping/evd.cmi 
+pretyping/evd.cmx: kernel/environ.cmx library/global.cmx library/libnames.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx lib/pp.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/univ.cmx lib/util.cmx pretyping/evd.cmi 
+pretyping/indrec.cmo: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.cmi library/global.cmi kernel/inductive.cmi \
+    pretyping/inductiveops.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi lib/pp.cmi \
+    kernel/reduction.cmi pretyping/reductionops.cmi kernel/safe_typing.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi lib/util.cmi \
+    pretyping/indrec.cmi 
+pretyping/indrec.cmx: kernel/declarations.cmx kernel/entries.cmx \
+    kernel/environ.cmx library/global.cmx kernel/inductive.cmx \
+    pretyping/inductiveops.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
+    kernel/reduction.cmx pretyping/reductionops.cmx kernel/safe_typing.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx lib/util.cmx \
+    pretyping/indrec.cmi 
+pretyping/inductiveops.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi kernel/inductive.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi pretyping/reductionops.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi kernel/univ.cmi \
+    lib/util.cmi pretyping/inductiveops.cmi 
+pretyping/inductiveops.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx kernel/inductive.cmx \
+    kernel/mod_subst.cmx kernel/names.cmx pretyping/reductionops.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx kernel/univ.cmx \
+    lib/util.cmx pretyping/inductiveops.cmi 
+pretyping/matching.cmo: kernel/environ.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi \
+    pretyping/rawterm.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi pretyping/matching.cmi 
+pretyping/matching.cmx: kernel/environ.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx \
+    pretyping/rawterm.cmx pretyping/reductionops.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx pretyping/matching.cmi 
+pretyping/pattern.cmo: kernel/environ.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    kernel/term.cmi lib/util.cmi pretyping/pattern.cmi 
+pretyping/pattern.cmx: kernel/environ.cmx library/libnames.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    kernel/term.cmx lib/util.cmx pretyping/pattern.cmi 
+pretyping/pretype_errors.cmo: kernel/environ.cmi pretyping/evd.cmi \
+    pretyping/inductiveops.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/rawterm.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/type_errors.cmi lib/util.cmi pretyping/pretype_errors.cmi 
+pretyping/pretype_errors.cmx: kernel/environ.cmx pretyping/evd.cmx \
+    pretyping/inductiveops.cmx kernel/names.cmx library/nametab.cmx \
+    pretyping/rawterm.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/type_errors.cmx lib/util.cmx pretyping/pretype_errors.cmi 
+pretyping/pretyping.cmo: pretyping/cases.cmi pretyping/classops.cmi \
+    pretyping/coercion.cmi kernel/declarations.cmi lib/dyn.cmi \
+    kernel/environ.cmi pretyping/evarconv.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
+    pretyping/rawterm.cmi pretyping/recordops.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/type_errors.cmi kernel/typeops.cmi \
+    lib/util.cmi pretyping/pretyping.cmi 
+pretyping/pretyping.cmx: pretyping/cases.cmx pretyping/classops.cmx \
+    pretyping/coercion.cmx kernel/declarations.cmx lib/dyn.cmx \
+    kernel/environ.cmx pretyping/evarconv.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
+    pretyping/rawterm.cmx pretyping/recordops.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/type_errors.cmx kernel/typeops.cmx \
+    lib/util.cmx pretyping/pretyping.cmi 
+pretyping/rawterm.cmo: lib/dyn.cmi pretyping/evd.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi lib/util.cmi pretyping/rawterm.cmi 
+pretyping/rawterm.cmx: lib/dyn.cmx pretyping/evd.cmx library/libnames.cmx \
+    kernel/names.cmx library/nametab.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/univ.cmx lib/util.cmx pretyping/rawterm.cmi 
+pretyping/recordops.cmo: pretyping/classops.cmi kernel/declarations.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    pretyping/inductiveops.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi library/library.cmi kernel/mod_subst.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/pp.cmi \
+    pretyping/reductionops.cmi library/summary.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/typeops.cmi lib/util.cmi \
+    pretyping/recordops.cmi 
+pretyping/recordops.cmx: pretyping/classops.cmx kernel/declarations.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    pretyping/inductiveops.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx library/library.cmx kernel/mod_subst.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/pp.cmx \
+    pretyping/reductionops.cmx library/summary.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/typeops.cmx lib/util.cmx \
+    pretyping/recordops.cmi 
+pretyping/reductionops.cmo: kernel/closure.cmi kernel/declarations.cmi \
+    kernel/environ.cmi kernel/esubst.cmi pretyping/evd.cmi kernel/names.cmi \
+    lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/univ.cmi lib/util.cmi \
+    pretyping/reductionops.cmi 
+pretyping/reductionops.cmx: kernel/closure.cmx kernel/declarations.cmx \
+    kernel/environ.cmx kernel/esubst.cmx pretyping/evd.cmx kernel/names.cmx \
+    lib/pp.cmx kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/univ.cmx lib/util.cmx \
+    pretyping/reductionops.cmi 
+pretyping/retyping.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    kernel/names.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    kernel/typeops.cmi kernel/univ.cmi lib/util.cmi pretyping/retyping.cmi 
+pretyping/retyping.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    kernel/names.cmx pretyping/reductionops.cmx kernel/term.cmx \
+    kernel/typeops.cmx kernel/univ.cmx lib/util.cmx pretyping/retyping.cmi 
+pretyping/tacred.cmo: pretyping/cbv.cmi kernel/closure.cmi \
+    kernel/conv_oracle.cmi kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi kernel/inductive.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi pretyping/reductionops.cmi pretyping/retyping.cmi \
+    library/summary.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/type_errors.cmi pretyping/typing.cmi lib/util.cmi \
     pretyping/tacred.cmi 
-pretyping/tacred.cmx: lib/util.cmx pretyping/typing.cmx \
-    kernel/type_errors.cmx pretyping/termops.cmx kernel/term.cmx \
-    library/summary.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx kernel/inductive.cmx \
-    pretyping/evd.cmx kernel/environ.cmx kernel/declarations.cmx \
-    kernel/conv_oracle.cmx kernel/closure.cmx pretyping/cbv.cmx \
+pretyping/tacred.cmx: pretyping/cbv.cmx kernel/closure.cmx \
+    kernel/conv_oracle.cmx kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx kernel/inductive.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/pp.cmx \
+    pretyping/rawterm.cmx pretyping/reductionops.cmx pretyping/retyping.cmx \
+    library/summary.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/type_errors.cmx pretyping/typing.cmx lib/util.cmx \
     pretyping/tacred.cmi 
-pretyping/termops.cmo: lib/util.cmi kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi library/lib.cmi \
-    library/global.cmi kernel/environ.cmi pretyping/termops.cmi 
-pretyping/termops.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx library/lib.cmx \
-    library/global.cmx kernel/environ.cmx pretyping/termops.cmi 
-pretyping/typing.cmo: lib/util.cmi kernel/typeops.cmi kernel/type_errors.cmi \
-    kernel/term.cmi pretyping/reductionops.cmi pretyping/pretype_errors.cmi \
-    kernel/names.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
-    pretyping/evd.cmi kernel/environ.cmi pretyping/typing.cmi 
-pretyping/typing.cmx: lib/util.cmx kernel/typeops.cmx kernel/type_errors.cmx \
-    kernel/term.cmx pretyping/reductionops.cmx pretyping/pretype_errors.cmx \
-    kernel/names.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
-    pretyping/evd.cmx kernel/environ.cmx pretyping/typing.cmi 
-pretyping/unification.cmo: lib/util.cmi pretyping/typing.cmi \
-    pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/retyping.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    pretyping/rawterm.cmi pretyping/pretype_errors.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    library/global.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    kernel/environ.cmi pretyping/unification.cmi 
-pretyping/unification.cmx: lib/util.cmx pretyping/typing.cmx \
-    pretyping/termops.cmx kernel/term.cmx kernel/sign.cmx \
-    pretyping/retyping.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    pretyping/rawterm.cmx pretyping/pretype_errors.cmx lib/pp.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 
-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 \
-    pretyping/reductionops.cmi kernel/reduction.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    proofs/logic.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    proofs/evar_refiner.cmi kernel/environ.cmi pretyping/clenv.cmi \
-    proofs/clenvtac.cmi 
-proofs/clenvtac.cmx: lib/util.cmx pretyping/unification.cmx \
-    pretyping/typing.cmx pretyping/termops.cmx kernel/term.cmx \
-    proofs/tacmach.cmx proofs/tacexpr.cmx kernel/sign.cmx proofs/refiner.cmx \
-    pretyping/reductionops.cmx kernel/reduction.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx proofs/proof_trees.cmx lib/pp.cmx \
-    pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
-    proofs/logic.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    proofs/evar_refiner.cmx kernel/environ.cmx pretyping/clenv.cmx \
-    proofs/clenvtac.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 \
-    interp/constrintern.cmi proofs/evar_refiner.cmi 
-proofs/evar_refiner.cmx: lib/util.cmx kernel/term.cmx kernel/sign.cmx \
-    proofs/refiner.cmx proofs/proof_trees.cmx pretyping/pretyping.cmx \
-    kernel/names.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    interp/constrintern.cmx proofs/evar_refiner.cmi 
-proofs/logic.cmo: lib/util.cmi pretyping/typing.cmi kernel/typeops.cmi \
-    kernel/type_errors.cmi pretyping/termops.cmi kernel/term.cmi \
-    kernel/sign.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi pretyping/pretype_errors.cmi \
-    lib/pp.cmi lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
-    pretyping/indrec.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi proofs/logic.cmi 
-proofs/logic.cmx: lib/util.cmx pretyping/typing.cmx kernel/typeops.cmx \
-    kernel/type_errors.cmx pretyping/termops.cmx kernel/term.cmx \
-    kernel/sign.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
-    proofs/proof_type.cmx proofs/proof_trees.cmx pretyping/pretype_errors.cmx \
-    lib/pp.cmx lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
-    pretyping/indrec.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx proofs/logic.cmi 
-proofs/pfedit.cmo: lib/util.cmi pretyping/typing.cmi kernel/term.cmi \
-    proofs/tacexpr.cmo kernel/sign.cmi kernel/safe_typing.cmi \
-    proofs/refiner.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    lib/pp.cmi kernel/names.cmi library/nameops.cmi library/lib.cmi \
-    pretyping/evd.cmi proofs/evar_refiner.cmi kernel/environ.cmi \
-    kernel/entries.cmi lib/edit.cmi kernel/declarations.cmi \
-    library/decl_kinds.cmo proofs/pfedit.cmi 
-proofs/pfedit.cmx: lib/util.cmx pretyping/typing.cmx kernel/term.cmx \
-    proofs/tacexpr.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    proofs/refiner.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    lib/pp.cmx kernel/names.cmx library/nameops.cmx library/lib.cmx \
-    pretyping/evd.cmx proofs/evar_refiner.cmx kernel/environ.cmx \
-    kernel/entries.cmx lib/edit.cmx kernel/declarations.cmx \
-    library/decl_kinds.cmx proofs/pfedit.cmi 
-proofs/proof_trees.cmo: lib/util.cmi pretyping/typing.cmi \
-    pretyping/termops.cmi kernel/term.cmi pretyping/tacred.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 
-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 
-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 
-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/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 \
+pretyping/termops.cmo: kernel/environ.cmi library/global.cmi library/lib.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi lib/util.cmi pretyping/termops.cmi 
+pretyping/termops.cmx: kernel/environ.cmx library/global.cmx library/lib.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/univ.cmx lib/util.cmx pretyping/termops.cmi 
+pretyping/typing.cmo: kernel/environ.cmi pretyping/evd.cmi \
+    kernel/inductive.cmi pretyping/inductiveops.cmi kernel/names.cmi \
+    pretyping/pretype_errors.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi lib/util.cmi \
+    pretyping/typing.cmi 
+pretyping/typing.cmx: kernel/environ.cmx pretyping/evd.cmx \
+    kernel/inductive.cmx pretyping/inductiveops.cmx kernel/names.cmx \
+    pretyping/pretype_errors.cmx pretyping/reductionops.cmx kernel/term.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx lib/util.cmx \
+    pretyping/typing.cmi 
+pretyping/unification.cmo: kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/global.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
+    pretyping/rawterm.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
+    pretyping/unification.cmi 
+pretyping/unification.cmx: kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/global.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
+    pretyping/rawterm.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
+    pretyping/unification.cmi 
+proofs/clenvtac.cmo: pretyping/clenv.cmi kernel/environ.cmi \
+    proofs/evar_refiner.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    proofs/logic.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
+    pretyping/reductionops.cmi proofs/refiner.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi pretyping/unification.cmi \
+    lib/util.cmi proofs/clenvtac.cmi 
+proofs/clenvtac.cmx: pretyping/clenv.cmx kernel/environ.cmx \
+    proofs/evar_refiner.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    proofs/logic.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
+    pretyping/reductionops.cmx proofs/refiner.cmx kernel/sign.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx pretyping/unification.cmx \
+    lib/util.cmx proofs/clenvtac.cmi 
+proofs/evar_refiner.cmo: interp/constrintern.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/names.cmi pretyping/pretyping.cmi \
+    proofs/proof_trees.cmi proofs/refiner.cmi kernel/sign.cmi kernel/term.cmi \
+    lib/util.cmi proofs/evar_refiner.cmi 
+proofs/evar_refiner.cmx: interp/constrintern.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx kernel/names.cmx pretyping/pretyping.cmx \
+    proofs/proof_trees.cmx proofs/refiner.cmx kernel/sign.cmx kernel/term.cmx \
+    lib/util.cmx proofs/evar_refiner.cmi 
+proofs/logic.cmo: kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.cmi pretyping/indrec.cmi kernel/inductive.cmi \
+    pretyping/inductiveops.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    pretyping/reductionops.cmi pretyping/retyping.cmi kernel/sign.cmi \
+    kernel/term.cmi pretyping/termops.cmi kernel/type_errors.cmi \
+    kernel/typeops.cmi pretyping/typing.cmi lib/util.cmi proofs/logic.cmi 
+proofs/logic.cmx: kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.cmx pretyping/indrec.cmx kernel/inductive.cmx \
+    pretyping/inductiveops.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    pretyping/reductionops.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    kernel/term.cmx pretyping/termops.cmx kernel/type_errors.cmx \
+    kernel/typeops.cmx pretyping/typing.cmx lib/util.cmx proofs/logic.cmi 
+proofs/pfedit.cmo: library/decl_kinds.cmo kernel/declarations.cmi \
+    lib/edit.cmi kernel/entries.cmi kernel/environ.cmi \
+    proofs/evar_refiner.cmi pretyping/evd.cmi library/lib.cmi \
+    library/nameops.cmi kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi proofs/refiner.cmi kernel/safe_typing.cmi \
+    kernel/sign.cmi proofs/tacexpr.cmo kernel/term.cmi pretyping/typing.cmi \
+    lib/util.cmi proofs/pfedit.cmi 
+proofs/pfedit.cmx: library/decl_kinds.cmx kernel/declarations.cmx \
+    lib/edit.cmx kernel/entries.cmx kernel/environ.cmx \
+    proofs/evar_refiner.cmx pretyping/evd.cmx library/lib.cmx \
+    library/nameops.cmx kernel/names.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx proofs/refiner.cmx kernel/safe_typing.cmx \
+    kernel/sign.cmx proofs/tacexpr.cmx kernel/term.cmx pretyping/typing.cmx \
+    lib/util.cmx proofs/pfedit.cmi 
+proofs/proof_trees.cmo: kernel/closure.cmi pretyping/detyping.cmi \
+    kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi proofs/proof_type.cmi kernel/sign.cmi \
+    pretyping/tacred.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi lib/util.cmi proofs/proof_trees.cmi 
+proofs/proof_trees.cmx: kernel/closure.cmx pretyping/detyping.cmx \
+    kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx proofs/proof_type.cmx kernel/sign.cmx \
+    pretyping/tacred.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx lib/util.cmx proofs/proof_trees.cmi 
+proofs/proof_type.cmo: kernel/environ.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    kernel/term.cmi lib/util.cmi proofs/proof_type.cmi 
+proofs/proof_type.cmx: kernel/environ.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/libnames.cmx kernel/names.cmx library/nametab.cmx \
+    pretyping/pattern.cmx pretyping/rawterm.cmx proofs/tacexpr.cmx \
+    kernel/term.cmx lib/util.cmx proofs/proof_type.cmi 
+proofs/redexpr.cmo: kernel/closure.cmi kernel/conv_oracle.cmi \
+    kernel/csymtable.cmi kernel/declarations.cmi kernel/environ.cmi \
+    library/global.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi library/summary.cmi pretyping/tacred.cmi \
+    kernel/term.cmi kernel/typeops.cmi lib/util.cmi kernel/vconv.cmi \
     proofs/redexpr.cmi 
-proofs/redexpr.cmx: kernel/vconv.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 \
-    library/global.cmx kernel/environ.cmx kernel/declarations.cmx \
-    kernel/csymtable.cmx kernel/conv_oracle.cmx kernel/closure.cmx \
+proofs/redexpr.cmx: kernel/closure.cmx kernel/conv_oracle.cmx \
+    kernel/csymtable.cmx kernel/declarations.cmx kernel/environ.cmx \
+    library/global.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    pretyping/reductionops.cmx library/summary.cmx pretyping/tacred.cmx \
+    kernel/term.cmx kernel/typeops.cmx lib/util.cmx kernel/vconv.cmx \
     proofs/redexpr.cmi 
-proofs/refiner.cmo: lib/util.cmi kernel/type_errors.cmi pretyping/termops.cmi \
-    kernel/term.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    pretyping/reductionops.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    lib/pp.cmi proofs/logic.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi proofs/refiner.cmi 
-proofs/refiner.cmx: lib/util.cmx kernel/type_errors.cmx pretyping/termops.cmx \
-    kernel/term.cmx proofs/tacexpr.cmx kernel/sign.cmx \
-    pretyping/reductionops.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    lib/pp.cmx proofs/logic.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx proofs/refiner.cmi 
-proofs/tacexpr.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi pretyping/pattern.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi interp/genarg.cmi lib/dyn.cmi \
-    library/decl_kinds.cmo 
-proofs/tacexpr.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
-    pretyping/rawterm.cmx pretyping/pattern.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx interp/genarg.cmx lib/dyn.cmx \
-    library/decl_kinds.cmx 
-proofs/tacmach.cmo: lib/util.cmi pretyping/typing.cmi pretyping/termops.cmi \
-    kernel/term.cmi pretyping/tacred.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    proofs/refiner.cmi pretyping/reductionops.cmi proofs/redexpr.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    lib/pp.cmi kernel/names.cmi library/nameops.cmi proofs/logic.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    interp/constrintern.cmi proofs/tacmach.cmi 
-proofs/tacmach.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
-    kernel/term.cmx pretyping/tacred.cmx proofs/tacexpr.cmx kernel/sign.cmx \
-    proofs/refiner.cmx pretyping/reductionops.cmx proofs/redexpr.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    lib/pp.cmx kernel/names.cmx library/nameops.cmx proofs/logic.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    interp/constrintern.cmx proofs/tacmach.cmi 
-proofs/tactic_debug.cmo: pretyping/termops.cmi proofs/tacexpr.cmo \
-    proofs/refiner.cmi proofs/proof_trees.cmi lib/pp.cmi kernel/names.cmi \
-    proofs/logic.cmi interp/constrextern.cmi proofs/tactic_debug.cmi 
-proofs/tactic_debug.cmx: pretyping/termops.cmx proofs/tacexpr.cmx \
-    proofs/refiner.cmx proofs/proof_trees.cmx lib/pp.cmx kernel/names.cmx \
-    proofs/logic.cmx interp/constrextern.cmx proofs/tactic_debug.cmi 
-scripts/coqc.cmo: toplevel/usage.cmi config/coq_config.cmi 
-scripts/coqc.cmx: toplevel/usage.cmx config/coq_config.cmx 
-scripts/coqmktop.cmo: scripts/tolink.cmo config/coq_config.cmi 
-scripts/coqmktop.cmx: scripts/tolink.cmx config/coq_config.cmx 
-tactics/auto.cmo: toplevel/vernacexpr.cmo lib/util.cmi pretyping/typing.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo library/summary.cmi kernel/sign.cmi proofs/refiner.cmi \
-    kernel/reduction.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi proofs/pfedit.cmi \
-    pretyping/pattern.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi kernel/mod_subst.cmi \
-    pretyping/matching.cmi proofs/logic.cmi library/library.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    kernel/inductive.cmi tactics/hipattern.cmi tactics/hiddentac.cmi \
-    lib/gmap.cmi library/global.cmi interp/genarg.cmi pretyping/evd.cmi \
-    proofs/evar_refiner.cmi kernel/environ.cmi tactics/dhyp.cmi \
-    kernel/declarations.cmi interp/constrintern.cmi pretyping/clenv.cmi \
-    tactics/btermdn.cmi tactics/auto.cmi 
-tactics/auto.cmx: toplevel/vernacexpr.cmx lib/util.cmx pretyping/typing.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
-    proofs/tacexpr.cmx library/summary.cmx kernel/sign.cmx proofs/refiner.cmx \
-    kernel/reduction.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx proofs/pfedit.cmx \
-    pretyping/pattern.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx kernel/mod_subst.cmx \
-    pretyping/matching.cmx proofs/logic.cmx library/library.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    kernel/inductive.cmx tactics/hipattern.cmx tactics/hiddentac.cmx \
-    lib/gmap.cmx library/global.cmx interp/genarg.cmx pretyping/evd.cmx \
-    proofs/evar_refiner.cmx kernel/environ.cmx tactics/dhyp.cmx \
-    kernel/declarations.cmx interp/constrintern.cmx pretyping/clenv.cmx \
-    tactics/btermdn.cmx tactics/auto.cmi 
-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 
-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 
-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/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/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 \
-    pretyping/rawterm.cmi proofs/proof_type.cmi lib/pp.cmi parsing/pcoq.cmi \
-    pretyping/pattern.cmi tactics/nbtermdn.cmi kernel/names.cmi \
-    pretyping/matching.cmi library/library.cmi library/libobject.cmi \
-    library/libnames.cmi library/lib.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi interp/constrintern.cmi pretyping/clenv.cmi \
+proofs/refiner.cmo: kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/global.cmi proofs/logic.cmi lib/pp.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
+    kernel/sign.cmi proofs/tacexpr.cmo kernel/term.cmi pretyping/termops.cmi \
+    kernel/type_errors.cmi lib/util.cmi proofs/refiner.cmi 
+proofs/refiner.cmx: kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/global.cmx proofs/logic.cmx lib/pp.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
+    kernel/sign.cmx proofs/tacexpr.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/type_errors.cmx lib/util.cmx proofs/refiner.cmi 
+proofs/tacexpr.cmo: library/decl_kinds.cmo lib/dyn.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+proofs/tacexpr.cmx: library/decl_kinds.cmx lib/dyn.cmx interp/genarg.cmx \
+    library/libnames.cmx kernel/names.cmx library/nametab.cmx \
+    pretyping/pattern.cmx pretyping/rawterm.cmx kernel/term.cmx \
+    interp/topconstr.cmx lib/util.cmx 
+proofs/tacmach.cmo: interp/constrintern.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi proofs/logic.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi proofs/redexpr.cmi pretyping/reductionops.cmi \
+    proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo \
+    pretyping/tacred.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi lib/util.cmi proofs/tacmach.cmi 
+proofs/tacmach.cmx: interp/constrintern.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx proofs/logic.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    pretyping/rawterm.cmx proofs/redexpr.cmx pretyping/reductionops.cmx \
+    proofs/refiner.cmx kernel/sign.cmx proofs/tacexpr.cmx \
+    pretyping/tacred.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx lib/util.cmx proofs/tacmach.cmi 
+proofs/tactic_debug.cmo: interp/constrextern.cmi proofs/logic.cmi \
+    kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo pretyping/termops.cmi proofs/tactic_debug.cmi 
+proofs/tactic_debug.cmx: interp/constrextern.cmx proofs/logic.cmx \
+    kernel/names.cmx lib/pp.cmx proofs/proof_trees.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx pretyping/termops.cmx proofs/tactic_debug.cmi 
+scripts/coqc.cmo: config/coq_config.cmi toplevel/usage.cmi 
+scripts/coqc.cmx: config/coq_config.cmx toplevel/usage.cmx 
+scripts/coqmktop.cmo: config/coq_config.cmi scripts/tolink.cmo 
+scripts/coqmktop.cmx: config/coq_config.cmx scripts/tolink.cmx 
+tactics/auto.cmo: tactics/btermdn.cmi pretyping/clenv.cmi \
+    interp/constrintern.cmi kernel/declarations.cmi tactics/dhyp.cmi \
+    kernel/environ.cmi proofs/evar_refiner.cmi pretyping/evd.cmi \
+    interp/genarg.cmi library/global.cmi lib/gmap.cmi tactics/hiddentac.cmi \
+    tactics/hipattern.cmi kernel/inductive.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    proofs/logic.cmi pretyping/matching.cmi kernel/mod_subst.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi proofs/pfedit.cmi lib/pp.cmi parsing/pptactic.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi proofs/refiner.cmi kernel/sign.cmi \
+    library/summary.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    pretyping/tacred.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo tactics/auto.cmi 
+tactics/auto.cmx: tactics/btermdn.cmx pretyping/clenv.cmx \
+    interp/constrintern.cmx kernel/declarations.cmx tactics/dhyp.cmx \
+    kernel/environ.cmx proofs/evar_refiner.cmx pretyping/evd.cmx \
+    interp/genarg.cmx library/global.cmx lib/gmap.cmx tactics/hiddentac.cmx \
+    tactics/hipattern.cmx kernel/inductive.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    proofs/logic.cmx pretyping/matching.cmx kernel/mod_subst.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx proofs/pfedit.cmx lib/pp.cmx parsing/pptactic.cmx \
+    parsing/printer.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx proofs/refiner.cmx kernel/sign.cmx \
+    library/summary.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
+    pretyping/tacred.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx tactics/auto.cmi 
+tactics/autorewrite.cmo: kernel/environ.cmi tactics/equality.cmi \
+    pretyping/evd.cmi library/global.cmi tactics/hipattern.cmi \
+    library/lib.cmi library/libobject.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi library/summary.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi tactics/autorewrite.cmi 
+tactics/autorewrite.cmx: kernel/environ.cmx tactics/equality.cmx \
+    pretyping/evd.cmx library/global.cmx tactics/hipattern.cmx \
+    library/lib.cmx library/libobject.cmx kernel/mod_subst.cmx \
+    kernel/names.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx library/summary.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx tactics/autorewrite.cmi 
+tactics/btermdn.cmo: tactics/dn.cmi library/libnames.cmi \
+    pretyping/pattern.cmi kernel/term.cmi tactics/termdn.cmi \
+    tactics/btermdn.cmi 
+tactics/btermdn.cmx: tactics/dn.cmx library/libnames.cmx \
+    pretyping/pattern.cmx kernel/term.cmx tactics/termdn.cmx \
+    tactics/btermdn.cmi 
+tactics/contradiction.cmo: interp/coqlib.cmi tactics/hipattern.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi pretyping/reductionops.cmi \
+    proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi lib/util.cmi tactics/contradiction.cmi 
+tactics/contradiction.cmx: interp/coqlib.cmx tactics/hipattern.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
+    proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx lib/util.cmx tactics/contradiction.cmi 
+tactics/dhyp.cmo: pretyping/clenv.cmi interp/constrintern.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    pretyping/matching.cmi kernel/names.cmi tactics/nbtermdn.cmi \
+    pretyping/pattern.cmi parsing/pcoq.cmi lib/pp.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi kernel/reduction.cmi proofs/refiner.cmi \
+    library/summary.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi \
     tactics/dhyp.cmi 
-tactics/dhyp.cmx: lib/util.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx proofs/tacexpr.cmx \
-    library/summary.cmx proofs/refiner.cmx kernel/reduction.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx lib/pp.cmx parsing/pcoq.cmx \
-    pretyping/pattern.cmx tactics/nbtermdn.cmx kernel/names.cmx \
-    pretyping/matching.cmx library/library.cmx library/libobject.cmx \
-    library/libnames.cmx library/lib.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx interp/constrintern.cmx pretyping/clenv.cmx \
+tactics/dhyp.cmx: pretyping/clenv.cmx interp/constrintern.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    pretyping/matching.cmx kernel/names.cmx tactics/nbtermdn.cmx \
+    pretyping/pattern.cmx parsing/pcoq.cmx lib/pp.cmx proofs/proof_type.cmx \
+    pretyping/rawterm.cmx kernel/reduction.cmx proofs/refiner.cmx \
+    library/summary.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx \
     tactics/dhyp.cmi 
 tactics/dn.cmo: lib/tlm.cmi tactics/dn.cmi 
 tactics/dn.cmx: lib/tlm.cmx tactics/dn.cmi 
-tactics/eauto.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    tactics/tacinterp.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    proofs/refiner.cmi kernel/reduction.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi parsing/pptactic.cmi \
-    lib/pp.cmi parsing/pcoq.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/nameops.cmi proofs/logic.cmi parsing/lexer.cmi library/global.cmi \
-    interp/genarg.cmi lib/explore.cmi proofs/evar_refiner.cmi \
-    parsing/egrammar.cmi kernel/declarations.cmi proofs/clenvtac.cmi \
-    pretyping/clenv.cmi toplevel/cerrors.cmi tactics/auto.cmi \
-    tactics/eauto.cmi 
-tactics/eauto.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
-    tactics/tacinterp.cmx proofs/tacexpr.cmx kernel/sign.cmx \
-    proofs/refiner.cmx kernel/reduction.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx proofs/proof_trees.cmx parsing/pptactic.cmx \
-    lib/pp.cmx parsing/pcoq.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/nameops.cmx proofs/logic.cmx parsing/lexer.cmx library/global.cmx \
-    interp/genarg.cmx lib/explore.cmx proofs/evar_refiner.cmx \
-    parsing/egrammar.cmx kernel/declarations.cmx proofs/clenvtac.cmx \
-    pretyping/clenv.cmx toplevel/cerrors.cmx tactics/auto.cmx \
-    tactics/eauto.cmi 
-tactics/elim.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo proofs/refiner.cmi kernel/reduction.cmi \
-    proofs/proof_type.cmi parsing/printer.cmi lib/pp.cmi kernel/names.cmi \
-    library/libnames.cmi pretyping/inductiveops.cmi tactics/hipattern.cmi \
-    tactics/hiddentac.cmi interp/genarg.cmi kernel/environ.cmi \
-    pretyping/clenv.cmi tactics/elim.cmi 
-tactics/elim.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
-    proofs/tacexpr.cmx proofs/refiner.cmx kernel/reduction.cmx \
-    proofs/proof_type.cmx parsing/printer.cmx lib/pp.cmx kernel/names.cmx \
-    library/libnames.cmx pretyping/inductiveops.cmx tactics/hipattern.cmx \
-    tactics/hiddentac.cmx interp/genarg.cmx kernel/environ.cmx \
-    pretyping/clenv.cmx tactics/elim.cmi 
-tactics/eqdecide.cmo: lib/util.cmi kernel/term.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 proofs/proof_trees.cmi parsing/pptactic.cmi \
-    lib/pp.cmi parsing/pcoq.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/matching.cmi tactics/hipattern.cmi \
-    tactics/hiddentac.cmi library/global.cmi interp/genarg.cmi \
-    tactics/extratactics.cmi tactics/equality.cmi parsing/egrammar.cmi \
-    kernel/declarations.cmi interp/coqlib.cmi toplevel/cerrors.cmi \
-    tactics/auto.cmi 
-tactics/eqdecide.cmx: lib/util.cmx kernel/term.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 proofs/proof_trees.cmx parsing/pptactic.cmx \
-    lib/pp.cmx parsing/pcoq.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/matching.cmx tactics/hipattern.cmx \
-    tactics/hiddentac.cmx library/global.cmx interp/genarg.cmx \
-    tactics/extratactics.cmx tactics/equality.cmx parsing/egrammar.cmx \
-    kernel/declarations.cmx interp/coqlib.cmx toplevel/cerrors.cmx \
-    tactics/auto.cmx 
-tactics/equality.cmo: toplevel/vernacexpr.cmo lib/util.cmi kernel/univ.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 proofs/tacexpr.cmo \
-    kernel/sign.cmi tactics/setoid_replace.cmi pretyping/retyping.cmi \
-    pretyping/reductionops.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    lib/pp.cmi pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    pretyping/matching.cmi proofs/logic.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi pretyping/indrec.cmi \
-    tactics/hipattern.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    pretyping/evarconv.cmi proofs/evar_refiner.cmi kernel/environ.cmi \
-    kernel/declarations.cmi interp/coqlib.cmi tactics/equality.cmi 
-tactics/equality.cmx: toplevel/vernacexpr.cmx lib/util.cmx kernel/univ.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 proofs/tacexpr.cmx \
-    kernel/sign.cmx tactics/setoid_replace.cmx pretyping/retyping.cmx \
-    pretyping/reductionops.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    lib/pp.cmx pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
-    pretyping/matching.cmx proofs/logic.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx pretyping/indrec.cmx \
-    tactics/hipattern.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    pretyping/evarconv.cmx proofs/evar_refiner.cmx kernel/environ.cmx \
-    kernel/declarations.cmx interp/coqlib.cmx tactics/equality.cmi 
-tactics/evar_tactics.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    proofs/refiner.cmi proofs/proof_type.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi proofs/evar_refiner.cmi kernel/environ.cmi \
+tactics/eauto.cmo: tactics/auto.cmi toplevel/cerrors.cmi pretyping/clenv.cmi \
+    proofs/clenvtac.cmi kernel/declarations.cmi parsing/egrammar.cmi \
+    proofs/evar_refiner.cmi lib/explore.cmi interp/genarg.cmi \
+    library/global.cmi parsing/lexer.cmi proofs/logic.cmi library/nameops.cmi \
+    kernel/names.cmi pretyping/pattern.cmi parsing/pcoq.cmi lib/pp.cmi \
+    parsing/pptactic.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi kernel/reduction.cmi proofs/refiner.cmi \
+    kernel/sign.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi tactics/eauto.cmi 
+tactics/eauto.cmx: tactics/auto.cmx toplevel/cerrors.cmx pretyping/clenv.cmx \
+    proofs/clenvtac.cmx kernel/declarations.cmx parsing/egrammar.cmx \
+    proofs/evar_refiner.cmx lib/explore.cmx interp/genarg.cmx \
+    library/global.cmx parsing/lexer.cmx proofs/logic.cmx library/nameops.cmx \
+    kernel/names.cmx pretyping/pattern.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/pptactic.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    pretyping/rawterm.cmx kernel/reduction.cmx proofs/refiner.cmx \
+    kernel/sign.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx tactics/eauto.cmi 
+tactics/elim.cmo: pretyping/clenv.cmi kernel/environ.cmi interp/genarg.cmi \
+    tactics/hiddentac.cmi tactics/hipattern.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi kernel/reduction.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
+    tactics/elim.cmi 
+tactics/elim.cmx: pretyping/clenv.cmx kernel/environ.cmx interp/genarg.cmx \
+    tactics/hiddentac.cmx tactics/hipattern.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx kernel/reduction.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
+    tactics/elim.cmi 
+tactics/eqdecide.cmo: tactics/auto.cmi toplevel/cerrors.cmi interp/coqlib.cmi \
+    kernel/declarations.cmi parsing/egrammar.cmi tactics/equality.cmi \
+    tactics/extratactics.cmi interp/genarg.cmi library/global.cmi \
+    tactics/hiddentac.cmi tactics/hipattern.cmi pretyping/matching.cmi \
+    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
+tactics/eqdecide.cmx: tactics/auto.cmx toplevel/cerrors.cmx interp/coqlib.cmx \
+    kernel/declarations.cmx parsing/egrammar.cmx tactics/equality.cmx \
+    tactics/extratactics.cmx interp/genarg.cmx library/global.cmx \
+    tactics/hiddentac.cmx tactics/hipattern.cmx pretyping/matching.cmx \
+    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
+tactics/equality.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    kernel/environ.cmi proofs/evar_refiner.cmi pretyping/evarconv.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi tactics/hipattern.cmi \
+    pretyping/indrec.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi proofs/logic.cmi pretyping/matching.cmi \
+    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi tactics/setoid_replace.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi pretyping/tacred.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/typeops.cmi pretyping/typing.cmi \
+    kernel/univ.cmi lib/util.cmi toplevel/vernacexpr.cmo tactics/equality.cmi 
+tactics/equality.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    kernel/environ.cmx proofs/evar_refiner.cmx pretyping/evarconv.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx tactics/hipattern.cmx \
+    pretyping/indrec.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx proofs/logic.cmx pretyping/matching.cmx \
+    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx tactics/setoid_replace.cmx kernel/sign.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/typeops.cmx pretyping/typing.cmx \
+    kernel/univ.cmx lib/util.cmx toplevel/vernacexpr.cmx tactics/equality.cmi 
+tactics/evar_tactics.cmo: kernel/environ.cmi proofs/evar_refiner.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi proofs/proof_type.cmi \
+    proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     tactics/evar_tactics.cmi 
-tactics/evar_tactics.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx proofs/tacmach.cmx proofs/tacexpr.cmx kernel/sign.cmx \
-    proofs/refiner.cmx proofs/proof_type.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx proofs/evar_refiner.cmx kernel/environ.cmx \
+tactics/evar_tactics.cmx: kernel/environ.cmx proofs/evar_refiner.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx proofs/proof_type.cmx \
+    proofs/refiner.cmx kernel/sign.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx lib/util.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/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 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 \
-    toplevel/cerrors.cmi tactics/autorewrite.cmi tactics/extratactics.cmi 
-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 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 \
-    toplevel/cerrors.cmx tactics/autorewrite.cmx tactics/extratactics.cmi 
-tactics/hiddentac.cmo: lib/util.cmi kernel/term.cmi tactics/tactics.cmi \
-    proofs/tacmach.cmi proofs/tacexpr.cmo proofs/refiner.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi interp/genarg.cmi \
-    tactics/evar_tactics.cmi tactics/hiddentac.cmi 
-tactics/hiddentac.cmx: lib/util.cmx kernel/term.cmx tactics/tactics.cmx \
-    proofs/tacmach.cmx proofs/tacexpr.cmx proofs/refiner.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx interp/genarg.cmx \
-    tactics/evar_tactics.cmx tactics/hiddentac.cmi 
-tactics/hipattern.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi pretyping/reductionops.cmi \
-    pretyping/rawterm.cmi proofs/proof_trees.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    pretyping/matching.cmi library/libnames.cmi pretyping/inductiveops.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/declarations.cmi interp/coqlib.cmi pretyping/clenv.cmi \
+tactics/extraargs.cmo: interp/genarg.cmi parsing/lexer.cmi \
+    toplevel/metasyntax.cmi library/nameops.cmi kernel/names.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
+    tactics/setoid_replace.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    lib/util.cmi tactics/extraargs.cmi 
+tactics/extraargs.cmx: interp/genarg.cmx parsing/lexer.cmx \
+    toplevel/metasyntax.cmx library/nameops.cmx kernel/names.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
+    tactics/setoid_replace.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    lib/util.cmx tactics/extraargs.cmi 
+tactics/extratactics.cmo: tactics/autorewrite.cmi toplevel/cerrors.cmi \
+    interp/constrintern.cmi tactics/contradiction.cmi parsing/egrammar.cmi \
+    tactics/equality.cmi tactics/evar_tactics.cmi pretyping/evd.cmi \
+    tactics/extraargs.cmi interp/genarg.cmi library/global.cmi \
+    tactics/inv.cmi tactics/leminv.cmi parsing/lexer.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    pretyping/rawterm.cmi tactics/refine.cmi proofs/refiner.cmi \
+    tactics/setoid_replace.cmi library/summary.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi lib/util.cmi toplevel/vernacinterp.cmi \
+    tactics/extratactics.cmi 
+tactics/extratactics.cmx: tactics/autorewrite.cmx toplevel/cerrors.cmx \
+    interp/constrintern.cmx tactics/contradiction.cmx parsing/egrammar.cmx \
+    tactics/equality.cmx tactics/evar_tactics.cmx pretyping/evd.cmx \
+    tactics/extraargs.cmx interp/genarg.cmx library/global.cmx \
+    tactics/inv.cmx tactics/leminv.cmx parsing/lexer.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx kernel/mod_subst.cmx \
+    kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    pretyping/rawterm.cmx tactics/refine.cmx proofs/refiner.cmx \
+    tactics/setoid_replace.cmx library/summary.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx lib/util.cmx toplevel/vernacinterp.cmx \
+    tactics/extratactics.cmi 
+tactics/hiddentac.cmo: tactics/evar_tactics.cmi interp/genarg.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tactics.cmi kernel/term.cmi \
+    lib/util.cmi tactics/hiddentac.cmi 
+tactics/hiddentac.cmx: tactics/evar_tactics.cmx interp/genarg.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tactics.cmx kernel/term.cmx \
+    lib/util.cmx tactics/hiddentac.cmi 
+tactics/hipattern.cmo: pretyping/clenv.cmi interp/coqlib.cmi \
+    kernel/declarations.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi pretyping/inductiveops.cmi library/libnames.cmi \
+    pretyping/matching.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    pretyping/rawterm.cmi pretyping/reductionops.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     tactics/hipattern.cmi 
-tactics/hipattern.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx pretyping/reductionops.cmx \
-    pretyping/rawterm.cmx proofs/proof_trees.cmx lib/pp.cmx \
-    pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
-    pretyping/matching.cmx library/libnames.cmx pretyping/inductiveops.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    kernel/declarations.cmx interp/coqlib.cmx pretyping/clenv.cmx \
+tactics/hipattern.cmx: pretyping/clenv.cmx interp/coqlib.cmx \
+    kernel/declarations.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/global.cmx pretyping/inductiveops.cmx library/libnames.cmx \
+    pretyping/matching.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    pretyping/rawterm.cmx pretyping/reductionops.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     tactics/hipattern.cmi 
-tactics/inv.cmo: lib/util.cmi pretyping/unification.cmi pretyping/typing.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
-    kernel/sign.cmi pretyping/retyping.cmi pretyping/reductionops.cmi \
-    kernel/reduction.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/printer.cmi lib/pp.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/matching.cmi pretyping/inductiveops.cmi \
-    tactics/hipattern.cmi library/global.cmi interp/genarg.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi proofs/evar_refiner.cmi \
-    tactics/equality.cmi kernel/environ.cmi tactics/elim.cmi \
-    interp/coqlib.cmi pretyping/clenv.cmi tactics/inv.cmi 
-tactics/inv.cmx: lib/util.cmx pretyping/unification.cmx pretyping/typing.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx proofs/tacexpr.cmx \
-    kernel/sign.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
-    kernel/reduction.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    parsing/printer.cmx lib/pp.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/matching.cmx pretyping/inductiveops.cmx \
-    tactics/hipattern.cmx library/global.cmx interp/genarg.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx proofs/evar_refiner.cmx \
-    tactics/equality.cmx kernel/environ.cmx tactics/elim.cmx \
-    interp/coqlib.cmx pretyping/clenv.cmx tactics/inv.cmi 
-tactics/leminv.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi kernel/sign.cmi \
-    kernel/safe_typing.cmi pretyping/reductionops.cmi proofs/proof_type.cmi \
-    proofs/proof_trees.cmi parsing/printer.cmi pretyping/pretyping.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi proofs/pfedit.cmi lib/options.cmi \
-    kernel/names.cmi library/nameops.cmi tactics/inv.cmi \
-    pretyping/inductiveops.cmi library/global.cmi pretyping/evd.cmi \
-    proofs/evar_refiner.cmi kernel/environ.cmi kernel/entries.cmi \
-    library/declare.cmi kernel/declarations.cmi library/decl_kinds.cmo \
-    interp/constrintern.cmi proofs/clenvtac.cmi pretyping/clenv.cmi \
+tactics/inv.cmo: pretyping/clenv.cmi interp/coqlib.cmi tactics/elim.cmi \
+    kernel/environ.cmi tactics/equality.cmi proofs/evar_refiner.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/global.cmi tactics/hipattern.cmi pretyping/inductiveops.cmi \
+    pretyping/matching.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
+    pretyping/reductionops.cmi pretyping/retyping.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi pretyping/unification.cmi lib/util.cmi \
+    tactics/inv.cmi 
+tactics/inv.cmx: pretyping/clenv.cmx interp/coqlib.cmx tactics/elim.cmx \
+    kernel/environ.cmx tactics/equality.cmx proofs/evar_refiner.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/global.cmx tactics/hipattern.cmx pretyping/inductiveops.cmx \
+    pretyping/matching.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
+    pretyping/reductionops.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx pretyping/unification.cmx lib/util.cmx \
+    tactics/inv.cmi 
+tactics/leminv.cmo: pretyping/clenv.cmi proofs/clenvtac.cmi \
+    interp/constrintern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi kernel/entries.cmi kernel/environ.cmi \
+    proofs/evar_refiner.cmi pretyping/evd.cmi library/global.cmi \
+    pretyping/inductiveops.cmi tactics/inv.cmi library/nameops.cmi \
+    kernel/names.cmi lib/options.cmi proofs/pfedit.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi pretyping/pretyping.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi toplevel/vernacexpr.cmo \
     tactics/leminv.cmi 
-tactics/leminv.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx kernel/sign.cmx \
-    kernel/safe_typing.cmx pretyping/reductionops.cmx proofs/proof_type.cmx \
-    proofs/proof_trees.cmx parsing/printer.cmx pretyping/pretyping.cmx \
-    pretyping/pretype_errors.cmx lib/pp.cmx proofs/pfedit.cmx lib/options.cmx \
-    kernel/names.cmx library/nameops.cmx tactics/inv.cmx \
-    pretyping/inductiveops.cmx library/global.cmx pretyping/evd.cmx \
-    proofs/evar_refiner.cmx kernel/environ.cmx kernel/entries.cmx \
-    library/declare.cmx kernel/declarations.cmx library/decl_kinds.cmx \
-    interp/constrintern.cmx proofs/clenvtac.cmx pretyping/clenv.cmx \
+tactics/leminv.cmx: pretyping/clenv.cmx proofs/clenvtac.cmx \
+    interp/constrintern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx kernel/entries.cmx kernel/environ.cmx \
+    proofs/evar_refiner.cmx pretyping/evd.cmx library/global.cmx \
+    pretyping/inductiveops.cmx tactics/inv.cmx library/nameops.cmx \
+    kernel/names.cmx lib/options.cmx proofs/pfedit.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx pretyping/pretyping.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
+    kernel/safe_typing.cmx kernel/sign.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx toplevel/vernacexpr.cmx \
     tactics/leminv.cmi 
-tactics/nbtermdn.cmo: lib/util.cmi tactics/termdn.cmi kernel/term.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/library.cmi \
-    library/libobject.cmi library/libnames.cmi lib/gmap.cmi \
-    tactics/btermdn.cmi tactics/nbtermdn.cmi 
-tactics/nbtermdn.cmx: lib/util.cmx tactics/termdn.cmx kernel/term.cmx \
-    pretyping/pattern.cmx kernel/names.cmx library/library.cmx \
-    library/libobject.cmx library/libnames.cmx lib/gmap.cmx \
-    tactics/btermdn.cmx tactics/nbtermdn.cmi 
-tactics/refine.cmo: lib/util.cmi pretyping/typing.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    proofs/tacmach.cmi kernel/sign.cmi pretyping/retyping.cmi \
-    proofs/refiner.cmi kernel/reduction.cmi parsing/printer.cmi lib/pp.cmi \
-    kernel/names.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    kernel/environ.cmi tactics/refine.cmi 
-tactics/refine.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
-    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    proofs/tacmach.cmx kernel/sign.cmx pretyping/retyping.cmx \
-    proofs/refiner.cmx kernel/reduction.cmx parsing/printer.cmx lib/pp.cmx \
-    kernel/names.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    kernel/environ.cmx tactics/refine.cmi 
-tactics/setoid_replace.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    pretyping/unification.cmi pretyping/typing.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
-    library/summary.cmi kernel/sign.cmi kernel/safe_typing.cmi \
-    pretyping/reductionops.cmi kernel/reduction.cmi 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 \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    kernel/mod_subst.cmi proofs/logic.cmi library/libobject.cmi \
-    library/libnames.cmi library/lib.cmi lib/gmap.cmi library/global.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi \
-    kernel/entries.cmi library/declare.cmi library/decl_kinds.cmo \
-    interp/coqlib.cmi interp/constrintern.cmi kernel/closure.cmi \
-    pretyping/clenv.cmi tactics/setoid_replace.cmi 
-tactics/setoid_replace.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    pretyping/unification.cmx pretyping/typing.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
-    library/summary.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    pretyping/reductionops.cmx kernel/reduction.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 \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx proofs/logic.cmx library/libobject.cmx \
-    library/libnames.cmx library/lib.cmx lib/gmap.cmx library/global.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx kernel/environ.cmx \
-    kernel/entries.cmx library/declare.cmx library/decl_kinds.cmx \
-    interp/coqlib.cmx interp/constrintern.cmx kernel/closure.cmx \
-    pretyping/clenv.cmx tactics/setoid_replace.cmi 
-tactics/tacinterp.cmo: lib/util.cmi pretyping/typing.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    proofs/tactic_debug.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo lib/system.cmi interp/syntax_def.cmi \
-    library/summary.cmi kernel/sign.cmi kernel/safe_typing.cmi \
-    pretyping/retyping.cmi proofs/refiner.cmi pretyping/reductionops.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
-    pretyping/pretyping.cmi pretyping/pretype_errors.cmi parsing/pptactic.cmi \
-    lib/pp.cmi proofs/pfedit.cmi pretyping/pattern.cmi lib/options.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    kernel/mod_subst.cmi pretyping/matching.cmi proofs/logic.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    tactics/leminv.cmi tactics/inv.cmi pretyping/inductiveops.cmi \
-    tactics/hiddentac.cmi lib/gmap.cmi library/global.cmi interp/genarg.cmi \
-    parsing/g_xml.cmo pretyping/evd.cmi kernel/environ.cmi kernel/entries.cmi \
-    tactics/elim.cmi lib/dyn.cmi tactics/dhyp.cmi pretyping/detyping.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo interp/constrintern.cmi \
-    kernel/closure.cmi tactics/auto.cmi tactics/tacinterp.cmi 
-tactics/tacinterp.cmx: lib/util.cmx pretyping/typing.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    proofs/tactic_debug.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
-    proofs/tacexpr.cmx lib/system.cmx interp/syntax_def.cmx \
-    library/summary.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    pretyping/retyping.cmx proofs/refiner.cmx pretyping/reductionops.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
-    pretyping/pretyping.cmx pretyping/pretype_errors.cmx parsing/pptactic.cmx \
-    lib/pp.cmx proofs/pfedit.cmx pretyping/pattern.cmx lib/options.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx pretyping/matching.cmx proofs/logic.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    tactics/leminv.cmx tactics/inv.cmx pretyping/inductiveops.cmx \
-    tactics/hiddentac.cmx lib/gmap.cmx library/global.cmx interp/genarg.cmx \
-    parsing/g_xml.cmx pretyping/evd.cmx kernel/environ.cmx kernel/entries.cmx \
-    tactics/elim.cmx lib/dyn.cmx tactics/dhyp.cmx pretyping/detyping.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx interp/constrintern.cmx \
-    kernel/closure.cmx tactics/auto.cmx tactics/tacinterp.cmi 
-tactics/tacticals.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi proofs/refiner.cmi \
-    kernel/reduction.cmi lib/pp.cmi pretyping/pattern.cmi kernel/names.cmi \
-    pretyping/matching.cmi library/libnames.cmi kernel/inductive.cmi \
-    pretyping/indrec.cmi library/global.cmi interp/genarg.cmi \
-    pretyping/evd.cmi proofs/evar_refiner.cmi kernel/environ.cmi \
-    kernel/declarations.cmi proofs/clenvtac.cmi pretyping/clenv.cmi \
-    tactics/tacticals.cmi 
-tactics/tacticals.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    proofs/tacmach.cmx proofs/tacexpr.cmx kernel/sign.cmx proofs/refiner.cmx \
-    kernel/reduction.cmx lib/pp.cmx pretyping/pattern.cmx kernel/names.cmx \
-    pretyping/matching.cmx library/libnames.cmx kernel/inductive.cmx \
-    pretyping/indrec.cmx library/global.cmx interp/genarg.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 \
-    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 \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi proofs/logic.cmi \
-    library/libnames.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
-    pretyping/indrec.cmi tactics/hipattern.cmi library/global.cmi \
-    interp/genarg.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    proofs/evar_refiner.cmi kernel/environ.cmi kernel/entries.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 \
-    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 \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx proofs/logic.cmx \
-    library/libnames.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
-    pretyping/indrec.cmx tactics/hipattern.cmx library/global.cmx \
-    interp/genarg.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    proofs/evar_refiner.cmx kernel/environ.cmx kernel/entries.cmx \
-    library/declare.cmx kernel/declarations.cmx library/decl_kinds.cmx \
-    interp/coqlib.cmx interp/constrintern.cmx proofs/clenvtac.cmx \
-    pretyping/clenv.cmx tactics/tactics.cmi 
-tactics/tauto.cmo: lib/util.cmi interp/topconstr.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    proofs/refiner.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi \
-    library/libnames.cmi tactics/hipattern.cmi interp/genarg.cmi \
-    parsing/egrammar.cmi toplevel/cerrors.cmi 
-tactics/tauto.cmx: lib/util.cmx interp/topconstr.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    proofs/refiner.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx \
-    library/libnames.cmx tactics/hipattern.cmx interp/genarg.cmx \
-    parsing/egrammar.cmx toplevel/cerrors.cmx 
-tactics/termdn.cmo: lib/util.cmi kernel/term.cmi pretyping/rawterm.cmi \
-    pretyping/pattern.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi tactics/dn.cmi \
-    tactics/termdn.cmi 
-tactics/termdn.cmx: lib/util.cmx kernel/term.cmx pretyping/rawterm.cmx \
-    pretyping/pattern.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx tactics/dn.cmx \
-    tactics/termdn.cmi 
-tools/coqdep.cmo: tools/coqdep_lexer.cmo config/coq_config.cmi 
-tools/coqdep.cmx: tools/coqdep_lexer.cmx config/coq_config.cmx 
+tactics/nbtermdn.cmo: tactics/btermdn.cmi lib/gmap.cmi library/libnames.cmi \
+    library/libobject.cmi library/library.cmi kernel/names.cmi \
+    pretyping/pattern.cmi kernel/term.cmi tactics/termdn.cmi lib/util.cmi \
+    tactics/nbtermdn.cmi 
+tactics/nbtermdn.cmx: tactics/btermdn.cmx lib/gmap.cmx library/libnames.cmx \
+    library/libobject.cmx library/library.cmx kernel/names.cmx \
+    pretyping/pattern.cmx kernel/term.cmx tactics/termdn.cmx lib/util.cmx \
+    tactics/nbtermdn.cmi 
+tactics/refine.cmo: kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
+    kernel/reduction.cmi proofs/refiner.cmi pretyping/retyping.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi lib/util.cmi tactics/refine.cmi 
+tactics/refine.cmx: kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
+    kernel/reduction.cmx proofs/refiner.cmx pretyping/retyping.cmx \
+    kernel/sign.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx lib/util.cmx tactics/refine.cmi 
+tactics/setoid_replace.cmo: pretyping/clenv.cmi kernel/closure.cmi \
+    interp/constrintern.cmi interp/coqlib.cmi library/decl_kinds.cmo \
+    library/declare.cmi kernel/entries.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi lib/gmap.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    proofs/logic.cmi kernel/mod_subst.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi proofs/pfedit.cmi \
+    lib/pp.cmi parsing/ppconstr.cmi pretyping/pretype_errors.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi pretyping/reductionops.cmi kernel/safe_typing.cmi \
+    kernel/sign.cmi library/summary.cmi proofs/tacmach.cmi \
+    pretyping/tacred.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi \
+    pretyping/typing.cmi pretyping/unification.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo tactics/setoid_replace.cmi 
+tactics/setoid_replace.cmx: pretyping/clenv.cmx kernel/closure.cmx \
+    interp/constrintern.cmx interp/coqlib.cmx library/decl_kinds.cmx \
+    library/declare.cmx kernel/entries.cmx kernel/environ.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx lib/gmap.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    proofs/logic.cmx kernel/mod_subst.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx proofs/pfedit.cmx \
+    lib/pp.cmx parsing/ppconstr.cmx pretyping/pretype_errors.cmx \
+    parsing/printer.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx pretyping/reductionops.cmx kernel/safe_typing.cmx \
+    kernel/sign.cmx library/summary.cmx proofs/tacmach.cmx \
+    pretyping/tacred.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx \
+    pretyping/typing.cmx pretyping/unification.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx tactics/setoid_replace.cmi 
+tactics/tacinterp.cmo: tactics/auto.cmi kernel/closure.cmi \
+    interp/constrintern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    pretyping/detyping.cmi tactics/dhyp.cmi lib/dyn.cmi tactics/elim.cmi \
+    kernel/entries.cmi kernel/environ.cmi pretyping/evd.cmi parsing/g_xml.cmo \
+    interp/genarg.cmi library/global.cmi lib/gmap.cmi tactics/hiddentac.cmi \
+    pretyping/inductiveops.cmi tactics/inv.cmi tactics/leminv.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    proofs/logic.cmi pretyping/matching.cmi kernel/mod_subst.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi proofs/pfedit.cmi lib/pp.cmi parsing/pptactic.cmi \
+    pretyping/pretype_errors.cmi pretyping/pretyping.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi pretyping/reductionops.cmi \
+    proofs/refiner.cmi pretyping/retyping.cmi kernel/safe_typing.cmi \
+    kernel/sign.cmi library/summary.cmi interp/syntax_def.cmi lib/system.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi pretyping/tacred.cmi \
+    proofs/tactic_debug.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi pretyping/typing.cmi \
+    lib/util.cmi tactics/tacinterp.cmi 
+tactics/tacinterp.cmx: tactics/auto.cmx kernel/closure.cmx \
+    interp/constrintern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    pretyping/detyping.cmx tactics/dhyp.cmx lib/dyn.cmx tactics/elim.cmx \
+    kernel/entries.cmx kernel/environ.cmx pretyping/evd.cmx parsing/g_xml.cmx \
+    interp/genarg.cmx library/global.cmx lib/gmap.cmx tactics/hiddentac.cmx \
+    pretyping/inductiveops.cmx tactics/inv.cmx tactics/leminv.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    proofs/logic.cmx pretyping/matching.cmx kernel/mod_subst.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx proofs/pfedit.cmx lib/pp.cmx parsing/pptactic.cmx \
+    pretyping/pretype_errors.cmx pretyping/pretyping.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
+    proofs/refiner.cmx pretyping/retyping.cmx kernel/safe_typing.cmx \
+    kernel/sign.cmx library/summary.cmx interp/syntax_def.cmx lib/system.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    proofs/tactic_debug.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx pretyping/typing.cmx \
+    lib/util.cmx tactics/tacinterp.cmi 
+tactics/tacticals.cmo: pretyping/clenv.cmi proofs/clenvtac.cmi \
+    kernel/declarations.cmi kernel/environ.cmi proofs/evar_refiner.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    pretyping/indrec.cmi kernel/inductive.cmi library/libnames.cmi \
+    pretyping/matching.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
+    kernel/reduction.cmi proofs/refiner.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi tactics/tacticals.cmi 
+tactics/tacticals.cmx: pretyping/clenv.cmx proofs/clenvtac.cmx \
+    kernel/declarations.cmx kernel/environ.cmx proofs/evar_refiner.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    pretyping/indrec.cmx kernel/inductive.cmx library/libnames.cmx \
+    pretyping/matching.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
+    kernel/reduction.cmx proofs/refiner.cmx kernel/sign.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx tactics/tacticals.cmi 
+tactics/tactics.cmo: pretyping/clenv.cmi proofs/clenvtac.cmi \
+    interp/constrintern.cmi interp/coqlib.cmi library/decl_kinds.cmo \
+    kernel/declarations.cmi library/declare.cmi kernel/entries.cmi \
+    kernel/environ.cmi proofs/evar_refiner.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    tactics/hipattern.cmi pretyping/indrec.cmi kernel/inductive.cmi \
+    pretyping/inductiveops.cmi library/libnames.cmi proofs/logic.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    proofs/pfedit.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    proofs/redexpr.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    proofs/refiner.cmi kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
+    pretyping/tacred.cmi tactics/tacticals.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi tactics/tactics.cmi 
+tactics/tactics.cmx: pretyping/clenv.cmx proofs/clenvtac.cmx \
+    interp/constrintern.cmx interp/coqlib.cmx library/decl_kinds.cmx \
+    kernel/declarations.cmx library/declare.cmx kernel/entries.cmx \
+    kernel/environ.cmx proofs/evar_refiner.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    tactics/hipattern.cmx pretyping/indrec.cmx kernel/inductive.cmx \
+    pretyping/inductiveops.cmx library/libnames.cmx proofs/logic.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    proofs/pfedit.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    proofs/redexpr.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    proofs/refiner.cmx kernel/sign.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
+    pretyping/tacred.cmx tactics/tacticals.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx tactics/tactics.cmi 
+tactics/tauto.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    interp/genarg.cmi tactics/hipattern.cmi library/libnames.cmi \
+    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi interp/topconstr.cmi lib/util.cmi 
+tactics/tauto.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    interp/genarg.cmx tactics/hipattern.cmx library/libnames.cmx \
+    kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx interp/topconstr.cmx lib/util.cmx 
+tactics/termdn.cmo: tactics/dn.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi pretyping/pattern.cmi \
+    pretyping/rawterm.cmi kernel/term.cmi lib/util.cmi tactics/termdn.cmi 
+tactics/termdn.cmx: tactics/dn.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx pretyping/pattern.cmx \
+    pretyping/rawterm.cmx kernel/term.cmx lib/util.cmx tactics/termdn.cmi 
+tools/coqdep.cmo: config/coq_config.cmi tools/coqdep_lexer.cmo 
+tools/coqdep.cmx: config/coq_config.cmx tools/coqdep_lexer.cmx 
 tools/gallina.cmo: tools/gallina_lexer.cmo 
 tools/gallina.cmx: tools/gallina_lexer.cmx 
-toplevel/cerrors.cmo: lib/util.cmi kernel/univ.cmi kernel/type_errors.cmi \
-    proofs/tactic_debug.cmi pretyping/tacred.cmi proofs/refiner.cmi \
-    pretyping/pretype_errors.cmi lib/pp.cmi lib/options.cmi \
-    library/nametab.cmi proofs/logic.cmi library/libnames.cmi \
-    parsing/lexer.cmi kernel/indtypes.cmi pretyping/indrec.cmi \
-    toplevel/himsg.cmi pretyping/cases.cmi toplevel/cerrors.cmi 
-toplevel/cerrors.cmx: lib/util.cmx kernel/univ.cmx kernel/type_errors.cmx \
-    proofs/tactic_debug.cmx pretyping/tacred.cmx proofs/refiner.cmx \
-    pretyping/pretype_errors.cmx lib/pp.cmx lib/options.cmx \
-    library/nametab.cmx proofs/logic.cmx library/libnames.cmx \
-    parsing/lexer.cmx kernel/indtypes.cmx pretyping/indrec.cmx \
-    toplevel/himsg.cmx pretyping/cases.cmx toplevel/cerrors.cmi 
-toplevel/class.cmo: lib/util.cmi pretyping/typing.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/sign.cmi kernel/safe_typing.cmi \
-    pretyping/reductionops.cmi parsing/printer.cmi lib/pp.cmi lib/options.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi library/lib.cmi kernel/inductive.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/entries.cmi library/declare.cmi kernel/declarations.cmi \
-    library/decl_kinds.cmo pretyping/classops.cmi toplevel/class.cmi 
-toplevel/class.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    pretyping/reductionops.cmx parsing/printer.cmx lib/pp.cmx lib/options.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx library/lib.cmx kernel/inductive.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    kernel/entries.cmx library/declare.cmx kernel/declarations.cmx \
-    library/decl_kinds.cmx pretyping/classops.cmx toplevel/class.cmi 
-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 proofs/proof_type.cmi \
-    parsing/printer.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 
-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 proofs/proof_type.cmx \
-    parsing/printer.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 
-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 \
+toplevel/cerrors.cmo: pretyping/cases.cmi toplevel/himsg.cmi \
+    pretyping/indrec.cmi kernel/indtypes.cmi parsing/lexer.cmi \
+    library/libnames.cmi proofs/logic.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi pretyping/pretype_errors.cmi proofs/refiner.cmi \
+    pretyping/tacred.cmi proofs/tactic_debug.cmi kernel/type_errors.cmi \
+    kernel/univ.cmi lib/util.cmi toplevel/cerrors.cmi 
+toplevel/cerrors.cmx: pretyping/cases.cmx toplevel/himsg.cmx \
+    pretyping/indrec.cmx kernel/indtypes.cmx parsing/lexer.cmx \
+    library/libnames.cmx proofs/logic.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx pretyping/pretype_errors.cmx proofs/refiner.cmx \
+    pretyping/tacred.cmx proofs/tactic_debug.cmx kernel/type_errors.cmx \
+    kernel/univ.cmx lib/util.cmx toplevel/cerrors.cmi 
+toplevel/class.cmo: pretyping/classops.cmi library/decl_kinds.cmo \
+    kernel/declarations.cmi library/declare.cmi kernel/entries.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    kernel/inductive.cmi library/lib.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi parsing/printer.cmi pretyping/reductionops.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/class.cmi 
+toplevel/class.cmx: pretyping/classops.cmx library/decl_kinds.cmx \
+    kernel/declarations.cmx library/declare.cmx kernel/entries.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    kernel/inductive.cmx library/lib.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx parsing/printer.cmx pretyping/reductionops.cmx \
+    kernel/safe_typing.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/class.cmi 
+toplevel/command.cmo: toplevel/class.cmi interp/constrextern.cmi \
+    interp/constrintern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi kernel/entries.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi library/impargs.cmi \
+    pretyping/indrec.cmi kernel/indtypes.cmi kernel/inductive.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    library/library.cmi proofs/logic.cmi toplevel/metasyntax.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    interp/notation.cmi lib/options.cmi proofs/pfedit.cmi lib/pp.cmi \
+    pretyping/pretyping.cmi parsing/printer.cmi proofs/proof_type.cmi \
+    proofs/redexpr.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi kernel/safe_typing.cmi library/states.cmi \
+    interp/syntax_def.cmi proofs/tacmach.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi kernel/typeops.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo toplevel/command.cmi 
+toplevel/command.cmx: toplevel/class.cmx interp/constrextern.cmx \
+    interp/constrintern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx kernel/entries.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx library/impargs.cmx \
+    pretyping/indrec.cmx kernel/indtypes.cmx kernel/inductive.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    library/library.cmx proofs/logic.cmx toplevel/metasyntax.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    interp/notation.cmx lib/options.cmx proofs/pfedit.cmx lib/pp.cmx \
+    pretyping/pretyping.cmx parsing/printer.cmx proofs/proof_type.cmx \
+    proofs/redexpr.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx kernel/safe_typing.cmx library/states.cmx \
+    interp/syntax_def.cmx proofs/tacmach.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx kernel/typeops.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx toplevel/command.cmi 
+toplevel/coqinit.cmo: config/coq_config.cmi toplevel/mltop.cmi \
+    library/nameops.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
+    lib/system.cmi toplevel/toplevel.cmi toplevel/vernac.cmi \
     toplevel/coqinit.cmi 
-toplevel/coqinit.cmx: toplevel/vernac.cmx toplevel/toplevel.cmx \
-    lib/system.cmx lib/pp.cmx lib/options.cmx kernel/names.cmx \
-    library/nameops.cmx toplevel/mltop.cmx config/coq_config.cmx \
+toplevel/coqinit.cmx: config/coq_config.cmx toplevel/mltop.cmx \
+    library/nameops.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
+    lib/system.cmx toplevel/toplevel.cmx toplevel/vernac.cmx \
     toplevel/coqinit.cmi 
-toplevel/coqtop.cmo: kernel/vm.cmi toplevel/vernac.cmi kernel/vconv.cmi \
-    lib/util.cmi toplevel/usage.cmi toplevel/toplevel.cmi lib/system.cmi \
-    library/states.cmi lib/profile.cmi lib/pp.cmi lib/options.cmi \
-    kernel/names.cmi library/nameops.cmi toplevel/mltop.cmi \
-    library/library.cmi library/libnames.cmi library/lib.cmi \
-    library/global.cmi library/declaremods.cmi kernel/declarations.cmi \
-    toplevel/coqinit.cmi config/coq_config.cmi toplevel/cerrors.cmi \
-    toplevel/coqtop.cmi 
-toplevel/coqtop.cmx: kernel/vm.cmx toplevel/vernac.cmx kernel/vconv.cmx \
-    lib/util.cmx toplevel/usage.cmx toplevel/toplevel.cmx lib/system.cmx \
-    library/states.cmx lib/profile.cmx lib/pp.cmx lib/options.cmx \
-    kernel/names.cmx library/nameops.cmx toplevel/mltop.cmx \
-    library/library.cmx library/libnames.cmx library/lib.cmx \
-    library/global.cmx library/declaremods.cmx kernel/declarations.cmx \
-    toplevel/coqinit.cmx config/coq_config.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/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/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 
-toplevel/fhimsg.cmx: lib/util.cmx kernel/type_errors.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/reduction.cmx lib/pp.cmx kernel/names.cmx \
-    parsing/g_minicoq.cmx kernel/environ.cmx toplevel/fhimsg.cmi 
-toplevel/himsg.cmo: lib/util.cmi kernel/type_errors.cmi pretyping/termops.cmi \
-    kernel/term.cmi pretyping/tacred.cmi kernel/sign.cmi kernel/reduction.cmi \
-    pretyping/rawterm.cmi parsing/printer.cmi pretyping/pretype_errors.cmi \
-    lib/pp.cmi lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi proofs/logic.cmi kernel/inductive.cmi \
-    kernel/indtypes.cmi pretyping/indrec.cmi library/global.cmi \
-    pretyping/evd.cmi kernel/environ.cmi pretyping/cases.cmi \
+toplevel/coqtop.cmo: toplevel/cerrors.cmi config/coq_config.cmi \
+    toplevel/coqinit.cmi kernel/declarations.cmi library/declaremods.cmi \
+    library/global.cmi library/lib.cmi library/libnames.cmi \
+    library/library.cmi toplevel/mltop.cmi library/nameops.cmi \
+    kernel/names.cmi lib/options.cmi lib/pp.cmi lib/profile.cmi \
+    library/states.cmi lib/system.cmi toplevel/toplevel.cmi \
+    toplevel/usage.cmi lib/util.cmi kernel/vconv.cmi toplevel/vernac.cmi \
+    kernel/vm.cmi toplevel/coqtop.cmi 
+toplevel/coqtop.cmx: toplevel/cerrors.cmx config/coq_config.cmx \
+    toplevel/coqinit.cmx kernel/declarations.cmx library/declaremods.cmx \
+    library/global.cmx library/lib.cmx library/libnames.cmx \
+    library/library.cmx toplevel/mltop.cmx library/nameops.cmx \
+    kernel/names.cmx lib/options.cmx lib/pp.cmx lib/profile.cmx \
+    library/states.cmx lib/system.cmx toplevel/toplevel.cmx \
+    toplevel/usage.cmx lib/util.cmx kernel/vconv.cmx toplevel/vernac.cmx \
+    kernel/vm.cmx toplevel/coqtop.cmi 
+toplevel/discharge.cmo: kernel/cooking.cmi kernel/declarations.cmi \
+    kernel/entries.cmi kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi toplevel/discharge.cmi 
+toplevel/discharge.cmx: kernel/cooking.cmx kernel/declarations.cmx \
+    kernel/entries.cmx kernel/names.cmx kernel/sign.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx toplevel/discharge.cmi 
+toplevel/fhimsg.cmo: kernel/environ.cmi parsing/g_minicoq.cmi \
+    kernel/names.cmi lib/pp.cmi kernel/reduction.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/type_errors.cmi lib/util.cmi toplevel/fhimsg.cmi 
+toplevel/fhimsg.cmx: kernel/environ.cmx parsing/g_minicoq.cmx \
+    kernel/names.cmx lib/pp.cmx kernel/reduction.cmx kernel/sign.cmx \
+    kernel/term.cmx kernel/type_errors.cmx lib/util.cmx toplevel/fhimsg.cmi 
+toplevel/himsg.cmo: pretyping/cases.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi pretyping/indrec.cmi kernel/indtypes.cmi \
+    kernel/inductive.cmi proofs/logic.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi kernel/sign.cmi pretyping/tacred.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/type_errors.cmi lib/util.cmi \
     toplevel/himsg.cmi 
-toplevel/himsg.cmx: lib/util.cmx kernel/type_errors.cmx pretyping/termops.cmx \
-    kernel/term.cmx pretyping/tacred.cmx kernel/sign.cmx kernel/reduction.cmx \
-    pretyping/rawterm.cmx parsing/printer.cmx pretyping/pretype_errors.cmx \
-    lib/pp.cmx lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx proofs/logic.cmx kernel/inductive.cmx \
-    kernel/indtypes.cmx pretyping/indrec.cmx library/global.cmx \
-    pretyping/evd.cmx kernel/environ.cmx pretyping/cases.cmx \
+toplevel/himsg.cmx: pretyping/cases.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/global.cmx pretyping/indrec.cmx kernel/indtypes.cmx \
+    kernel/inductive.cmx proofs/logic.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx kernel/sign.cmx pretyping/tacred.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/type_errors.cmx lib/util.cmx \
     toplevel/himsg.cmi 
 toplevel/line_oriented_parser.cmo: toplevel/line_oriented_parser.cmi 
 toplevel/line_oriented_parser.cmx: toplevel/line_oriented_parser.cmi 
-toplevel/metasyntax.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi tactics/tacinterp.cmi library/summary.cmi \
-    pretyping/rawterm.cmi parsing/pptactic.cmi interp/ppextend.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.cmi interp/notation.cmi kernel/names.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    parsing/lexer.cmi library/global.cmi parsing/extend.cmi \
-    parsing/egrammar.cmi interp/constrintern.cmi pretyping/classops.cmi \
-    lib/bigint.cmi toplevel/metasyntax.cmi 
-toplevel/metasyntax.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx tactics/tacinterp.cmx library/summary.cmx \
-    pretyping/rawterm.cmx parsing/pptactic.cmx interp/ppextend.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.cmx interp/notation.cmx kernel/names.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    parsing/lexer.cmx library/global.cmx parsing/extend.cmx \
-    parsing/egrammar.cmx interp/constrintern.cmx pretyping/classops.cmx \
-    lib/bigint.cmx toplevel/metasyntax.cmi 
-toplevel/minicoq.cmo: lib/util.cmi kernel/type_errors.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/safe_typing.cmi lib/pp.cmi kernel/names.cmi \
-    kernel/inductive.cmi parsing/g_minicoq.cmi toplevel/fhimsg.cmi \
-    kernel/declarations.cmi 
-toplevel/minicoq.cmx: lib/util.cmx kernel/type_errors.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/safe_typing.cmx lib/pp.cmx kernel/names.cmx \
-    kernel/inductive.cmx parsing/g_minicoq.cmx toplevel/fhimsg.cmx \
-    kernel/declarations.cmx 
-toplevel/mltop.cmo: toplevel/vernacinterp.cmi lib/util.cmi lib/system.cmi \
-    library/summary.cmi lib/pp.cmi lib/options.cmi kernel/names.cmi \
-    library/library.cmi library/libobject.cmi library/lib.cmi \
-    toplevel/mltop.cmi 
-toplevel/mltop.cmx: toplevel/vernacinterp.cmx lib/util.cmx lib/system.cmx \
-    library/summary.cmx lib/pp.cmx lib/options.cmx kernel/names.cmx \
-    library/library.cmx library/libobject.cmx library/lib.cmx \
-    toplevel/mltop.cmi 
-toplevel/protectedtoplevel.cmo: toplevel/vernacexpr.cmo toplevel/vernac.cmi \
-    lib/pp.cmi parsing/pcoq.cmi toplevel/line_oriented_parser.cmi \
-    toplevel/cerrors.cmi toplevel/protectedtoplevel.cmi 
-toplevel/protectedtoplevel.cmx: toplevel/vernacexpr.cmx toplevel/vernac.cmx \
-    lib/pp.cmx parsing/pcoq.cmx toplevel/line_oriented_parser.cmx \
-    toplevel/cerrors.cmx toplevel/protectedtoplevel.cmi 
-toplevel/record.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    kernel/type_errors.cmi interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/safe_typing.cmi pretyping/recordops.cmi \
-    parsing/printer.cmi lib/pp.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi kernel/indtypes.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 toplevel/command.cmi \
-    toplevel/class.cmi toplevel/record.cmi 
-toplevel/record.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    kernel/type_errors.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/safe_typing.cmx pretyping/recordops.cmx \
-    parsing/printer.cmx lib/pp.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx kernel/indtypes.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 toplevel/command.cmx \
-    toplevel/class.cmx toplevel/record.cmi 
-toplevel/toplevel.cmo: toplevel/vernacexpr.cmo toplevel/vernac.cmi \
-    lib/util.cmi toplevel/protectedtoplevel.cmi parsing/printer.cmi \
-    lib/pp.cmi proofs/pfedit.cmi parsing/pcoq.cmi lib/options.cmi \
-    kernel/names.cmi toplevel/mltop.cmi library/lib.cmi toplevel/cerrors.cmi \
-    toplevel/toplevel.cmi 
-toplevel/toplevel.cmx: toplevel/vernacexpr.cmx toplevel/vernac.cmx \
-    lib/util.cmx toplevel/protectedtoplevel.cmx parsing/printer.cmx \
-    lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx lib/options.cmx \
-    kernel/names.cmx toplevel/mltop.cmx library/lib.cmx toplevel/cerrors.cmx \
-    toplevel/toplevel.cmi 
+toplevel/metasyntax.cmo: lib/bigint.cmi pretyping/classops.cmi \
+    interp/constrintern.cmi parsing/egrammar.cmi parsing/extend.cmi \
+    library/global.cmi parsing/lexer.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi kernel/names.cmi interp/notation.cmi \
+    lib/options.cmi parsing/pcoq.cmi lib/pp.cmi interp/ppextend.cmi \
+    parsing/pptactic.cmi pretyping/rawterm.cmi library/summary.cmi \
+    tactics/tacinterp.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/metasyntax.cmi 
+toplevel/metasyntax.cmx: lib/bigint.cmx pretyping/classops.cmx \
+    interp/constrintern.cmx parsing/egrammar.cmx parsing/extend.cmx \
+    library/global.cmx parsing/lexer.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx kernel/names.cmx interp/notation.cmx \
+    lib/options.cmx parsing/pcoq.cmx lib/pp.cmx interp/ppextend.cmx \
+    parsing/pptactic.cmx pretyping/rawterm.cmx library/summary.cmx \
+    tactics/tacinterp.cmx interp/topconstr.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx toplevel/metasyntax.cmi 
+toplevel/minicoq.cmo: kernel/declarations.cmi toplevel/fhimsg.cmi \
+    parsing/g_minicoq.cmi kernel/inductive.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/type_errors.cmi lib/util.cmi 
+toplevel/minicoq.cmx: kernel/declarations.cmx toplevel/fhimsg.cmx \
+    parsing/g_minicoq.cmx kernel/inductive.cmx kernel/names.cmx lib/pp.cmx \
+    kernel/safe_typing.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/type_errors.cmx lib/util.cmx 
+toplevel/mltop.cmo: library/lib.cmi library/libobject.cmi library/library.cmi \
+    kernel/names.cmi lib/options.cmi lib/pp.cmi library/summary.cmi \
+    lib/system.cmi lib/util.cmi toplevel/vernacinterp.cmi toplevel/mltop.cmi 
+toplevel/mltop.cmx: library/lib.cmx library/libobject.cmx library/library.cmx \
+    kernel/names.cmx lib/options.cmx lib/pp.cmx library/summary.cmx \
+    lib/system.cmx lib/util.cmx toplevel/vernacinterp.cmx toplevel/mltop.cmi 
+toplevel/protectedtoplevel.cmo: toplevel/cerrors.cmi \
+    toplevel/line_oriented_parser.cmi parsing/pcoq.cmi lib/pp.cmi \
+    toplevel/vernac.cmi toplevel/vernacexpr.cmo \
+    toplevel/protectedtoplevel.cmi 
+toplevel/protectedtoplevel.cmx: toplevel/cerrors.cmx \
+    toplevel/line_oriented_parser.cmx parsing/pcoq.cmx lib/pp.cmx \
+    toplevel/vernac.cmx toplevel/vernacexpr.cmx \
+    toplevel/protectedtoplevel.cmi 
+toplevel/record.cmo: toplevel/class.cmi toplevel/command.cmi \
+    interp/constrintern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi kernel/entries.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi kernel/indtypes.cmi \
+    kernel/inductive.cmi pretyping/inductiveops.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi parsing/printer.cmi pretyping/recordops.cmi \
+    kernel/safe_typing.cmi kernel/term.cmi pretyping/termops.cmi \
+    interp/topconstr.cmi kernel/type_errors.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/record.cmi 
+toplevel/record.cmx: toplevel/class.cmx toplevel/command.cmx \
+    interp/constrintern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx kernel/entries.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx kernel/indtypes.cmx \
+    kernel/inductive.cmx pretyping/inductiveops.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx parsing/printer.cmx pretyping/recordops.cmx \
+    kernel/safe_typing.cmx kernel/term.cmx pretyping/termops.cmx \
+    interp/topconstr.cmx kernel/type_errors.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx toplevel/record.cmi 
+toplevel/toplevel.cmo: toplevel/cerrors.cmi library/lib.cmi \
+    toplevel/mltop.cmi kernel/names.cmi lib/options.cmi parsing/pcoq.cmi \
+    proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
+    toplevel/protectedtoplevel.cmi lib/util.cmi toplevel/vernac.cmi \
+    toplevel/vernacexpr.cmo toplevel/toplevel.cmi 
+toplevel/toplevel.cmx: toplevel/cerrors.cmx library/lib.cmx \
+    toplevel/mltop.cmx kernel/names.cmx lib/options.cmx parsing/pcoq.cmx \
+    proofs/pfedit.cmx lib/pp.cmx parsing/printer.cmx \
+    toplevel/protectedtoplevel.cmx lib/util.cmx toplevel/vernac.cmx \
+    toplevel/vernacexpr.cmx toplevel/toplevel.cmi 
 toplevel/usage.cmo: config/coq_config.cmi toplevel/usage.cmi 
 toplevel/usage.cmx: config/coq_config.cmx toplevel/usage.cmi 
-toplevel/vernacentries.cmo: kernel/vm.cmi toplevel/vernacinterp.cmi \
-    toplevel/vernacexpr.cmo kernel/vconv.cmi lib/util.cmi kernel/univ.cmi \
-    kernel/typeops.cmi interp/topconstr.cmi pretyping/termops.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/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 
-toplevel/vernacentries.cmx: kernel/vm.cmx toplevel/vernacinterp.cmx \
-    toplevel/vernacexpr.cmx kernel/vconv.cmx lib/util.cmx kernel/univ.cmx \
-    kernel/typeops.cmx interp/topconstr.cmx pretyping/termops.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/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 
-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 
-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 \
-    toplevel/vernacinterp.cmi 
-toplevel/vernacinterp.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    tactics/tacinterp.cmx proofs/tacexpr.cmx proofs/proof_type.cmx lib/pp.cmx \
-    lib/options.cmx kernel/names.cmx library/libnames.cmx toplevel/himsg.cmx \
-    toplevel/vernacinterp.cmi 
-toplevel/vernac.cmo: toplevel/vernacinterp.cmi toplevel/vernacexpr.cmo \
-    toplevel/vernacentries.cmi lib/util.cmi lib/system.cmi library/states.cmi \
-    parsing/ppvernac.cmi lib/pp.cmi proofs/pfedit.cmi parsing/pcoq.cmi \
-    lib/options.cmi kernel/names.cmi library/library.cmi library/lib.cmi \
-    parsing/lexer.cmi interp/constrintern.cmi toplevel/vernac.cmi 
-toplevel/vernac.cmx: toplevel/vernacinterp.cmx toplevel/vernacexpr.cmx \
-    toplevel/vernacentries.cmx lib/util.cmx lib/system.cmx library/states.cmx \
-    parsing/ppvernac.cmx lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx \
-    lib/options.cmx kernel/names.cmx library/library.cmx library/lib.cmx \
-    parsing/lexer.cmx interp/constrintern.cmx toplevel/vernac.cmi 
-toplevel/whelp.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    pretyping/termops.cmi kernel/term.cmi proofs/tacmach.cmi lib/system.cmi \
-    interp/syntax_def.cmi proofs/refiner.cmi pretyping/rawterm.cmi lib/pp.cmi \
-    proofs/pfedit.cmi parsing/pcoq.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi parsing/lexer.cmi interp/genarg.cmi \
-    kernel/environ.cmi parsing/egrammar.cmi library/dischargedhypsmap.cmi \
-    pretyping/detyping.cmi interp/constrintern.cmi toplevel/command.cmi \
-    toplevel/cerrors.cmi toplevel/whelp.cmi 
-toplevel/whelp.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    pretyping/termops.cmx kernel/term.cmx proofs/tacmach.cmx lib/system.cmx \
-    interp/syntax_def.cmx proofs/refiner.cmx pretyping/rawterm.cmx lib/pp.cmx \
-    proofs/pfedit.cmx parsing/pcoq.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx parsing/lexer.cmx interp/genarg.cmx \
-    kernel/environ.cmx parsing/egrammar.cmx library/dischargedhypsmap.cmx \
-    pretyping/detyping.cmx interp/constrintern.cmx toplevel/command.cmx \
-    toplevel/cerrors.cmx toplevel/whelp.cmi 
-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 \
+toplevel/vernacentries.cmo: tactics/auto.cmi tactics/autorewrite.cmi \
+    toplevel/class.cmi pretyping/classops.cmi toplevel/command.cmi \
+    interp/constrextern.cmi interp/constrintern.cmi library/decl_kinds.cmo \
+    kernel/declarations.cmi library/declaremods.cmi pretyping/detyping.cmi \
+    kernel/entries.cmi kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/global.cmi library/goptions.cmi \
+    library/impargs.cmi pretyping/inductiveops.cmi library/lib.cmi \
+    library/libnames.cmi library/library.cmi toplevel/metasyntax.cmi \
+    toplevel/mltop.cmi interp/modintern.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi interp/notation.cmi lib/options.cmi \
+    proofs/pfedit.cmi lib/pp.cmi lib/pp_control.cmi parsing/prettyp.cmi \
+    pretyping/pretyping.cmi parsing/printer.cmi parsing/printmod.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    toplevel/record.cmi pretyping/recordops.cmi proofs/redexpr.cmi \
+    pretyping/reductionops.cmi interp/reserve.cmi kernel/safe_typing.cmi \
+    parsing/search.cmi tactics/setoid_replace.cmi library/states.cmi \
+    interp/syntax_def.cmi lib/system.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi proofs/tacmach.cmi proofs/tactic_debug.cmi \
+    parsing/tactic_printer.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi kernel/typeops.cmi \
+    kernel/univ.cmi lib/util.cmi kernel/vconv.cmi toplevel/vernacexpr.cmo \
+    toplevel/vernacinterp.cmi kernel/vm.cmi toplevel/vernacentries.cmi 
+toplevel/vernacentries.cmx: tactics/auto.cmx tactics/autorewrite.cmx \
+    toplevel/class.cmx pretyping/classops.cmx toplevel/command.cmx \
+    interp/constrextern.cmx interp/constrintern.cmx library/decl_kinds.cmx \
+    kernel/declarations.cmx library/declaremods.cmx pretyping/detyping.cmx \
+    kernel/entries.cmx kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/global.cmx library/goptions.cmx \
+    library/impargs.cmx pretyping/inductiveops.cmx library/lib.cmx \
+    library/libnames.cmx library/library.cmx toplevel/metasyntax.cmx \
+    toplevel/mltop.cmx interp/modintern.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx interp/notation.cmx lib/options.cmx \
+    proofs/pfedit.cmx lib/pp.cmx lib/pp_control.cmx parsing/prettyp.cmx \
+    pretyping/pretyping.cmx parsing/printer.cmx parsing/printmod.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    toplevel/record.cmx pretyping/recordops.cmx proofs/redexpr.cmx \
+    pretyping/reductionops.cmx interp/reserve.cmx kernel/safe_typing.cmx \
+    parsing/search.cmx tactics/setoid_replace.cmx library/states.cmx \
+    interp/syntax_def.cmx lib/system.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx proofs/tactic_debug.cmx \
+    parsing/tactic_printer.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx kernel/typeops.cmx \
+    kernel/univ.cmx lib/util.cmx kernel/vconv.cmx toplevel/vernacexpr.cmx \
+    toplevel/vernacinterp.cmx kernel/vm.cmx toplevel/vernacentries.cmi 
+toplevel/vernacexpr.cmo: library/decl_kinds.cmo parsing/extend.cmi \
+    interp/genarg.cmi library/goptions.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi interp/ppextend.cmi \
+    pretyping/rawterm.cmi proofs/tacexpr.cmo interp/topconstr.cmi \
+    lib/util.cmi 
+toplevel/vernacexpr.cmx: library/decl_kinds.cmx parsing/extend.cmx \
+    interp/genarg.cmx library/goptions.cmx library/libnames.cmx \
+    kernel/names.cmx library/nametab.cmx interp/ppextend.cmx \
+    pretyping/rawterm.cmx proofs/tacexpr.cmx interp/topconstr.cmx \
+    lib/util.cmx 
+toplevel/vernacinterp.cmo: toplevel/himsg.cmi library/libnames.cmi \
+    kernel/names.cmi lib/options.cmi lib/pp.cmi proofs/proof_type.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi 
+toplevel/vernacinterp.cmx: toplevel/himsg.cmx library/libnames.cmx \
+    kernel/names.cmx lib/options.cmx lib/pp.cmx proofs/proof_type.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmi 
+toplevel/vernac.cmo: interp/constrintern.cmi parsing/lexer.cmi \
+    library/lib.cmi library/library.cmi kernel/names.cmi lib/options.cmi \
+    parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi parsing/ppvernac.cmi \
+    library/states.cmi lib/system.cmi lib/util.cmi toplevel/vernacentries.cmi \
+    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi toplevel/vernac.cmi 
+toplevel/vernac.cmx: interp/constrintern.cmx parsing/lexer.cmx \
+    library/lib.cmx library/library.cmx kernel/names.cmx lib/options.cmx \
+    parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx parsing/ppvernac.cmx \
+    library/states.cmx lib/system.cmx lib/util.cmx toplevel/vernacentries.cmx \
+    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmx toplevel/vernac.cmi 
+toplevel/whelp.cmo: toplevel/cerrors.cmi toplevel/command.cmi \
+    interp/constrintern.cmi pretyping/detyping.cmi \
+    library/dischargedhypsmap.cmi parsing/egrammar.cmi kernel/environ.cmi \
+    interp/genarg.cmi parsing/lexer.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi parsing/pcoq.cmi proofs/pfedit.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi proofs/refiner.cmi interp/syntax_def.cmi \
+    lib/system.cmi proofs/tacmach.cmi kernel/term.cmi pretyping/termops.cmi \
+    lib/util.cmi toplevel/vernacinterp.cmi toplevel/whelp.cmi 
+toplevel/whelp.cmx: toplevel/cerrors.cmx toplevel/command.cmx \
+    interp/constrintern.cmx pretyping/detyping.cmx \
+    library/dischargedhypsmap.cmx parsing/egrammar.cmx kernel/environ.cmx \
+    interp/genarg.cmx parsing/lexer.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx parsing/pcoq.cmx proofs/pfedit.cmx \
+    lib/pp.cmx pretyping/rawterm.cmx proofs/refiner.cmx interp/syntax_def.cmx \
+    lib/system.cmx proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx \
+    lib/util.cmx toplevel/vernacinterp.cmx toplevel/whelp.cmi 
+contrib/cc/ccalgo.cmo: library/goptions.cmi kernel/names.cmi lib/pp.cmi \
+    kernel/term.cmi lib/util.cmi contrib/cc/ccalgo.cmi 
+contrib/cc/ccalgo.cmx: library/goptions.cmx kernel/names.cmx lib/pp.cmx \
+    kernel/term.cmx lib/util.cmx contrib/cc/ccalgo.cmi 
+contrib/cc/ccproof.cmo: contrib/cc/ccalgo.cmi kernel/names.cmi lib/util.cmi \
     contrib/cc/ccproof.cmi 
-contrib/cc/ccproof.cmx: lib/util.cmx kernel/names.cmx contrib/cc/ccalgo.cmx \
+contrib/cc/ccproof.cmx: contrib/cc/ccalgo.cmx kernel/names.cmx lib/util.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 \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/declarations.cmi interp/coqlib.cmi \
-    kernel/closure.cmi contrib/cc/ccproof.cmi contrib/cc/ccalgo.cmi \
-    contrib/cc/cctac.cmi 
-contrib/cc/cctac.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
-    tactics/tacinterp.cmx kernel/sign.cmx proofs/proof_type.cmx lib/pp.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx interp/coqlib.cmx \
-    kernel/closure.cmx contrib/cc/ccproof.cmx contrib/cc/ccalgo.cmx \
+contrib/cc/cctac.cmo: contrib/cc/ccalgo.cmi contrib/cc/ccproof.cmi \
+    kernel/closure.cmi interp/coqlib.cmi kernel/declarations.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    pretyping/inductiveops.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi proofs/proof_type.cmi kernel/sign.cmi \
+    tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     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.cmx: contrib/cc/ccalgo.cmx contrib/cc/ccproof.cmx \
+    kernel/closure.cmx interp/coqlib.cmx kernel/declarations.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    pretyping/inductiveops.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx proofs/proof_type.cmx kernel/sign.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     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 
-contrib/correctness/pcicenv.cmo: kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/names.cmi library/global.cmi \
+contrib/cc/g_congruence.cmo: contrib/cc/cctac.cmi toplevel/cerrors.cmi \
+    parsing/egrammar.cmi interp/genarg.cmi parsing/pcoq.cmi lib/pp.cmi \
+    parsing/pptactic.cmi proofs/refiner.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    lib/util.cmi 
+contrib/cc/g_congruence.cmx: contrib/cc/cctac.cmx toplevel/cerrors.cmx \
+    parsing/egrammar.cmx interp/genarg.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/pptactic.cmx proofs/refiner.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    lib/util.cmx 
+contrib/correctness/pcicenv.cmo: library/global.cmi kernel/names.cmi \
+    kernel/sign.cmi kernel/term.cmi kernel/univ.cmi \
     contrib/correctness/pcicenv.cmi 
-contrib/correctness/pcicenv.cmx: kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/names.cmx library/global.cmx \
+contrib/correctness/pcicenv.cmx: library/global.cmx kernel/names.cmx \
+    kernel/sign.cmx kernel/term.cmx kernel/univ.cmx \
     contrib/correctness/pcicenv.cmi 
-contrib/correctness/pcic.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    kernel/typeops.cmi interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/sign.cmi toplevel/record.cmi pretyping/rawterm.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi kernel/indtypes.cmi library/global.cmi \
-    kernel/entries.cmi pretyping/detyping.cmi library/declare.cmi \
-    kernel/declarations.cmi contrib/correctness/pcic.cmi 
-contrib/correctness/pcic.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    kernel/typeops.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/sign.cmx toplevel/record.cmx pretyping/rawterm.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx kernel/indtypes.cmx library/global.cmx \
-    kernel/entries.cmx pretyping/detyping.cmx library/declare.cmx \
-    kernel/declarations.cmx contrib/correctness/pcic.cmi 
-contrib/correctness/pdb.cmo: pretyping/termops.cmi kernel/term.cmi \
-    library/nametab.cmi kernel/names.cmi library/global.cmi \
-    interp/constrintern.cmi contrib/correctness/pdb.cmi 
-contrib/correctness/pdb.cmx: pretyping/termops.cmx kernel/term.cmx \
-    library/nametab.cmx kernel/names.cmx library/global.cmx \
-    interp/constrintern.cmx contrib/correctness/pdb.cmi 
-contrib/correctness/peffect.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi \
-    library/nameops.cmi toplevel/himsg.cmi contrib/correctness/peffect.cmi 
-contrib/correctness/peffect.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx \
-    library/nameops.cmx toplevel/himsg.cmx contrib/correctness/peffect.cmi 
-contrib/correctness/penv.cmo: kernel/term.cmi library/summary.cmi lib/pp.cmi \
-    lib/options.cmi kernel/names.cmi library/nameops.cmi library/library.cmi \
-    library/libobject.cmi library/lib.cmi toplevel/himsg.cmi \
-    contrib/correctness/penv.cmi 
-contrib/correctness/penv.cmx: kernel/term.cmx library/summary.cmx lib/pp.cmx \
-    lib/options.cmx kernel/names.cmx library/nameops.cmx library/library.cmx \
-    library/libobject.cmx library/lib.cmx toplevel/himsg.cmx \
-    contrib/correctness/penv.cmi 
-contrib/correctness/perror.cmo: lib/util.cmi kernel/term.cmi \
-    pretyping/reductionops.cmi lib/pp.cmi kernel/names.cmi \
-    library/nameops.cmi toplevel/himsg.cmi library/global.cmi \
-    pretyping/evd.cmi interp/constrintern.cmi contrib/correctness/perror.cmi 
-contrib/correctness/perror.cmx: lib/util.cmx kernel/term.cmx \
-    pretyping/reductionops.cmx lib/pp.cmx kernel/names.cmx \
-    library/nameops.cmx toplevel/himsg.cmx library/global.cmx \
-    pretyping/evd.cmx interp/constrintern.cmx contrib/correctness/perror.cmi 
-contrib/correctness/pextract.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    kernel/term.cmi lib/system.cmi pretyping/reductionops.cmi \
-    kernel/reduction.cmi lib/pp_control.cmi lib/pp.cmi \
-    contrib/extraction/ocaml.cmi library/nametab.cmi kernel/names.cmi \
-    library/library.cmi toplevel/himsg.cmi pretyping/evd.cmi \
+contrib/correctness/pcic.cmo: kernel/declarations.cmi library/declare.cmi \
+    pretyping/detyping.cmi kernel/entries.cmi library/global.cmi \
+    kernel/indtypes.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi pretyping/rawterm.cmi \
+    toplevel/record.cmi kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi \
+    interp/topconstr.cmi kernel/typeops.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo contrib/correctness/pcic.cmi 
+contrib/correctness/pcic.cmx: kernel/declarations.cmx library/declare.cmx \
+    pretyping/detyping.cmx kernel/entries.cmx library/global.cmx \
+    kernel/indtypes.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx pretyping/rawterm.cmx \
+    toplevel/record.cmx kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx \
+    interp/topconstr.cmx kernel/typeops.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx contrib/correctness/pcic.cmi 
+contrib/correctness/pdb.cmo: interp/constrintern.cmi library/global.cmi \
+    kernel/names.cmi library/nametab.cmi kernel/term.cmi \
+    pretyping/termops.cmi contrib/correctness/pdb.cmi 
+contrib/correctness/pdb.cmx: interp/constrintern.cmx library/global.cmx \
+    kernel/names.cmx library/nametab.cmx kernel/term.cmx \
+    pretyping/termops.cmx contrib/correctness/pdb.cmi 
+contrib/correctness/peffect.cmo: toplevel/himsg.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi lib/util.cmi contrib/correctness/peffect.cmi 
+contrib/correctness/peffect.cmx: toplevel/himsg.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx lib/util.cmx contrib/correctness/peffect.cmi 
+contrib/correctness/penv.cmo: toplevel/himsg.cmi library/lib.cmi \
+    library/libobject.cmi library/library.cmi library/nameops.cmi \
+    kernel/names.cmi lib/options.cmi lib/pp.cmi library/summary.cmi \
+    kernel/term.cmi contrib/correctness/penv.cmi 
+contrib/correctness/penv.cmx: toplevel/himsg.cmx library/lib.cmx \
+    library/libobject.cmx library/library.cmx library/nameops.cmx \
+    kernel/names.cmx lib/options.cmx lib/pp.cmx library/summary.cmx \
+    kernel/term.cmx contrib/correctness/penv.cmi 
+contrib/correctness/perror.cmo: interp/constrintern.cmi pretyping/evd.cmi \
+    library/global.cmi toplevel/himsg.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    lib/util.cmi contrib/correctness/perror.cmi 
+contrib/correctness/perror.cmx: interp/constrintern.cmx pretyping/evd.cmx \
+    library/global.cmx toplevel/himsg.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx pretyping/reductionops.cmx kernel/term.cmx \
+    lib/util.cmx contrib/correctness/perror.cmi 
+contrib/correctness/pextract.cmo: pretyping/evd.cmi toplevel/himsg.cmi \
+    library/library.cmi kernel/names.cmi library/nametab.cmi \
+    contrib/extraction/ocaml.cmi lib/pp.cmi lib/pp_control.cmi \
+    kernel/reduction.cmi pretyping/reductionops.cmi lib/system.cmi \
+    kernel/term.cmi lib/util.cmi toplevel/vernacinterp.cmi \
     contrib/correctness/pextract.cmi 
-contrib/correctness/pextract.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    kernel/term.cmx lib/system.cmx pretyping/reductionops.cmx \
-    kernel/reduction.cmx lib/pp_control.cmx lib/pp.cmx \
-    contrib/extraction/ocaml.cmx library/nametab.cmx kernel/names.cmx \
-    library/library.cmx toplevel/himsg.cmx pretyping/evd.cmx \
+contrib/correctness/pextract.cmx: pretyping/evd.cmx toplevel/himsg.cmx \
+    library/library.cmx kernel/names.cmx library/nametab.cmx \
+    contrib/extraction/ocaml.cmx lib/pp.cmx lib/pp_control.cmx \
+    kernel/reduction.cmx pretyping/reductionops.cmx lib/system.cmx \
+    kernel/term.cmx lib/util.cmx toplevel/vernacinterp.cmx \
     contrib/correctness/pextract.cmi 
-contrib/correctness/pmisc.cmo: lib/util.cmi interp/topconstr.cmi \
-    kernel/term.cmi lib/pp.cmi lib/options.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi library/global.cmi \
-    pretyping/evarutil.cmi interp/constrintern.cmi interp/constrextern.cmi \
+contrib/correctness/pmisc.cmo: interp/constrextern.cmi \
+    interp/constrintern.cmi pretyping/evarutil.cmi library/global.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi lib/options.cmi \
+    lib/pp.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
     contrib/correctness/pmisc.cmi 
-contrib/correctness/pmisc.cmx: lib/util.cmx interp/topconstr.cmx \
-    kernel/term.cmx lib/pp.cmx lib/options.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx library/global.cmx \
-    pretyping/evarutil.cmx interp/constrintern.cmx interp/constrextern.cmx \
+contrib/correctness/pmisc.cmx: interp/constrextern.cmx \
+    interp/constrintern.cmx pretyping/evarutil.cmx library/global.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx lib/options.cmx \
+    lib/pp.cmx kernel/term.cmx interp/topconstr.cmx lib/util.cmx \
     contrib/correctness/pmisc.cmi 
-contrib/correctness/pmlize.cmo: lib/util.cmi pretyping/typing.cmi \
-    kernel/term.cmi pretyping/reductionops.cmi pretyping/pattern.cmi \
-    kernel/names.cmi pretyping/matching.cmi tactics/hipattern.cmi \
-    library/global.cmi pretyping/evd.cmi contrib/correctness/pmlize.cmi 
-contrib/correctness/pmlize.cmx: lib/util.cmx pretyping/typing.cmx \
-    kernel/term.cmx pretyping/reductionops.cmx pretyping/pattern.cmx \
-    kernel/names.cmx pretyping/matching.cmx tactics/hipattern.cmx \
-    library/global.cmx pretyping/evd.cmx contrib/correctness/pmlize.cmi 
-contrib/correctness/pmonad.cmo: lib/util.cmi kernel/term.cmi kernel/names.cmi \
+contrib/correctness/pmlize.cmo: pretyping/evd.cmi library/global.cmi \
+    tactics/hipattern.cmi pretyping/matching.cmi kernel/names.cmi \
+    pretyping/pattern.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi contrib/correctness/pmlize.cmi 
+contrib/correctness/pmlize.cmx: pretyping/evd.cmx library/global.cmx \
+    tactics/hipattern.cmx pretyping/matching.cmx kernel/names.cmx \
+    pretyping/pattern.cmx pretyping/reductionops.cmx kernel/term.cmx \
+    pretyping/typing.cmx lib/util.cmx contrib/correctness/pmlize.cmi 
+contrib/correctness/pmonad.cmo: kernel/names.cmi kernel/term.cmi lib/util.cmi \
     contrib/correctness/pmonad.cmi 
-contrib/correctness/pmonad.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
+contrib/correctness/pmonad.cmx: kernel/names.cmx kernel/term.cmx lib/util.cmx \
     contrib/correctness/pmonad.cmi 
-contrib/correctness/pred.cmo: kernel/term.cmi pretyping/reductionops.cmi \
-    lib/pp.cmi library/global.cmi pretyping/evd.cmi \
-    contrib/correctness/pred.cmi 
-contrib/correctness/pred.cmx: kernel/term.cmx pretyping/reductionops.cmx \
-    lib/pp.cmx library/global.cmx pretyping/evd.cmx \
-    contrib/correctness/pred.cmi 
-contrib/correctness/prename.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi \
-    library/nameops.cmi toplevel/himsg.cmi contrib/correctness/prename.cmi 
-contrib/correctness/prename.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx \
-    library/nameops.cmx toplevel/himsg.cmx contrib/correctness/prename.cmi 
-contrib/correctness/ptactic.cmo: toplevel/vernacentries.cmi lib/util.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi kernel/reduction.cmi \
-    parsing/printer.cmi pretyping/pretyping.cmi lib/pp.cmi proofs/pfedit.cmi \
-    pretyping/pattern.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    library/global.cmi tactics/extratactics.cmi pretyping/evd.cmi \
-    tactics/equality.cmi library/decl_kinds.cmo interp/coqlib.cmi \
-    contrib/correctness/ptactic.cmi 
-contrib/correctness/ptactic.cmx: toplevel/vernacentries.cmx lib/util.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx kernel/reduction.cmx \
-    parsing/printer.cmx pretyping/pretyping.cmx lib/pp.cmx proofs/pfedit.cmx \
-    pretyping/pattern.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    library/global.cmx tactics/extratactics.cmx pretyping/evd.cmx \
-    tactics/equality.cmx library/decl_kinds.cmx interp/coqlib.cmx \
-    contrib/correctness/ptactic.cmi 
-contrib/correctness/ptyping.cmo: lib/util.cmi pretyping/typing.cmi \
-    interp/topconstr.cmi pretyping/termops.cmi kernel/term.cmi \
-    pretyping/reductionops.cmi proofs/proof_trees.cmi lib/pp.cmi \
-    kernel/names.cmi toplevel/himsg.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi interp/constrintern.cmi \
-    contrib/correctness/ptyping.cmi 
-contrib/correctness/ptyping.cmx: lib/util.cmx pretyping/typing.cmx \
-    interp/topconstr.cmx pretyping/termops.cmx kernel/term.cmx \
-    pretyping/reductionops.cmx proofs/proof_trees.cmx lib/pp.cmx \
-    kernel/names.cmx toplevel/himsg.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx interp/constrintern.cmx \
-    contrib/correctness/ptyping.cmi 
-contrib/correctness/putil.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi parsing/printer.cmi lib/pp.cmi pretyping/pattern.cmi \
-    kernel/names.cmi library/nameops.cmi pretyping/matching.cmi \
-    tactics/hipattern.cmi library/global.cmi kernel/environ.cmi \
+contrib/correctness/pred.cmo: pretyping/evd.cmi library/global.cmi lib/pp.cmi \
+    pretyping/reductionops.cmi kernel/term.cmi contrib/correctness/pred.cmi 
+contrib/correctness/pred.cmx: pretyping/evd.cmx library/global.cmx lib/pp.cmx \
+    pretyping/reductionops.cmx kernel/term.cmx contrib/correctness/pred.cmi 
+contrib/correctness/prename.cmo: toplevel/himsg.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi lib/util.cmi contrib/correctness/prename.cmi 
+contrib/correctness/prename.cmx: toplevel/himsg.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx lib/util.cmx contrib/correctness/prename.cmi 
+contrib/correctness/ptactic.cmo: interp/coqlib.cmi library/decl_kinds.cmo \
+    tactics/equality.cmi pretyping/evd.cmi tactics/extratactics.cmi \
+    library/global.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi proofs/pfedit.cmi lib/pp.cmi \
+    pretyping/pretyping.cmi parsing/printer.cmi kernel/reduction.cmi \
+    proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
+    toplevel/vernacentries.cmi contrib/correctness/ptactic.cmi 
+contrib/correctness/ptactic.cmx: interp/coqlib.cmx library/decl_kinds.cmx \
+    tactics/equality.cmx pretyping/evd.cmx tactics/extratactics.cmx \
+    library/global.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx proofs/pfedit.cmx lib/pp.cmx \
+    pretyping/pretyping.cmx parsing/printer.cmx kernel/reduction.cmx \
+    proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
+    toplevel/vernacentries.cmx contrib/correctness/ptactic.cmi 
+contrib/correctness/ptyping.cmo: interp/constrintern.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi toplevel/himsg.cmi kernel/names.cmi \
+    lib/pp.cmi proofs/proof_trees.cmi pretyping/reductionops.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi \
+    pretyping/typing.cmi lib/util.cmi contrib/correctness/ptyping.cmi 
+contrib/correctness/ptyping.cmx: interp/constrintern.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx toplevel/himsg.cmx kernel/names.cmx \
+    lib/pp.cmx proofs/proof_trees.cmx pretyping/reductionops.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx \
+    pretyping/typing.cmx lib/util.cmx contrib/correctness/ptyping.cmi 
+contrib/correctness/putil.cmo: kernel/environ.cmi library/global.cmi \
+    tactics/hipattern.cmi pretyping/matching.cmi library/nameops.cmi \
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     contrib/correctness/putil.cmi 
-contrib/correctness/putil.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx parsing/printer.cmx lib/pp.cmx pretyping/pattern.cmx \
-    kernel/names.cmx library/nameops.cmx pretyping/matching.cmx \
-    tactics/hipattern.cmx library/global.cmx kernel/environ.cmx \
+contrib/correctness/putil.cmx: kernel/environ.cmx library/global.cmx \
+    tactics/hipattern.cmx pretyping/matching.cmx library/nameops.cmx \
+    kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     contrib/correctness/putil.cmi 
-contrib/correctness/pwp.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    tactics/hipattern.cmi library/global.cmi kernel/environ.cmi \
+contrib/correctness/pwp.cmo: kernel/environ.cmi library/global.cmi \
+    tactics/hipattern.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     contrib/correctness/pwp.cmi 
-contrib/correctness/pwp.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    library/nametab.cmx kernel/names.cmx library/libnames.cmx \
-    tactics/hipattern.cmx library/global.cmx kernel/environ.cmx \
+contrib/correctness/pwp.cmx: kernel/environ.cmx library/global.cmx \
+    tactics/hipattern.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     contrib/correctness/pwp.cmi 
 contrib/dp/dp_cvcl.cmo: contrib/dp/fol.cmi contrib/dp/dp_cvcl.cmi 
 contrib/dp/dp_cvcl.cmx: contrib/dp/fol.cmi contrib/dp/dp_cvcl.cmi 
-contrib/dp/dp.cmo: lib/util.cmi pretyping/typing.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    proofs/tacmach.cmi library/summary.cmi pretyping/reductionops.cmi \
-    parsing/printer.cmi lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi tactics/hipattern.cmi \
-    library/global.cmi contrib/dp/fol.cmi pretyping/evd.cmi \
-    kernel/environ.cmi contrib/dp/dp_why.cmo kernel/declarations.cmi \
-    interp/coqlib.cmi contrib/dp/dp.cmi 
-contrib/dp/dp.cmx: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
-    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    proofs/tacmach.cmx library/summary.cmx pretyping/reductionops.cmx \
-    parsing/printer.cmx lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx tactics/hipattern.cmx \
-    library/global.cmx contrib/dp/fol.cmi pretyping/evd.cmx \
-    kernel/environ.cmx contrib/dp/dp_why.cmx kernel/declarations.cmx \
-    interp/coqlib.cmx contrib/dp/dp.cmi 
+contrib/dp/dp.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    contrib/dp/dp_why.cmo kernel/environ.cmi pretyping/evd.cmi \
+    contrib/dp/fol.cmi library/global.cmi tactics/hipattern.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi parsing/printer.cmi \
+    pretyping/reductionops.cmi library/summary.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi contrib/dp/dp.cmi 
+contrib/dp/dp.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    contrib/dp/dp_why.cmx kernel/environ.cmx pretyping/evd.cmx \
+    contrib/dp/fol.cmi library/global.cmx tactics/hipattern.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx parsing/printer.cmx \
+    pretyping/reductionops.cmx library/summary.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx contrib/dp/dp.cmi 
 contrib/dp/dp_simplify.cmo: contrib/dp/fol.cmi contrib/dp/dp_simplify.cmi 
 contrib/dp/dp_simplify.cmx: contrib/dp/fol.cmi contrib/dp/dp_simplify.cmi 
 contrib/dp/dp_sorts.cmo: contrib/dp/fol.cmi contrib/dp/dp_sorts.cmi 
 contrib/dp/dp_sorts.cmx: contrib/dp/fol.cmi contrib/dp/dp_sorts.cmi 
 contrib/dp/dp_why.cmo: contrib/dp/fol.cmi 
 contrib/dp/dp_why.cmx: contrib/dp/fol.cmi 
-contrib/dp/dp_zenon.cmo: lib/util.cmi contrib/dp/fol.cmi \
+contrib/dp/dp_zenon.cmo: contrib/dp/fol.cmi lib/util.cmi \
     contrib/dp/dp_zenon.cmi 
-contrib/dp/dp_zenon.cmx: lib/util.cmx contrib/dp/fol.cmi \
+contrib/dp/dp_zenon.cmx: contrib/dp/fol.cmi lib/util.cmx \
     contrib/dp/dp_zenon.cmi 
-contrib/dp/g_dp.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    tactics/tactics.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 contrib/dp/dp.cmi \
-    toplevel/cerrors.cmi 
-contrib/dp/g_dp.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    tactics/tactics.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 contrib/dp/dp.cmx \
-    toplevel/cerrors.cmx 
-contrib/extraction/common.cmo: lib/util.cmi kernel/term.cmi \
-    contrib/extraction/table.cmi contrib/extraction/scheme.cmi \
-    lib/pp_control.cmi lib/pp.cmi lib/options.cmi \
-    contrib/extraction/ocaml.cmi kernel/names.cmi library/nameops.cmi \
-    contrib/extraction/modutil.cmi kernel/modops.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi \
-    contrib/extraction/haskell.cmi lib/gset.cmi library/global.cmi \
-    contrib/extraction/extraction.cmi kernel/declarations.cmi \
+contrib/dp/g_dp.cmo: toplevel/cerrors.cmi contrib/dp/dp.cmi \
+    parsing/egrammar.cmi interp/genarg.cmi parsing/pcoq.cmi lib/pp.cmi \
+    parsing/pptactic.cmi proofs/refiner.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi tactics/tactics.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi 
+contrib/dp/g_dp.cmx: toplevel/cerrors.cmx contrib/dp/dp.cmx \
+    parsing/egrammar.cmx interp/genarg.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/pptactic.cmx proofs/refiner.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx tactics/tactics.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/extraction/common.cmo: kernel/declarations.cmi \
+    contrib/extraction/extraction.cmi library/global.cmi lib/gset.cmi \
+    contrib/extraction/haskell.cmi library/libnames.cmi \
+    contrib/extraction/miniml.cmi kernel/modops.cmi \
+    contrib/extraction/modutil.cmi library/nameops.cmi kernel/names.cmi \
+    contrib/extraction/ocaml.cmi lib/options.cmi lib/pp.cmi \
+    lib/pp_control.cmi contrib/extraction/scheme.cmi \
+    contrib/extraction/table.cmi kernel/term.cmi lib/util.cmi \
     contrib/extraction/common.cmi 
-contrib/extraction/common.cmx: lib/util.cmx kernel/term.cmx \
-    contrib/extraction/table.cmx contrib/extraction/scheme.cmx \
-    lib/pp_control.cmx lib/pp.cmx lib/options.cmx \
-    contrib/extraction/ocaml.cmx kernel/names.cmx library/nameops.cmx \
-    contrib/extraction/modutil.cmx kernel/modops.cmx \
-    contrib/extraction/miniml.cmi library/libnames.cmx \
-    contrib/extraction/haskell.cmx lib/gset.cmx library/global.cmx \
-    contrib/extraction/extraction.cmx kernel/declarations.cmx \
+contrib/extraction/common.cmx: kernel/declarations.cmx \
+    contrib/extraction/extraction.cmx library/global.cmx lib/gset.cmx \
+    contrib/extraction/haskell.cmx library/libnames.cmx \
+    contrib/extraction/miniml.cmi kernel/modops.cmx \
+    contrib/extraction/modutil.cmx library/nameops.cmx kernel/names.cmx \
+    contrib/extraction/ocaml.cmx lib/options.cmx lib/pp.cmx \
+    lib/pp_control.cmx contrib/extraction/scheme.cmx \
+    contrib/extraction/table.cmx kernel/term.cmx lib/util.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.cmo: contrib/extraction/common.cmi \
+    kernel/declarations.cmi contrib/extraction/extraction.cmi \
+    library/global.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi library/library.cmi contrib/extraction/miniml.cmi \
+    kernel/mod_subst.cmi kernel/modops.cmi contrib/extraction/modutil.cmi \
+    kernel/names.cmi library/nametab.cmi lib/pp.cmi kernel/reduction.cmi \
+    contrib/extraction/table.cmi kernel/term.cmi lib/util.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.cmx: contrib/extraction/common.cmx \
+    kernel/declarations.cmx contrib/extraction/extraction.cmx \
+    library/global.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx library/library.cmx contrib/extraction/miniml.cmi \
+    kernel/mod_subst.cmx kernel/modops.cmx contrib/extraction/modutil.cmx \
+    kernel/names.cmx library/nametab.cmx lib/pp.cmx kernel/reduction.cmx \
+    contrib/extraction/table.cmx kernel/term.cmx lib/util.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/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/miniml.cmi library/libnames.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx \
-    contrib/extraction/extraction.cmi 
-contrib/extraction/g_extraction.cmo: toplevel/vernacinterp.cmi \
-    toplevel/vernacexpr.cmo lib/util.cmi tactics/tacinterp.cmi \
-    contrib/extraction/table.cmi parsing/pptactic.cmi lib/pp.cmi \
-    parsing/pcoq.cmi parsing/lexer.cmi interp/genarg.cmi \
-    contrib/extraction/extract_env.cmi parsing/egrammar.cmi \
-    toplevel/cerrors.cmi 
-contrib/extraction/g_extraction.cmx: toplevel/vernacinterp.cmx \
-    toplevel/vernacexpr.cmx lib/util.cmx tactics/tacinterp.cmx \
-    contrib/extraction/table.cmx parsing/pptactic.cmx lib/pp.cmx \
-    parsing/pcoq.cmx parsing/lexer.cmx interp/genarg.cmx \
-    contrib/extraction/extract_env.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.cmx 
-contrib/extraction/haskell.cmo: lib/util.cmi contrib/extraction/table.cmi \
-    lib/pp.cmi contrib/extraction/ocaml.cmi kernel/names.cmi \
-    library/nameops.cmi contrib/extraction/mlutil.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi \
+contrib/extraction/extraction.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi contrib/extraction/miniml.cmi \
+    contrib/extraction/mlutil.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/recordops.cmi kernel/reduction.cmi \
+    pretyping/reductionops.cmi pretyping/retyping.cmi library/summary.cmi \
+    contrib/extraction/table.cmi kernel/term.cmi pretyping/termops.cmi \
+    lib/util.cmi contrib/extraction/extraction.cmi 
+contrib/extraction/extraction.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx contrib/extraction/miniml.cmi \
+    contrib/extraction/mlutil.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx pretyping/recordops.cmx kernel/reduction.cmx \
+    pretyping/reductionops.cmx pretyping/retyping.cmx library/summary.cmx \
+    contrib/extraction/table.cmx kernel/term.cmx pretyping/termops.cmx \
+    lib/util.cmx contrib/extraction/extraction.cmi 
+contrib/extraction/g_extraction.cmo: toplevel/cerrors.cmi \
+    parsing/egrammar.cmi contrib/extraction/extract_env.cmi interp/genarg.cmi \
+    parsing/lexer.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    contrib/extraction/table.cmi tactics/tacinterp.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi 
+contrib/extraction/g_extraction.cmx: toplevel/cerrors.cmx \
+    parsing/egrammar.cmx contrib/extraction/extract_env.cmx interp/genarg.cmx \
+    parsing/lexer.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    contrib/extraction/table.cmx tactics/tacinterp.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmx 
+contrib/extraction/haskell.cmo: library/libnames.cmi \
+    contrib/extraction/miniml.cmi contrib/extraction/mlutil.cmi \
+    library/nameops.cmi kernel/names.cmi contrib/extraction/ocaml.cmi \
+    lib/pp.cmi contrib/extraction/table.cmi lib/util.cmi \
     contrib/extraction/haskell.cmi 
-contrib/extraction/haskell.cmx: lib/util.cmx contrib/extraction/table.cmx \
-    lib/pp.cmx contrib/extraction/ocaml.cmx kernel/names.cmx \
-    library/nameops.cmx contrib/extraction/mlutil.cmx \
-    contrib/extraction/miniml.cmi library/libnames.cmx \
+contrib/extraction/haskell.cmx: library/libnames.cmx \
+    contrib/extraction/miniml.cmi contrib/extraction/mlutil.cmx \
+    library/nameops.cmx kernel/names.cmx contrib/extraction/ocaml.cmx \
+    lib/pp.cmx contrib/extraction/table.cmx lib/util.cmx \
     contrib/extraction/haskell.cmi 
-contrib/extraction/mlutil.cmo: lib/util.cmi contrib/extraction/table.cmi \
-    lib/pp.cmi library/nametab.cmi kernel/names.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi \
+contrib/extraction/mlutil.cmo: library/libnames.cmi \
+    contrib/extraction/miniml.cmi kernel/names.cmi library/nametab.cmi \
+    lib/pp.cmi contrib/extraction/table.cmi lib/util.cmi \
     contrib/extraction/mlutil.cmi 
-contrib/extraction/mlutil.cmx: lib/util.cmx contrib/extraction/table.cmx \
-    lib/pp.cmx library/nametab.cmx kernel/names.cmx \
-    contrib/extraction/miniml.cmi library/libnames.cmx \
+contrib/extraction/mlutil.cmx: library/libnames.cmx \
+    contrib/extraction/miniml.cmi kernel/names.cmx library/nametab.cmx \
+    lib/pp.cmx contrib/extraction/table.cmx lib/util.cmx \
     contrib/extraction/mlutil.cmi 
-contrib/extraction/modutil.cmo: lib/util.cmi contrib/extraction/table.cmi \
-    kernel/names.cmi kernel/modops.cmi kernel/mod_subst.cmi \
-    contrib/extraction/mlutil.cmi contrib/extraction/miniml.cmi \
-    library/libnames.cmi kernel/environ.cmi kernel/declarations.cmi \
+contrib/extraction/modutil.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    library/libnames.cmi contrib/extraction/miniml.cmi \
+    contrib/extraction/mlutil.cmi kernel/mod_subst.cmi kernel/modops.cmi \
+    kernel/names.cmi contrib/extraction/table.cmi lib/util.cmi \
     contrib/extraction/modutil.cmi 
-contrib/extraction/modutil.cmx: lib/util.cmx contrib/extraction/table.cmx \
-    kernel/names.cmx kernel/modops.cmx kernel/mod_subst.cmx \
-    contrib/extraction/mlutil.cmx contrib/extraction/miniml.cmi \
-    library/libnames.cmx kernel/environ.cmx kernel/declarations.cmx \
+contrib/extraction/modutil.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    library/libnames.cmx contrib/extraction/miniml.cmi \
+    contrib/extraction/mlutil.cmx kernel/mod_subst.cmx kernel/modops.cmx \
+    kernel/names.cmx contrib/extraction/table.cmx lib/util.cmx \
     contrib/extraction/modutil.cmi 
-contrib/extraction/ocaml.cmo: lib/util.cmi contrib/extraction/table.cmi \
-    lib/pp.cmi kernel/names.cmi library/nameops.cmi \
-    contrib/extraction/modutil.cmi contrib/extraction/mlutil.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi \
+contrib/extraction/ocaml.cmo: library/libnames.cmi \
+    contrib/extraction/miniml.cmi contrib/extraction/mlutil.cmi \
+    contrib/extraction/modutil.cmi library/nameops.cmi kernel/names.cmi \
+    lib/pp.cmi contrib/extraction/table.cmi lib/util.cmi \
     contrib/extraction/ocaml.cmi 
-contrib/extraction/ocaml.cmx: lib/util.cmx contrib/extraction/table.cmx \
-    lib/pp.cmx kernel/names.cmx library/nameops.cmx \
-    contrib/extraction/modutil.cmx contrib/extraction/mlutil.cmx \
-    contrib/extraction/miniml.cmi library/libnames.cmx \
+contrib/extraction/ocaml.cmx: library/libnames.cmx \
+    contrib/extraction/miniml.cmi contrib/extraction/mlutil.cmx \
+    contrib/extraction/modutil.cmx library/nameops.cmx kernel/names.cmx \
+    lib/pp.cmx contrib/extraction/table.cmx lib/util.cmx \
     contrib/extraction/ocaml.cmi 
-contrib/extraction/scheme.cmo: lib/util.cmi contrib/extraction/table.cmi \
-    lib/pp.cmi contrib/extraction/ocaml.cmi kernel/names.cmi \
-    library/nameops.cmi contrib/extraction/mlutil.cmi \
-    contrib/extraction/miniml.cmi library/libnames.cmi \
+contrib/extraction/scheme.cmo: library/libnames.cmi \
+    contrib/extraction/miniml.cmi contrib/extraction/mlutil.cmi \
+    library/nameops.cmi kernel/names.cmi contrib/extraction/ocaml.cmi \
+    lib/pp.cmi contrib/extraction/table.cmi lib/util.cmi \
     contrib/extraction/scheme.cmi 
-contrib/extraction/scheme.cmx: lib/util.cmx contrib/extraction/table.cmx \
-    lib/pp.cmx contrib/extraction/ocaml.cmx kernel/names.cmx \
-    library/nameops.cmx contrib/extraction/mlutil.cmx \
-    contrib/extraction/miniml.cmi library/libnames.cmx \
+contrib/extraction/scheme.cmx: library/libnames.cmx \
+    contrib/extraction/miniml.cmi contrib/extraction/mlutil.cmx \
+    library/nameops.cmx kernel/names.cmx contrib/extraction/ocaml.cmx \
+    lib/pp.cmx contrib/extraction/table.cmx lib/util.cmx \
     contrib/extraction/scheme.cmi 
-contrib/extraction/table.cmo: lib/util.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 \
-    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 \
-    library/lib.cmx library/goptions.cmx library/global.cmx \
-    kernel/environ.cmx kernel/declarations.cmx contrib/extraction/table.cmi 
-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 \
-    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 \
-    parsing/egrammar.cmx interp/coqlib.cmx interp/constrintern.cmx \
-    toplevel/cerrors.cmx 
-contrib/first-order/formula.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi proofs/tacmach.cmi kernel/sign.cmi \
-    pretyping/reductionops.cmi kernel/names.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi tactics/hipattern.cmi library/global.cmi \
-    kernel/declarations.cmi kernel/closure.cmi \
-    contrib/first-order/formula.cmi 
-contrib/first-order/formula.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx proofs/tacmach.cmx kernel/sign.cmx \
-    pretyping/reductionops.cmx kernel/names.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx tactics/hipattern.cmx library/global.cmx \
-    kernel/declarations.cmx kernel/closure.cmx \
-    contrib/first-order/formula.cmi 
-contrib/first-order/g_ground.cmo: lib/util.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo contrib/first-order/sequent.cmi proofs/refiner.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 
-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 
-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 \
-    contrib/first-order/rules.cmi parsing/printer.cmi lib/pp.cmi \
-    kernel/names.cmi library/libnames.cmi contrib/first-order/instances.cmi \
-    lib/heap.cmi contrib/first-order/formula.cmi kernel/closure.cmi \
-    pretyping/classops.cmi contrib/first-order/ground.cmi 
-contrib/first-order/ground.cmx: kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tactic_debug.cmx proofs/tacmach.cmx \
-    tactics/tacinterp.cmx contrib/first-order/sequent.cmx \
-    contrib/first-order/rules.cmx parsing/printer.cmx lib/pp.cmx \
-    kernel/names.cmx library/libnames.cmx contrib/first-order/instances.cmx \
-    lib/heap.cmx contrib/first-order/formula.cmx kernel/closure.cmx \
-    pretyping/classops.cmx contrib/first-order/ground.cmi 
-contrib/first-order/instances.cmo: lib/util.cmi contrib/first-order/unify.cmi \
-    pretyping/termops.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi kernel/sign.cmi \
-    contrib/first-order/sequent.cmi contrib/first-order/rules.cmi \
-    proofs/refiner.cmi pretyping/reductionops.cmi pretyping/rawterm.cmi \
-    pretyping/pretyping.cmi lib/pp.cmi kernel/names.cmi library/libnames.cmi \
-    lib/heap.cmi contrib/first-order/formula.cmi pretyping/evd.cmi \
-    pretyping/detyping.cmi kernel/declarations.cmi \
+contrib/extraction/table.cmo: kernel/declarations.cmi kernel/environ.cmi \
+    library/global.cmi library/goptions.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi contrib/extraction/miniml.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi parsing/printer.cmi kernel/reduction.cmi library/summary.cmi \
+    kernel/term.cmi lib/util.cmi contrib/extraction/table.cmi 
+contrib/extraction/table.cmx: kernel/declarations.cmx kernel/environ.cmx \
+    library/global.cmx library/goptions.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx contrib/extraction/miniml.cmi \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx parsing/printer.cmx kernel/reduction.cmx library/summary.cmx \
+    kernel/term.cmx lib/util.cmx contrib/extraction/table.cmi 
+contrib/field/field.cmo: toplevel/cerrors.cmi interp/constrintern.cmi \
+    interp/coqlib.cmi parsing/egrammar.cmi pretyping/evd.cmi \
+    parsing/extend.cmi interp/genarg.cmi library/global.cmi lib/gmap.cmi \
+    tactics/hipattern.cmi parsing/lexer.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    parsing/pptactic.cmi parsing/printer.cmi proofs/proof_type.cmi \
+    contrib/ring/quote.cmo pretyping/reductionops.cmi proofs/refiner.cmi \
+    contrib/ring/ring.cmo library/summary.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    kernel/term.cmi interp/topconstr.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi 
+contrib/field/field.cmx: toplevel/cerrors.cmx interp/constrintern.cmx \
+    interp/coqlib.cmx parsing/egrammar.cmx pretyping/evd.cmx \
+    parsing/extend.cmx interp/genarg.cmx library/global.cmx lib/gmap.cmx \
+    tactics/hipattern.cmx parsing/lexer.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx kernel/mod_subst.cmx \
+    kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    parsing/pptactic.cmx parsing/printer.cmx proofs/proof_type.cmx \
+    contrib/ring/quote.cmx pretyping/reductionops.cmx proofs/refiner.cmx \
+    contrib/ring/ring.cmx library/summary.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    kernel/term.cmx interp/topconstr.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmx 
+contrib/first-order/formula.cmo: kernel/closure.cmi kernel/declarations.cmi \
+    library/global.cmi tactics/hipattern.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi kernel/names.cmi pretyping/reductionops.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi pretyping/termops.cmi \
+    lib/util.cmi contrib/first-order/formula.cmi 
+contrib/first-order/formula.cmx: kernel/closure.cmx kernel/declarations.cmx \
+    library/global.cmx tactics/hipattern.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx kernel/names.cmx pretyping/reductionops.cmx \
+    kernel/sign.cmx proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx \
+    lib/util.cmx contrib/first-order/formula.cmi 
+contrib/first-order/g_ground.cmo: tactics/auto.cmi toplevel/cerrors.cmi \
+    parsing/egrammar.cmi contrib/first-order/formula.cmi interp/genarg.cmi \
+    library/goptions.cmi contrib/first-order/ground.cmi library/libnames.cmi \
+    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    proofs/refiner.cmi contrib/first-order/sequent.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi lib/util.cmi 
+contrib/first-order/g_ground.cmx: tactics/auto.cmx toplevel/cerrors.cmx \
+    parsing/egrammar.cmx contrib/first-order/formula.cmx interp/genarg.cmx \
+    library/goptions.cmx contrib/first-order/ground.cmx library/libnames.cmx \
+    kernel/names.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    proofs/refiner.cmx contrib/first-order/sequent.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx lib/util.cmx 
+contrib/first-order/ground.cmo: pretyping/classops.cmi kernel/closure.cmi \
+    contrib/first-order/formula.cmi lib/heap.cmi \
+    contrib/first-order/instances.cmi library/libnames.cmi kernel/names.cmi \
+    lib/pp.cmi parsing/printer.cmi contrib/first-order/rules.cmi \
+    contrib/first-order/sequent.cmi tactics/tacinterp.cmi proofs/tacmach.cmi \
+    proofs/tactic_debug.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi contrib/first-order/ground.cmi 
+contrib/first-order/ground.cmx: pretyping/classops.cmx kernel/closure.cmx \
+    contrib/first-order/formula.cmx lib/heap.cmx \
+    contrib/first-order/instances.cmx library/libnames.cmx kernel/names.cmx \
+    lib/pp.cmx parsing/printer.cmx contrib/first-order/rules.cmx \
+    contrib/first-order/sequent.cmx tactics/tacinterp.cmx proofs/tacmach.cmx \
+    proofs/tactic_debug.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx contrib/first-order/ground.cmi 
+contrib/first-order/instances.cmo: kernel/declarations.cmi \
+    pretyping/detyping.cmi pretyping/evd.cmi contrib/first-order/formula.cmi \
+    lib/heap.cmi library/libnames.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretyping.cmi pretyping/rawterm.cmi pretyping/reductionops.cmi \
+    proofs/refiner.cmi contrib/first-order/rules.cmi \
+    contrib/first-order/sequent.cmi kernel/sign.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi contrib/first-order/unify.cmi lib/util.cmi \
     contrib/first-order/instances.cmi 
-contrib/first-order/instances.cmx: lib/util.cmx contrib/first-order/unify.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx kernel/sign.cmx \
-    contrib/first-order/sequent.cmx contrib/first-order/rules.cmx \
-    proofs/refiner.cmx pretyping/reductionops.cmx pretyping/rawterm.cmx \
-    pretyping/pretyping.cmx lib/pp.cmx kernel/names.cmx library/libnames.cmx \
-    lib/heap.cmx contrib/first-order/formula.cmx pretyping/evd.cmx \
-    pretyping/detyping.cmx kernel/declarations.cmx \
+contrib/first-order/instances.cmx: kernel/declarations.cmx \
+    pretyping/detyping.cmx pretyping/evd.cmx contrib/first-order/formula.cmx \
+    lib/heap.cmx library/libnames.cmx kernel/names.cmx lib/pp.cmx \
+    pretyping/pretyping.cmx pretyping/rawterm.cmx pretyping/reductionops.cmx \
+    proofs/refiner.cmx contrib/first-order/rules.cmx \
+    contrib/first-order/sequent.cmx kernel/sign.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx contrib/first-order/unify.cmx lib/util.cmx \
     contrib/first-order/instances.cmi 
-contrib/first-order/rules.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    proofs/tacmach.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    contrib/first-order/sequent.cmi lib/pp.cmi kernel/names.cmi \
-    library/libnames.cmi contrib/first-order/formula.cmi \
-    kernel/declarations.cmi interp/coqlib.cmi contrib/first-order/rules.cmi 
-contrib/first-order/rules.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    proofs/tacmach.cmx proofs/tacexpr.cmx kernel/sign.cmx \
-    contrib/first-order/sequent.cmx lib/pp.cmx kernel/names.cmx \
-    library/libnames.cmx contrib/first-order/formula.cmx \
-    kernel/declarations.cmx interp/coqlib.cmx contrib/first-order/rules.cmi 
-contrib/first-order/sequent.cmo: lib/util.cmi contrib/first-order/unify.cmi \
-    kernel/term.cmi proofs/tacmach.cmi parsing/printer.cmi \
-    parsing/ppconstr.cmi lib/pp.cmi kernel/names.cmi library/libnames.cmi \
-    lib/heap.cmi library/global.cmi contrib/first-order/formula.cmi \
-    interp/constrextern.cmi tactics/auto.cmi contrib/first-order/sequent.cmi 
-contrib/first-order/sequent.cmx: lib/util.cmx contrib/first-order/unify.cmx \
-    kernel/term.cmx proofs/tacmach.cmx parsing/printer.cmx \
-    parsing/ppconstr.cmx lib/pp.cmx kernel/names.cmx library/libnames.cmx \
-    lib/heap.cmx library/global.cmx contrib/first-order/formula.cmx \
-    interp/constrextern.cmx tactics/auto.cmx contrib/first-order/sequent.cmi 
-contrib/first-order/unify.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi proofs/tacmach.cmi pretyping/reductionops.cmi \
-    kernel/names.cmi contrib/first-order/formula.cmi \
+contrib/first-order/rules.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    contrib/first-order/formula.cmi library/libnames.cmi kernel/names.cmi \
+    lib/pp.cmi contrib/first-order/sequent.cmi kernel/sign.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
+    contrib/first-order/rules.cmi 
+contrib/first-order/rules.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    contrib/first-order/formula.cmx library/libnames.cmx kernel/names.cmx \
+    lib/pp.cmx contrib/first-order/sequent.cmx kernel/sign.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
+    contrib/first-order/rules.cmi 
+contrib/first-order/sequent.cmo: tactics/auto.cmi interp/constrextern.cmi \
+    contrib/first-order/formula.cmi library/global.cmi lib/heap.cmi \
+    library/libnames.cmi kernel/names.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    parsing/printer.cmi proofs/tacmach.cmi kernel/term.cmi \
+    contrib/first-order/unify.cmi lib/util.cmi \
+    contrib/first-order/sequent.cmi 
+contrib/first-order/sequent.cmx: tactics/auto.cmx interp/constrextern.cmx \
+    contrib/first-order/formula.cmx library/global.cmx lib/heap.cmx \
+    library/libnames.cmx kernel/names.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    parsing/printer.cmx proofs/tacmach.cmx kernel/term.cmx \
+    contrib/first-order/unify.cmx lib/util.cmx \
+    contrib/first-order/sequent.cmi 
+contrib/first-order/unify.cmo: contrib/first-order/formula.cmi \
+    kernel/names.cmi pretyping/reductionops.cmi proofs/tacmach.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     contrib/first-order/unify.cmi 
-contrib/first-order/unify.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx proofs/tacmach.cmx pretyping/reductionops.cmx \
-    kernel/names.cmx contrib/first-order/formula.cmx \
+contrib/first-order/unify.cmx: contrib/first-order/formula.cmx \
+    kernel/names.cmx pretyping/reductionops.cmx proofs/tacmach.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     contrib/first-order/unify.cmi 
-contrib/fourier/fourierR.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    proofs/tacmach.cmi contrib/ring/ring.cmo kernel/names.cmi \
-    library/libnames.cmi contrib/fourier/fourier.cmo pretyping/evarutil.cmi \
-    tactics/equality.cmi interp/coqlib.cmi tactics/contradiction.cmi \
-    pretyping/clenv.cmi 
-contrib/fourier/fourierR.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    proofs/tacmach.cmx contrib/ring/ring.cmx kernel/names.cmx \
-    library/libnames.cmx contrib/fourier/fourier.cmx pretyping/evarutil.cmx \
-    tactics/equality.cmx interp/coqlib.cmx tactics/contradiction.cmx \
-    pretyping/clenv.cmx 
-contrib/fourier/g_fourier.cmo: lib/util.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo proofs/refiner.cmi parsing/pptactic.cmi lib/pp.cmi \
-    parsing/pcoq.cmi contrib/fourier/fourierR.cmo parsing/egrammar.cmi \
-    toplevel/cerrors.cmi 
-contrib/fourier/g_fourier.cmx: lib/util.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx proofs/refiner.cmx parsing/pptactic.cmx lib/pp.cmx \
-    parsing/pcoq.cmx contrib/fourier/fourierR.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.cmx 
-contrib/funind/indfun_common.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi pretyping/rawterm.cmi lib/pp.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi library/global.cmi \
-    kernel/declarations.cmi interp/coqlib.cmi \
-    contrib/funind/indfun_common.cmi 
-contrib/funind/indfun_common.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx pretyping/rawterm.cmx lib/pp.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx library/global.cmx \
-    kernel/declarations.cmx interp/coqlib.cmx \
-    contrib/funind/indfun_common.cmi 
-contrib/funind/indfun_main.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    interp/topconstr.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    proofs/refiner.cmi pretyping/rawterm.cmi parsing/pptactic.cmi lib/pp.cmi \
-    parsing/pcoq.cmi contrib/funind/new_arg_principle.cmi kernel/names.cmi \
-    library/nameops.cmi parsing/lexer.cmi contrib/funind/invfun.cmo \
-    pretyping/indrec.cmi contrib/funind/indfun_common.cmi \
-    contrib/funind/indfun.cmo interp/genarg.cmi parsing/egrammar.cmi \
-    toplevel/cerrors.cmi 
-contrib/funind/indfun_main.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    interp/topconstr.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    proofs/refiner.cmx pretyping/rawterm.cmx parsing/pptactic.cmx lib/pp.cmx \
-    parsing/pcoq.cmx contrib/funind/new_arg_principle.cmx kernel/names.cmx \
-    library/nameops.cmx parsing/lexer.cmx contrib/funind/invfun.cmx \
-    pretyping/indrec.cmx contrib/funind/indfun_common.cmx \
-    contrib/funind/indfun.cmx interp/genarg.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.cmx 
-contrib/funind/indfun.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi kernel/term.cmi proofs/tacmach.cmi \
-    library/states.cmi contrib/recdef/recdef.cmo \
-    contrib/funind/rawterm_to_relation.cmi pretyping/rawterm.cmi lib/pp.cmi \
-    lib/options.cmi interp/notation.cmi contrib/funind/new_arg_principle.cmi \
-    kernel/names.cmi library/libnames.cmi pretyping/indrec.cmi \
-    contrib/funind/indfun_common.cmi library/impargs.cmi library/global.cmi \
-    pretyping/evd.cmi kernel/environ.cmi kernel/declarations.cmi \
-    library/decl_kinds.cmo interp/constrintern.cmi toplevel/command.cmi 
-contrib/funind/indfun.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx kernel/term.cmx proofs/tacmach.cmx \
-    library/states.cmx contrib/recdef/recdef.cmx \
-    contrib/funind/rawterm_to_relation.cmx pretyping/rawterm.cmx lib/pp.cmx \
-    lib/options.cmx interp/notation.cmx contrib/funind/new_arg_principle.cmx \
-    kernel/names.cmx library/libnames.cmx pretyping/indrec.cmx \
-    contrib/funind/indfun_common.cmx library/impargs.cmx library/global.cmx \
-    pretyping/evd.cmx kernel/environ.cmx kernel/declarations.cmx \
-    library/decl_kinds.cmx interp/constrintern.cmx toplevel/command.cmx 
-contrib/funind/invfun.cmo: lib/util.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi proofs/tacmach.cmi contrib/funind/tacinvutils.cmi \
-    kernel/sign.cmi pretyping/rawterm.cmi lib/pp.cmi kernel/names.cmi \
-    library/libnames.cmi pretyping/indrec.cmi \
-    contrib/funind/indfun_common.cmi tactics/hiddentac.cmi library/global.cmi \
-    tactics/extratactics.cmi tactics/equality.cmi kernel/declarations.cmi 
-contrib/funind/invfun.cmx: lib/util.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx contrib/funind/tacinvutils.cmx \
-    kernel/sign.cmx pretyping/rawterm.cmx lib/pp.cmx kernel/names.cmx \
-    library/libnames.cmx pretyping/indrec.cmx \
-    contrib/funind/indfun_common.cmx tactics/hiddentac.cmx library/global.cmx \
-    tactics/extratactics.cmx tactics/equality.cmx kernel/declarations.cmx 
-contrib/funind/new_arg_principle.cmo: toplevel/vernacexpr.cmo \
-    toplevel/vernacentries.cmi lib/util.cmi pretyping/unification.cmi \
-    pretyping/typing.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 \
-    pretyping/reductionops.cmi contrib/recdef/recdef.cmo \
-    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
-    pretyping/pretyping.cmi parsing/ppconstr.cmi lib/pp.cmi proofs/pfedit.cmi \
-    lib/options.cmi kernel/names.cmi library/libnames.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 tactics/eauto.cmi library/declare.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo interp/coqlib.cmi \
-    toplevel/command.cmi kernel/closure.cmi pretyping/clenv.cmi \
-    toplevel/cerrors.cmi contrib/funind/new_arg_principle.cmi 
-contrib/funind/new_arg_principle.cmx: toplevel/vernacexpr.cmx \
-    toplevel/vernacentries.cmx lib/util.cmx pretyping/unification.cmx \
-    pretyping/typing.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 \
-    pretyping/reductionops.cmx contrib/recdef/recdef.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
-    pretyping/pretyping.cmx parsing/ppconstr.cmx lib/pp.cmx proofs/pfedit.cmx \
-    lib/options.cmx kernel/names.cmx library/libnames.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 tactics/eauto.cmx library/declare.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx interp/coqlib.cmx \
-    toplevel/command.cmx kernel/closure.cmx pretyping/clenv.cmx \
-    toplevel/cerrors.cmx contrib/funind/new_arg_principle.cmi 
-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 
-contrib/funind/rawterm_to_relation.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi kernel/term.cmi contrib/funind/rawtermops.cmi \
-    pretyping/rawterm.cmi parsing/printer.cmi parsing/ppvernac.cmi lib/pp.cmi \
-    lib/options.cmi kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    contrib/funind/indfun_common.cmi library/impargs.cmi interp/coqlib.cmi \
-    interp/constrextern.cmi toplevel/command.cmi toplevel/cerrors.cmi \
+contrib/fourier/fourierR.cmo: pretyping/clenv.cmi tactics/contradiction.cmi \
+    interp/coqlib.cmi tactics/equality.cmi pretyping/evarutil.cmi \
+    contrib/fourier/fourier.cmo library/libnames.cmi kernel/names.cmi \
+    contrib/ring/ring.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+contrib/fourier/fourierR.cmx: pretyping/clenv.cmx tactics/contradiction.cmx \
+    interp/coqlib.cmx tactics/equality.cmx pretyping/evarutil.cmx \
+    contrib/fourier/fourier.cmx library/libnames.cmx kernel/names.cmx \
+    contrib/ring/ring.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx lib/util.cmx toplevel/vernacexpr.cmx 
+contrib/fourier/g_fourier.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    contrib/fourier/fourierR.cmo parsing/pcoq.cmi lib/pp.cmi \
+    parsing/pptactic.cmi proofs/refiner.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi lib/util.cmi 
+contrib/fourier/g_fourier.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    contrib/fourier/fourierR.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/pptactic.cmx proofs/refiner.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx lib/util.cmx 
+contrib/funind/indfun_common.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    library/global.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi contrib/funind/indfun_common.cmi 
+contrib/funind/indfun_common.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    library/global.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx pretyping/rawterm.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx contrib/funind/indfun_common.cmi 
+contrib/funind/indfun_main.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    interp/genarg.cmi contrib/funind/indfun.cmo \
+    contrib/funind/indfun_common.cmi pretyping/indrec.cmi \
+    contrib/funind/invfun.cmo parsing/lexer.cmi library/nameops.cmi \
+    kernel/names.cmi contrib/funind/new_arg_principle.cmi parsing/pcoq.cmi \
+    lib/pp.cmi parsing/pptactic.cmi pretyping/rawterm.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi 
+contrib/funind/indfun_main.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    interp/genarg.cmx contrib/funind/indfun.cmx \
+    contrib/funind/indfun_common.cmx pretyping/indrec.cmx \
+    contrib/funind/invfun.cmx parsing/lexer.cmx library/nameops.cmx \
+    kernel/names.cmx contrib/funind/new_arg_principle.cmx parsing/pcoq.cmx \
+    lib/pp.cmx parsing/pptactic.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx interp/topconstr.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/funind/indfun.cmo: toplevel/command.cmi interp/constrintern.cmi \
+    library/decl_kinds.cmo kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.cmi library/impargs.cmi \
+    contrib/funind/indfun_common.cmi pretyping/indrec.cmi \
+    library/libnames.cmi kernel/names.cmi \
+    contrib/funind/new_arg_principle.cmi interp/notation.cmi lib/options.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi contrib/funind/rawterm_to_relation.cmi \
+    contrib/recdef/recdef.cmo library/states.cmi proofs/tacmach.cmi \
+    kernel/term.cmi interp/topconstr.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+contrib/funind/indfun.cmx: toplevel/command.cmx interp/constrintern.cmx \
+    library/decl_kinds.cmx kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.cmx library/impargs.cmx \
+    contrib/funind/indfun_common.cmx pretyping/indrec.cmx \
+    library/libnames.cmx kernel/names.cmx \
+    contrib/funind/new_arg_principle.cmx interp/notation.cmx lib/options.cmx \
+    lib/pp.cmx pretyping/rawterm.cmx contrib/funind/rawterm_to_relation.cmx \
+    contrib/recdef/recdef.cmx library/states.cmx proofs/tacmach.cmx \
+    kernel/term.cmx interp/topconstr.cmx lib/util.cmx toplevel/vernacexpr.cmx 
+contrib/funind/invfun.cmo: kernel/declarations.cmi tactics/equality.cmi \
+    tactics/extratactics.cmi library/global.cmi tactics/hiddentac.cmi \
+    contrib/funind/indfun_common.cmi pretyping/indrec.cmi \
+    library/libnames.cmi kernel/names.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    kernel/sign.cmi contrib/funind/tacinvutils.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
+contrib/funind/invfun.cmx: kernel/declarations.cmx tactics/equality.cmx \
+    tactics/extratactics.cmx library/global.cmx tactics/hiddentac.cmx \
+    contrib/funind/indfun_common.cmx pretyping/indrec.cmx \
+    library/libnames.cmx kernel/names.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    kernel/sign.cmx contrib/funind/tacinvutils.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
+contrib/funind/new_arg_principle.cmo: toplevel/cerrors.cmi \
+    pretyping/clenv.cmi kernel/closure.cmi toplevel/command.cmi \
+    interp/coqlib.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi tactics/eauto.cmi kernel/entries.cmi \
+    kernel/environ.cmi tactics/equality.cmi pretyping/evd.cmi \
+    interp/genarg.cmi library/global.cmi tactics/hiddentac.cmi \
+    contrib/funind/indfun_common.cmi pretyping/indrec.cmi \
+    library/libnames.cmi kernel/names.cmi lib/options.cmi proofs/pfedit.cmi \
+    lib/pp.cmi parsing/ppconstr.cmi pretyping/pretyping.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    contrib/recdef/recdef.cmo pretyping/reductionops.cmi \
+    tactics/tacinterp.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
+    proofs/tactic_debug.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi pretyping/typing.cmi \
+    pretyping/unification.cmi lib/util.cmi toplevel/vernacentries.cmi \
+    toplevel/vernacexpr.cmo contrib/funind/new_arg_principle.cmi 
+contrib/funind/new_arg_principle.cmx: toplevel/cerrors.cmx \
+    pretyping/clenv.cmx kernel/closure.cmx toplevel/command.cmx \
+    interp/coqlib.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx tactics/eauto.cmx kernel/entries.cmx \
+    kernel/environ.cmx tactics/equality.cmx pretyping/evd.cmx \
+    interp/genarg.cmx library/global.cmx tactics/hiddentac.cmx \
+    contrib/funind/indfun_common.cmx pretyping/indrec.cmx \
+    library/libnames.cmx kernel/names.cmx lib/options.cmx proofs/pfedit.cmx \
+    lib/pp.cmx parsing/ppconstr.cmx pretyping/pretyping.cmx \
+    parsing/printer.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    contrib/recdef/recdef.cmx pretyping/reductionops.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    proofs/tactic_debug.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx pretyping/typing.cmx \
+    pretyping/unification.cmx lib/util.cmx toplevel/vernacentries.cmx \
+    toplevel/vernacexpr.cmx contrib/funind/new_arg_principle.cmi 
+contrib/funind/rawtermops.cmo: interp/coqlib.cmi pretyping/evd.cmi \
+    library/global.cmi contrib/funind/indfun_common.cmi \
+    pretyping/inductiveops.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi parsing/ppconstr.cmi parsing/printer.cmi \
+    pretyping/rawterm.cmi tactics/tacinterp.cmi proofs/tactic_debug.cmi \
+    lib/util.cmi contrib/funind/rawtermops.cmi 
+contrib/funind/rawtermops.cmx: interp/coqlib.cmx pretyping/evd.cmx \
+    library/global.cmx contrib/funind/indfun_common.cmx \
+    pretyping/inductiveops.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx parsing/ppconstr.cmx parsing/printer.cmx \
+    pretyping/rawterm.cmx tactics/tacinterp.cmx proofs/tactic_debug.cmx \
+    lib/util.cmx contrib/funind/rawtermops.cmi 
+contrib/funind/rawterm_to_relation.cmo: toplevel/cerrors.cmi \
+    toplevel/command.cmi interp/constrextern.cmi interp/coqlib.cmi \
+    library/impargs.cmi contrib/funind/indfun_common.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
+    parsing/ppvernac.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    contrib/funind/rawtermops.cmi kernel/term.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo \
     contrib/funind/rawterm_to_relation.cmi 
-contrib/funind/rawterm_to_relation.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx kernel/term.cmx contrib/funind/rawtermops.cmx \
-    pretyping/rawterm.cmx parsing/printer.cmx parsing/ppvernac.cmx lib/pp.cmx \
-    lib/options.cmx kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    contrib/funind/indfun_common.cmx library/impargs.cmx interp/coqlib.cmx \
-    interp/constrextern.cmx toplevel/command.cmx toplevel/cerrors.cmx \
+contrib/funind/rawterm_to_relation.cmx: toplevel/cerrors.cmx \
+    toplevel/command.cmx interp/constrextern.cmx interp/coqlib.cmx \
+    library/impargs.cmx contrib/funind/indfun_common.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
+    parsing/ppvernac.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    contrib/funind/rawtermops.cmx kernel/term.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx \
     contrib/funind/rawterm_to_relation.cmi 
-contrib/funind/tacinv.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    pretyping/typing.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi pretyping/tacred.cmi \
-    proofs/tacmach.cmi contrib/funind/tacinvutils.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo tactics/setoid_replace.cmi kernel/safe_typing.cmi \
-    proofs/refiner.cmi tactics/refine.cmi pretyping/reductionops.cmi \
-    proofs/proof_type.cmi parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi \
-    parsing/pcoq.cmi kernel/names.cmi pretyping/inductiveops.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.cmi \
-    tactics/equality.cmi kernel/environ.cmi kernel/entries.cmi \
-    parsing/egrammar.cmi library/declare.cmi library/decl_kinds.cmo \
-    interp/coqlib.cmi interp/constrintern.cmi toplevel/cerrors.cmi 
-contrib/funind/tacinv.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    pretyping/typing.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx pretyping/tacred.cmx \
-    proofs/tacmach.cmx contrib/funind/tacinvutils.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx tactics/setoid_replace.cmx kernel/safe_typing.cmx \
-    proofs/refiner.cmx tactics/refine.cmx pretyping/reductionops.cmx \
-    proofs/proof_type.cmx parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx \
-    parsing/pcoq.cmx kernel/names.cmx pretyping/inductiveops.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.cmx \
-    tactics/equality.cmx kernel/environ.cmx kernel/entries.cmx \
-    parsing/egrammar.cmx library/declare.cmx library/decl_kinds.cmx \
-    interp/coqlib.cmx interp/constrintern.cmx toplevel/cerrors.cmx 
-contrib/funind/tacinvutils.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/sign.cmi pretyping/reductionops.cmi \
-    parsing/printer.cmi lib/pp.cmi kernel/names.cmi library/nameops.cmi \
-    pretyping/inductiveops.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/declarations.cmi interp/coqlib.cmi \
+contrib/funind/tacinv.cmo: toplevel/cerrors.cmi interp/constrintern.cmi \
+    interp/coqlib.cmi library/decl_kinds.cmo library/declare.cmi \
+    parsing/egrammar.cmi kernel/entries.cmi kernel/environ.cmi \
+    tactics/equality.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/global.cmi pretyping/inductiveops.cmi kernel/names.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/reductionops.cmi tactics/refine.cmi \
+    proofs/refiner.cmi kernel/safe_typing.cmi tactics/setoid_replace.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi contrib/funind/tacinvutils.cmi \
+    proofs/tacmach.cmi pretyping/tacred.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacinterp.cmi 
+contrib/funind/tacinv.cmx: toplevel/cerrors.cmx interp/constrintern.cmx \
+    interp/coqlib.cmx library/decl_kinds.cmx library/declare.cmx \
+    parsing/egrammar.cmx kernel/entries.cmx kernel/environ.cmx \
+    tactics/equality.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/global.cmx pretyping/inductiveops.cmx kernel/names.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/reductionops.cmx tactics/refine.cmx \
+    proofs/refiner.cmx kernel/safe_typing.cmx tactics/setoid_replace.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx contrib/funind/tacinvutils.cmx \
+    proofs/tacmach.cmx pretyping/tacred.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacinterp.cmx 
+contrib/funind/tacinvutils.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    pretyping/inductiveops.cmi library/nameops.cmi kernel/names.cmi \
+    lib/pp.cmi parsing/printer.cmi pretyping/reductionops.cmi kernel/sign.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     contrib/funind/tacinvutils.cmi 
-contrib/funind/tacinvutils.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/sign.cmx pretyping/reductionops.cmx \
-    parsing/printer.cmx lib/pp.cmx kernel/names.cmx library/nameops.cmx \
-    pretyping/inductiveops.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx interp/coqlib.cmx \
+contrib/funind/tacinvutils.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    pretyping/inductiveops.cmx library/nameops.cmx kernel/names.cmx \
+    lib/pp.cmx parsing/printer.cmx pretyping/reductionops.cmx kernel/sign.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     contrib/funind/tacinvutils.cmi 
-contrib/interface/blast.cmo: 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 \
-    tactics/eauto.cmi library/declare.cmi kernel/declarations.cmi \
-    toplevel/command.cmi pretyping/clenv.cmi tactics/auto.cmi \
+contrib/interface/blast.cmo: tactics/auto.cmi pretyping/clenv.cmi \
+    toplevel/command.cmi kernel/declarations.cmi library/declare.cmi \
+    tactics/eauto.cmi kernel/environ.cmi tactics/equality.cmi \
+    pretyping/evd.cmi lib/explore.cmi library/global.cmi \
+    tactics/hipattern.cmi kernel/inductive.cmi proofs/logic.cmi \
+    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi \
+    contrib/interface/pbp.cmi parsing/pcoq.cmi proofs/pfedit.cmi lib/pp.cmi \
+    parsing/pptactic.cmi parsing/printer.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
+    proofs/refiner.cmi kernel/sign.cmi tactics/tacinterp.cmi \
+    proofs/tacmach.cmi pretyping/tacred.cmi parsing/tactic_printer.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacentries.cmi toplevel/vernacinterp.cmi \
     contrib/interface/blast.cmi 
-contrib/interface/blast.cmx: 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 \
-    tactics/eauto.cmx library/declare.cmx kernel/declarations.cmx \
-    toplevel/command.cmx pretyping/clenv.cmx tactics/auto.cmx \
+contrib/interface/blast.cmx: tactics/auto.cmx pretyping/clenv.cmx \
+    toplevel/command.cmx kernel/declarations.cmx library/declare.cmx \
+    tactics/eauto.cmx kernel/environ.cmx tactics/equality.cmx \
+    pretyping/evd.cmx lib/explore.cmx library/global.cmx \
+    tactics/hipattern.cmx kernel/inductive.cmx proofs/logic.cmx \
+    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx \
+    contrib/interface/pbp.cmx parsing/pcoq.cmx proofs/pfedit.cmx lib/pp.cmx \
+    parsing/pptactic.cmx parsing/printer.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
+    proofs/refiner.cmx kernel/sign.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx pretyping/tacred.cmx parsing/tactic_printer.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacentries.cmx toplevel/vernacinterp.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 \
-    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 \
-    kernel/names.cmi library/nameops.cmi contrib/interface/name_to_ast.cmi \
-    pretyping/matching.cmi toplevel/line_oriented_parser.cmi \
-    library/library.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.cmi parsing/lexer.cmi contrib/interface/history.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi \
-    parsing/egrammar.cmi library/declare.cmi kernel/declarations.cmi \
-    contrib/interface/debug_tac.cmi interp/constrintern.cmi \
-    toplevel/command.cmi pretyping/classops.cmi toplevel/cerrors.cmi \
-    contrib/interface/blast.cmi contrib/interface/ascent.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 \
-    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 \
-    kernel/names.cmx library/nameops.cmx contrib/interface/name_to_ast.cmx \
-    pretyping/matching.cmx toplevel/line_oriented_parser.cmx \
-    library/library.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.cmx parsing/lexer.cmx contrib/interface/history.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.cmx kernel/environ.cmx \
-    parsing/egrammar.cmx library/declare.cmx kernel/declarations.cmx \
-    contrib/interface/debug_tac.cmx interp/constrintern.cmx \
-    toplevel/command.cmx pretyping/classops.cmx toplevel/cerrors.cmx \
-    contrib/interface/blast.cmx contrib/interface/ascent.cmi 
-contrib/interface/dad.cmo: toplevel/vernacinterp.cmi toplevel/vernacexpr.cmo \
-    lib/util.cmi pretyping/typing.cmi interp/topconstr.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo kernel/reduction.cmi pretyping/rawterm.cmi \
-    proofs/proof_type.cmi proofs/proof_trees.cmi lib/pp.cmi \
-    pretyping/pattern.cmi contrib/interface/paths.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi pretyping/matching.cmi \
-    library/libnames.cmi library/global.cmi interp/genarg.cmi \
-    pretyping/evd.cmi kernel/environ.cmi interp/constrintern.cmi \
-    interp/constrextern.cmi contrib/interface/dad.cmi 
-contrib/interface/dad.cmx: toplevel/vernacinterp.cmx toplevel/vernacexpr.cmx \
-    lib/util.cmx pretyping/typing.cmx interp/topconstr.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
-    proofs/tacexpr.cmx kernel/reduction.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx proofs/proof_trees.cmx lib/pp.cmx \
-    pretyping/pattern.cmx contrib/interface/paths.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx pretyping/matching.cmx \
-    library/libnames.cmx library/global.cmx interp/genarg.cmx \
-    pretyping/evd.cmx kernel/environ.cmx interp/constrintern.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/centaur.cmo: contrib/interface/ascent.cmi \
+    contrib/interface/blast.cmi toplevel/cerrors.cmi pretyping/classops.cmi \
+    toplevel/command.cmi interp/constrintern.cmi \
+    contrib/interface/debug_tac.cmi kernel/declarations.cmi \
+    library/declare.cmi parsing/egrammar.cmi kernel/environ.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    contrib/interface/history.cmi parsing/lexer.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    toplevel/line_oriented_parser.cmi pretyping/matching.cmi \
+    contrib/interface/name_to_ast.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi contrib/interface/pbp.cmi parsing/pcoq.cmi \
+    proofs/pfedit.cmi lib/pp.cmi parsing/pptactic.cmi pretyping/pretyping.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    toplevel/protectedtoplevel.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
+    proofs/refiner.cmi parsing/search.cmi contrib/interface/showproof.cmi \
+    contrib/interface/showproof_ct.cmo proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi proofs/tacmach.cmi kernel/term.cmi \
+    contrib/interface/translate.cmi lib/util.cmi toplevel/vernac.cmi \
+    toplevel/vernacentries.cmi toplevel/vernacexpr.cmo \
+    toplevel/vernacinterp.cmi contrib/interface/vtp.cmi \
+    contrib/interface/xlate.cmi 
+contrib/interface/centaur.cmx: contrib/interface/ascent.cmi \
+    contrib/interface/blast.cmx toplevel/cerrors.cmx pretyping/classops.cmx \
+    toplevel/command.cmx interp/constrintern.cmx \
+    contrib/interface/debug_tac.cmx kernel/declarations.cmx \
+    library/declare.cmx parsing/egrammar.cmx kernel/environ.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    contrib/interface/history.cmx parsing/lexer.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    toplevel/line_oriented_parser.cmx pretyping/matching.cmx \
+    contrib/interface/name_to_ast.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx contrib/interface/pbp.cmx parsing/pcoq.cmx \
+    proofs/pfedit.cmx lib/pp.cmx parsing/pptactic.cmx pretyping/pretyping.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    toplevel/protectedtoplevel.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
+    proofs/refiner.cmx parsing/search.cmx contrib/interface/showproof.cmx \
+    contrib/interface/showproof_ct.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx kernel/term.cmx \
+    contrib/interface/translate.cmx lib/util.cmx toplevel/vernac.cmx \
+    toplevel/vernacentries.cmx toplevel/vernacexpr.cmx \
+    toplevel/vernacinterp.cmx contrib/interface/vtp.cmx \
+    contrib/interface/xlate.cmx 
+contrib/interface/dad.cmo: interp/constrextern.cmi interp/constrintern.cmi \
+    kernel/environ.cmi pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    library/libnames.cmi pretyping/matching.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi contrib/interface/paths.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi interp/topconstr.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacexpr.cmo \
+    toplevel/vernacinterp.cmi contrib/interface/dad.cmi 
+contrib/interface/dad.cmx: interp/constrextern.cmx interp/constrintern.cmx \
+    kernel/environ.cmx pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    library/libnames.cmx pretyping/matching.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx contrib/interface/paths.cmx \
+    pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx interp/topconstr.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacexpr.cmx \
+    toplevel/vernacinterp.cmx contrib/interface/dad.cmi 
+contrib/interface/debug_tac.cmo: toplevel/cerrors.cmi interp/genarg.cmi \
+    library/global.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    proofs/refiner.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    proofs/tacmach.cmi tactics/tacticals.cmi lib/util.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.cmx: toplevel/cerrors.cmx interp/genarg.cmx \
+    library/global.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    proofs/refiner.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx tactics/tacticals.cmx lib/util.cmx \
     contrib/interface/debug_tac.cmi 
 contrib/interface/history.cmo: contrib/interface/paths.cmi \
     contrib/interface/history.cmi 
@@ -3067,150 +3086,154 @@ contrib/interface/history.cmx: contrib/interface/paths.cmx \
     contrib/interface/history.cmi 
 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 
-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 
-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 \
-    parsing/pcoq.cmi library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    toplevel/mltop.cmi contrib/interface/line_parser.cmi library/library.cmi \
-    library/libobject.cmi library/libnames.cmi library/declaremods.cmi \
-    config/coq_config.cmi toplevel/cerrors.cmi contrib/interface/ascent.cmi 
-contrib/interface/parse.cmx: contrib/interface/xlate.cmx \
-    contrib/interface/vtp.cmx toplevel/vernacexpr.cmx \
-    toplevel/vernacentries.cmx lib/util.cmx lib/system.cmx lib/pp.cmx \
-    parsing/pcoq.cmx library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    toplevel/mltop.cmx contrib/interface/line_parser.cmx library/library.cmx \
-    library/libobject.cmx library/libnames.cmx library/declaremods.cmx \
-    config/coq_config.cmx toplevel/cerrors.cmx contrib/interface/ascent.cmi 
+contrib/interface/name_to_ast.cmo: pretyping/classops.cmi \
+    interp/constrextern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi kernel/environ.cmi library/global.cmi \
+    library/impargs.cmi kernel/inductive.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/pp.cmi parsing/prettyp.cmi \
+    kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo contrib/interface/name_to_ast.cmi 
+contrib/interface/name_to_ast.cmx: pretyping/classops.cmx \
+    interp/constrextern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx kernel/environ.cmx library/global.cmx \
+    library/impargs.cmx kernel/inductive.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/pp.cmx parsing/prettyp.cmx \
+    kernel/reduction.cmx kernel/sign.cmx kernel/term.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx contrib/interface/name_to_ast.cmi 
+contrib/interface/parse.cmo: contrib/interface/ascent.cmi \
+    toplevel/cerrors.cmi config/coq_config.cmi library/declaremods.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    contrib/interface/line_parser.cmi toplevel/mltop.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi parsing/pcoq.cmi lib/pp.cmi \
+    lib/system.cmi lib/util.cmi toplevel/vernacentries.cmi \
+    toplevel/vernacexpr.cmo contrib/interface/vtp.cmi \
+    contrib/interface/xlate.cmi 
+contrib/interface/parse.cmx: contrib/interface/ascent.cmi \
+    toplevel/cerrors.cmx config/coq_config.cmx library/declaremods.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    contrib/interface/line_parser.cmx toplevel/mltop.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx parsing/pcoq.cmx lib/pp.cmx \
+    lib/system.cmx lib/util.cmx toplevel/vernacentries.cmx \
+    toplevel/vernacexpr.cmx contrib/interface/vtp.cmx \
+    contrib/interface/xlate.cmx 
 contrib/interface/paths.cmo: contrib/interface/paths.cmi 
 contrib/interface/paths.cmx: contrib/interface/paths.cmi 
-contrib/interface/pbp.cmo: lib/util.cmi pretyping/typing.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 kernel/reduction.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi proofs/proof_trees.cmi \
-    pretyping/pretyping.cmi lib/pp.cmi pretyping/pattern.cmi \
-    library/nametab.cmi kernel/names.cmi pretyping/matching.cmi \
-    proofs/logic.cmi library/libnames.cmi tactics/hipattern.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi \
-    interp/coqlib.cmi contrib/interface/pbp.cmi 
-contrib/interface/pbp.cmx: lib/util.cmx pretyping/typing.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 kernel/reduction.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx proofs/proof_trees.cmx \
-    pretyping/pretyping.cmx lib/pp.cmx pretyping/pattern.cmx \
-    library/nametab.cmx kernel/names.cmx pretyping/matching.cmx \
-    proofs/logic.cmx library/libnames.cmx tactics/hipattern.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.cmx kernel/environ.cmx \
-    interp/coqlib.cmx contrib/interface/pbp.cmi 
-contrib/interface/showproof_ct.cmo: contrib/interface/xlate.cmi \
-    contrib/interface/vtp.cmi contrib/interface/translate.cmi \
-    parsing/printer.cmi lib/pp.cmi toplevel/metasyntax.cmi library/global.cmi \
-    contrib/interface/ascent.cmi 
-contrib/interface/showproof_ct.cmx: contrib/interface/xlate.cmx \
-    contrib/interface/vtp.cmx contrib/interface/translate.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/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 \
-    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/global.cmi \
-    interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/declarations.cmi interp/constrintern.cmi pretyping/clenv.cmi \
+contrib/interface/pbp.cmo: interp/coqlib.cmi kernel/environ.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    tactics/hipattern.cmi library/libnames.cmi proofs/logic.cmi \
+    pretyping/matching.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/pretyping.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi \
+    pretyping/typing.cmi lib/util.cmi contrib/interface/pbp.cmi 
+contrib/interface/pbp.cmx: interp/coqlib.cmx kernel/environ.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    tactics/hipattern.cmx library/libnames.cmx proofs/logic.cmx \
+    pretyping/matching.cmx kernel/names.cmx library/nametab.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/pretyping.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx \
+    pretyping/typing.cmx lib/util.cmx contrib/interface/pbp.cmi 
+contrib/interface/showproof_ct.cmo: contrib/interface/ascent.cmi \
+    library/global.cmi toplevel/metasyntax.cmi lib/pp.cmi parsing/printer.cmi \
+    contrib/interface/translate.cmi contrib/interface/vtp.cmi \
+    contrib/interface/xlate.cmi 
+contrib/interface/showproof_ct.cmx: contrib/interface/ascent.cmi \
+    library/global.cmx toplevel/metasyntax.cmx lib/pp.cmx parsing/printer.cmx \
+    contrib/interface/translate.cmx contrib/interface/vtp.cmx \
+    contrib/interface/xlate.cmx 
+contrib/interface/showproof.cmo: pretyping/clenv.cmi interp/constrintern.cmi \
+    kernel/declarations.cmi kernel/environ.cmi pretyping/evd.cmi \
+    interp/genarg.cmi library/global.cmi kernel/inductive.cmi \
+    pretyping/inductiveops.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    pretyping/reductionops.cmi contrib/interface/showproof_ct.cmo \
+    kernel/sign.cmi proofs/tacexpr.cmo proofs/tacmach.cmi kernel/term.cmi \
+    pretyping/termops.cmi contrib/interface/translate.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacinterp.cmi \
     contrib/interface/showproof.cmi 
-contrib/interface/showproof.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    pretyping/typing.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 \
-    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/global.cmx \
-    interp/genarg.cmx pretyping/evd.cmx kernel/environ.cmx \
-    kernel/declarations.cmx interp/constrintern.cmx pretyping/clenv.cmx \
+contrib/interface/showproof.cmx: pretyping/clenv.cmx interp/constrintern.cmx \
+    kernel/declarations.cmx kernel/environ.cmx pretyping/evd.cmx \
+    interp/genarg.cmx library/global.cmx kernel/inductive.cmx \
+    pretyping/inductiveops.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx proofs/pfedit.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    pretyping/reductionops.cmx contrib/interface/showproof_ct.cmx \
+    kernel/sign.cmx proofs/tacexpr.cmx proofs/tacmach.cmx kernel/term.cmx \
+    pretyping/termops.cmx contrib/interface/translate.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacinterp.cmx \
     contrib/interface/showproof.cmi 
-contrib/interface/translate.cmo: contrib/interface/xlate.cmi \
-    contrib/interface/vtp.cmi toplevel/vernacinterp.cmi lib/util.cmi \
-    kernel/term.cmi proofs/tacmach.cmi kernel/sign.cmi proofs/proof_type.cmi \
-    lib/pp.cmi proofs/pfedit.cmi kernel/names.cmi library/library.cmi \
-    library/libobject.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    kernel/environ.cmi interp/constrextern.cmi contrib/interface/ascent.cmi \
-    contrib/interface/translate.cmi 
-contrib/interface/translate.cmx: contrib/interface/xlate.cmx \
-    contrib/interface/vtp.cmx toplevel/vernacinterp.cmx lib/util.cmx \
-    kernel/term.cmx proofs/tacmach.cmx kernel/sign.cmx proofs/proof_type.cmx \
-    lib/pp.cmx proofs/pfedit.cmx kernel/names.cmx library/library.cmx \
-    library/libobject.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    kernel/environ.cmx interp/constrextern.cmx contrib/interface/ascent.cmi \
-    contrib/interface/translate.cmi 
+contrib/interface/translate.cmo: contrib/interface/ascent.cmi \
+    interp/constrextern.cmi kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/libobject.cmi library/library.cmi \
+    kernel/names.cmi proofs/pfedit.cmi lib/pp.cmi proofs/proof_type.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi contrib/interface/vtp.cmi \
+    contrib/interface/xlate.cmi contrib/interface/translate.cmi 
+contrib/interface/translate.cmx: contrib/interface/ascent.cmi \
+    interp/constrextern.cmx kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/libobject.cmx library/library.cmx \
+    kernel/names.cmx proofs/pfedit.cmx lib/pp.cmx proofs/proof_type.cmx \
+    kernel/sign.cmx proofs/tacmach.cmx kernel/term.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx contrib/interface/vtp.cmx \
+    contrib/interface/xlate.cmx contrib/interface/translate.cmi 
 contrib/interface/vtp.cmo: contrib/interface/ascent.cmi \
     contrib/interface/vtp.cmi 
 contrib/interface/vtp.cmx: contrib/interface/ascent.cmi \
     contrib/interface/vtp.cmi 
-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/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/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 
-contrib/jprover/jall.cmx: lib/pp.cmx contrib/jprover/opname.cmx \
-    contrib/jprover/jtunify.cmx contrib/jprover/jterm.cmx \
-    contrib/jprover/jlogic.cmx contrib/jprover/jall.cmi 
-contrib/jprover/jlogic.cmo: contrib/jprover/opname.cmi \
-    contrib/jprover/jterm.cmi contrib/jprover/jlogic.cmi 
-contrib/jprover/jlogic.cmx: contrib/jprover/opname.cmx \
-    contrib/jprover/jterm.cmx contrib/jprover/jlogic.cmi 
-contrib/jprover/jprover.cmo: lib/util.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 parsing/printer.cmi \
-    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi pretyping/pattern.cmi \
-    kernel/names.cmi contrib/jprover/jterm.cmi contrib/jprover/jlogic.cmi \
-    contrib/jprover/jall.cmi tactics/hipattern.cmi tactics/hiddentac.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evarutil.cmi \
-    parsing/egrammar.cmi toplevel/cerrors.cmi 
-contrib/jprover/jprover.cmx: lib/util.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 parsing/printer.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx pretyping/pattern.cmx \
-    kernel/names.cmx contrib/jprover/jterm.cmx contrib/jprover/jlogic.cmx \
-    contrib/jprover/jall.cmx tactics/hipattern.cmx tactics/hiddentac.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evarutil.cmx \
-    parsing/egrammar.cmx toplevel/cerrors.cmx 
+contrib/interface/xlate.cmo: contrib/interface/ascent.cmi lib/bigint.cmi \
+    library/decl_kinds.cmo tactics/eauto.cmi parsing/extend.cmi \
+    tactics/extraargs.cmi tactics/extratactics.cmi contrib/field/field.cmo \
+    interp/genarg.cmi library/goptions.cmi library/libnames.cmi \
+    kernel/names.cmi parsing/pcoq.cmi parsing/ppconstr.cmi \
+    pretyping/rawterm.cmi proofs/tacexpr.cmo kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi toplevel/vernacexpr.cmo \
+    contrib/interface/xlate.cmi 
+contrib/interface/xlate.cmx: contrib/interface/ascent.cmi lib/bigint.cmx \
+    library/decl_kinds.cmx tactics/eauto.cmx parsing/extend.cmx \
+    tactics/extraargs.cmx tactics/extratactics.cmx contrib/field/field.cmx \
+    interp/genarg.cmx library/goptions.cmx library/libnames.cmx \
+    kernel/names.cmx parsing/pcoq.cmx parsing/ppconstr.cmx \
+    pretyping/rawterm.cmx proofs/tacexpr.cmx kernel/term.cmx \
+    interp/topconstr.cmx lib/util.cmx toplevel/vernacexpr.cmx \
+    contrib/interface/xlate.cmi 
+contrib/jprover/jall.cmo: contrib/jprover/jlogic.cmi \
+    contrib/jprover/jterm.cmi contrib/jprover/jtunify.cmi \
+    contrib/jprover/opname.cmi lib/pp.cmi contrib/jprover/jall.cmi 
+contrib/jprover/jall.cmx: contrib/jprover/jlogic.cmx \
+    contrib/jprover/jterm.cmx contrib/jprover/jtunify.cmx \
+    contrib/jprover/opname.cmx lib/pp.cmx contrib/jprover/jall.cmi 
+contrib/jprover/jlogic.cmo: contrib/jprover/jterm.cmi \
+    contrib/jprover/opname.cmi contrib/jprover/jlogic.cmi 
+contrib/jprover/jlogic.cmx: contrib/jprover/jterm.cmx \
+    contrib/jprover/opname.cmx contrib/jprover/jlogic.cmi 
+contrib/jprover/jprover.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    pretyping/evarutil.cmi interp/genarg.cmi library/global.cmi \
+    tactics/hiddentac.cmi tactics/hipattern.cmi contrib/jprover/jall.cmi \
+    contrib/jprover/jlogic.cmi contrib/jprover/jterm.cmi kernel/names.cmi \
+    pretyping/pattern.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    parsing/printer.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    kernel/reduction.cmi pretyping/reductionops.cmi proofs/refiner.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+contrib/jprover/jprover.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    pretyping/evarutil.cmx interp/genarg.cmx library/global.cmx \
+    tactics/hiddentac.cmx tactics/hipattern.cmx contrib/jprover/jall.cmx \
+    contrib/jprover/jlogic.cmx contrib/jprover/jterm.cmx kernel/names.cmx \
+    pretyping/pattern.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    parsing/printer.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
+    kernel/reduction.cmx pretyping/reductionops.cmx proofs/refiner.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx 
 contrib/jprover/jterm.cmo: contrib/jprover/opname.cmi \
     contrib/jprover/jterm.cmi 
 contrib/jprover/jterm.cmx: contrib/jprover/opname.cmx \
@@ -3219,516 +3242,524 @@ contrib/jprover/jtunify.cmo: contrib/jprover/jtunify.cmi
 contrib/jprover/jtunify.cmx: contrib/jprover/jtunify.cmi 
 contrib/jprover/opname.cmo: contrib/jprover/opname.cmi 
 contrib/jprover/opname.cmx: contrib/jprover/opname.cmi 
-contrib/omega/coq_omega.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    pretyping/tacred.cmi proofs/tacmach.cmi kernel/sign.cmi \
-    kernel/reduction.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/printer.cmi lib/pp.cmi contrib/omega/omega.cmo \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi proofs/logic.cmi \
-    library/libnames.cmi kernel/inductive.cmi library/goptions.cmi \
-    library/global.cmi pretyping/evarutil.cmi proofs/evar_refiner.cmi \
-    tactics/equality.cmi kernel/environ.cmi kernel/declarations.cmi \
-    interp/coqlib.cmi tactics/contradiction.cmi kernel/closure.cmi \
-    pretyping/clenv.cmi lib/bigint.cmi 
-contrib/omega/coq_omega.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    pretyping/tacred.cmx proofs/tacmach.cmx kernel/sign.cmx \
-    kernel/reduction.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    parsing/printer.cmx lib/pp.cmx contrib/omega/omega.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx proofs/logic.cmx \
-    library/libnames.cmx kernel/inductive.cmx library/goptions.cmx \
-    library/global.cmx pretyping/evarutil.cmx proofs/evar_refiner.cmx \
-    tactics/equality.cmx kernel/environ.cmx kernel/declarations.cmx \
-    interp/coqlib.cmx tactics/contradiction.cmx kernel/closure.cmx \
-    pretyping/clenv.cmx lib/bigint.cmx 
-contrib/omega/g_omega.cmo: lib/util.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo proofs/refiner.cmi parsing/pptactic.cmi lib/pp.cmi \
-    parsing/pcoq.cmi parsing/egrammar.cmi contrib/omega/coq_omega.cmo \
-    toplevel/cerrors.cmi 
-contrib/omega/g_omega.cmx: lib/util.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx proofs/refiner.cmx parsing/pptactic.cmx lib/pp.cmx \
-    parsing/pcoq.cmx parsing/egrammar.cmx contrib/omega/coq_omega.cmx \
-    toplevel/cerrors.cmx 
-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 lib/util.cmi \
-    pretyping/typing.cmi interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi tactics/tacticals.cmi \
-    pretyping/tacred.cmi proofs/tacmach.cmi kernel/safe_typing.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
-    pretyping/pretyping.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 \
-    tactics/elim.cmi parsing/egrammar.cmi tactics/eauto.cmi \
-    library/declare.cmi kernel/declarations.cmi library/decl_kinds.cmo \
-    interp/coqlib.cmi interp/constrintern.cmi toplevel/command.cmi \
-    kernel/closure.cmi toplevel/cerrors.cmi tactics/auto.cmi 
-contrib/recdef/recdef.cmx: toplevel/vernacinterp.cmx lib/util.cmx \
-    pretyping/typing.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx tactics/tactics.cmx tactics/tacticals.cmx \
-    pretyping/tacred.cmx proofs/tacmach.cmx kernel/safe_typing.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
-    pretyping/pretyping.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 \
-    tactics/elim.cmx parsing/egrammar.cmx tactics/eauto.cmx \
-    library/declare.cmx kernel/declarations.cmx library/decl_kinds.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 \
-    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 \
-    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 \
-    pretyping/matching.cmi library/global.cmi kernel/environ.cmi \
-    interp/coqlib.cmi 
-contrib/ring/quote.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx proofs/tacmach.cmx proofs/tacexpr.cmx \
-    proofs/proof_trees.cmx lib/pp.cmx pretyping/pattern.cmx kernel/names.cmx \
-    pretyping/matching.cmx library/global.cmx kernel/environ.cmx \
-    interp/coqlib.cmx 
-contrib/ring/ring.cmo: toplevel/vernacinterp.cmi toplevel/vernacexpr.cmo \
-    lib/util.cmi pretyping/typing.cmi kernel/term.cmi tactics/tactics.cmi \
-    tactics/tacticals.cmi pretyping/tacred.cmi proofs/tacmach.cmi \
-    proofs/tacexpr.cmo library/summary.cmi tactics/setoid_replace.cmi \
-    pretyping/reductionops.cmi contrib/ring/quote.cmo proofs/proof_trees.cmi \
-    parsing/printer.cmi lib/pp.cmi pretyping/pattern.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 tactics/hipattern.cmi tactics/hiddentac.cmi \
-    library/global.cmi pretyping/evd.cmi tactics/equality.cmi \
-    interp/coqlib.cmi interp/constrintern.cmi kernel/closure.cmi 
-contrib/ring/ring.cmx: toplevel/vernacinterp.cmx toplevel/vernacexpr.cmx \
-    lib/util.cmx pretyping/typing.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx pretyping/tacred.cmx proofs/tacmach.cmx \
-    proofs/tacexpr.cmx library/summary.cmx tactics/setoid_replace.cmx \
-    pretyping/reductionops.cmx contrib/ring/quote.cmx proofs/proof_trees.cmx \
-    parsing/printer.cmx lib/pp.cmx pretyping/pattern.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 tactics/hipattern.cmx tactics/hiddentac.cmx \
-    library/global.cmx pretyping/evd.cmx tactics/equality.cmx \
-    interp/coqlib.cmx interp/constrintern.cmx kernel/closure.cmx 
-contrib/romega/const_omega.cmo: lib/util.cmi kernel/term.cmi \
-    library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    interp/coqlib.cmi lib/bigint.cmi 
-contrib/romega/const_omega.cmx: lib/util.cmx kernel/term.cmx \
-    library/nametab.cmx kernel/names.cmx library/libnames.cmx \
-    interp/coqlib.cmx lib/bigint.cmx 
-contrib/romega/g_romega.cmo: lib/util.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo contrib/romega/refl_omega.cmo proofs/refiner.cmi \
-    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi parsing/egrammar.cmi \
-    toplevel/cerrors.cmi 
-contrib/romega/g_romega.cmx: lib/util.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx contrib/romega/refl_omega.cmx proofs/refiner.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.cmx 
-contrib/romega/refl_omega.cmo: lib/util.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    parsing/printer.cmi lib/pp.cmi contrib/omega/omega.cmo kernel/names.cmi \
-    proofs/logic.cmi interp/coqlib.cmi contrib/romega/const_omega.cmo \
-    lib/bigint.cmi 
-contrib/romega/refl_omega.cmx: lib/util.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx \
-    parsing/printer.cmx lib/pp.cmx contrib/omega/omega.cmx kernel/names.cmx \
-    proofs/logic.cmx interp/coqlib.cmx contrib/romega/const_omega.cmx \
-    lib/bigint.cmx 
-contrib/rtauto/g_rtauto.cmo: lib/util.cmi tactics/tacinterp.cmi \
-    proofs/tacexpr.cmo contrib/rtauto/refl_tauto.cmi proofs/refiner.cmi \
-    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi parsing/egrammar.cmi \
-    toplevel/cerrors.cmi 
-contrib/rtauto/g_rtauto.cmx: lib/util.cmx tactics/tacinterp.cmx \
-    proofs/tacexpr.cmx contrib/rtauto/refl_tauto.cmx proofs/refiner.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.cmx 
-contrib/rtauto/proof_search.cmo: lib/util.cmi kernel/term.cmi lib/pp.cmi \
-    library/goptions.cmi contrib/rtauto/proof_search.cmi 
-contrib/rtauto/proof_search.cmx: lib/util.cmx kernel/term.cmx lib/pp.cmx \
-    library/goptions.cmx contrib/rtauto/proof_search.cmi 
-contrib/rtauto/refl_tauto.cmo: lib/util.cmi pretyping/termops.cmi \
-    kernel/term.cmi tactics/tactics.cmi proofs/tactic_debug.cmi \
-    proofs/tacmach.cmi tactics/tacinterp.cmi lib/system.cmi \
-    pretyping/retyping.cmi contrib/rtauto/proof_search.cmi lib/pp.cmi \
-    kernel/names.cmi library/goptions.cmi lib/explore.cmi pretyping/evd.cmi \
-    kernel/environ.cmi interp/coqlib.cmi kernel/closure.cmi \
+contrib/omega/coq_omega.cmo: lib/bigint.cmi pretyping/clenv.cmi \
+    kernel/closure.cmi tactics/contradiction.cmi interp/coqlib.cmi \
+    kernel/declarations.cmi kernel/environ.cmi tactics/equality.cmi \
+    proofs/evar_refiner.cmi pretyping/evarutil.cmi library/global.cmi \
+    library/goptions.cmi kernel/inductive.cmi library/libnames.cmi \
+    proofs/logic.cmi library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    contrib/omega/omega.cmo lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/reduction.cmi \
+    kernel/sign.cmi proofs/tacmach.cmi pretyping/tacred.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+contrib/omega/coq_omega.cmx: lib/bigint.cmx pretyping/clenv.cmx \
+    kernel/closure.cmx tactics/contradiction.cmx interp/coqlib.cmx \
+    kernel/declarations.cmx kernel/environ.cmx tactics/equality.cmx \
+    proofs/evar_refiner.cmx pretyping/evarutil.cmx library/global.cmx \
+    library/goptions.cmx kernel/inductive.cmx library/libnames.cmx \
+    proofs/logic.cmx library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    contrib/omega/omega.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx kernel/reduction.cmx \
+    kernel/sign.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx 
+contrib/omega/g_omega.cmo: toplevel/cerrors.cmi contrib/omega/coq_omega.cmo \
+    parsing/egrammar.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    proofs/refiner.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi lib/util.cmi 
+contrib/omega/g_omega.cmx: toplevel/cerrors.cmx contrib/omega/coq_omega.cmx \
+    parsing/egrammar.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    proofs/refiner.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx lib/util.cmx 
+contrib/omega/omega.cmo: kernel/names.cmi lib/util.cmi 
+contrib/omega/omega.cmx: kernel/names.cmx lib/util.cmx 
+contrib/recdef/recdef.cmo: tactics/auto.cmi toplevel/cerrors.cmi \
+    kernel/closure.cmi toplevel/command.cmi interp/constrintern.cmi \
+    interp/coqlib.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi tactics/eauto.cmi parsing/egrammar.cmi \
+    tactics/elim.cmi kernel/entries.cmi kernel/environ.cmi \
+    tactics/equality.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/global.cmi tactics/hiddentac.cmi library/lib.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi parsing/pcoq.cmi proofs/pfedit.cmi \
+    lib/pp.cmi pretyping/pretyping.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/safe_typing.cmi \
+    proofs/tacmach.cmi pretyping/tacred.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/termops.cmi \
+    interp/topconstr.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi 
+contrib/recdef/recdef.cmx: tactics/auto.cmx toplevel/cerrors.cmx \
+    kernel/closure.cmx toplevel/command.cmx interp/constrintern.cmx \
+    interp/coqlib.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx tactics/eauto.cmx parsing/egrammar.cmx \
+    tactics/elim.cmx kernel/entries.cmx kernel/environ.cmx \
+    tactics/equality.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/global.cmx tactics/hiddentac.cmx library/lib.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx parsing/pcoq.cmx proofs/pfedit.cmx \
+    lib/pp.cmx pretyping/pretyping.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx kernel/safe_typing.cmx \
+    proofs/tacmach.cmx pretyping/tacred.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/termops.cmx \
+    interp/topconstr.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/ring/g_quote.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    interp/genarg.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    contrib/ring/quote.cmo proofs/refiner.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi lib/util.cmi 
+contrib/ring/g_quote.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    interp/genarg.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    contrib/ring/quote.cmx proofs/refiner.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx lib/util.cmx 
+contrib/ring/g_ring.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    interp/genarg.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    contrib/ring/quote.cmo proofs/refiner.cmi contrib/ring/ring.cmo \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi 
+contrib/ring/g_ring.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    interp/genarg.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    contrib/ring/quote.cmx proofs/refiner.cmx contrib/ring/ring.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/ring/quote.cmo: interp/coqlib.cmi kernel/environ.cmi \
+    library/global.cmi pretyping/matching.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi lib/util.cmi 
+contrib/ring/quote.cmx: interp/coqlib.cmx kernel/environ.cmx \
+    library/global.cmx pretyping/matching.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx lib/util.cmx 
+contrib/ring/ring.cmo: kernel/closure.cmi interp/constrintern.cmi \
+    interp/coqlib.cmi tactics/equality.cmi pretyping/evd.cmi \
+    library/global.cmi tactics/hiddentac.cmi tactics/hipattern.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi pretyping/pattern.cmi lib/pp.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi contrib/ring/quote.cmo \
+    pretyping/reductionops.cmi tactics/setoid_replace.cmi library/summary.cmi \
+    proofs/tacexpr.cmo proofs/tacmach.cmi pretyping/tacred.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacexpr.cmo \
+    toplevel/vernacinterp.cmi 
+contrib/ring/ring.cmx: kernel/closure.cmx interp/constrintern.cmx \
+    interp/coqlib.cmx tactics/equality.cmx pretyping/evd.cmx \
+    library/global.cmx tactics/hiddentac.cmx tactics/hipattern.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx pretyping/pattern.cmx lib/pp.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx contrib/ring/quote.cmx \
+    pretyping/reductionops.cmx tactics/setoid_replace.cmx library/summary.cmx \
+    proofs/tacexpr.cmx proofs/tacmach.cmx pretyping/tacred.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacexpr.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/romega/const_omega.cmo: lib/bigint.cmi interp/coqlib.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi kernel/term.cmi \
+    lib/util.cmi 
+contrib/romega/const_omega.cmx: lib/bigint.cmx interp/coqlib.cmx \
+    library/libnames.cmx kernel/names.cmx library/nametab.cmx kernel/term.cmx \
+    lib/util.cmx 
+contrib/romega/g_romega.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi proofs/refiner.cmi \
+    contrib/romega/refl_omega.cmo proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    lib/util.cmi 
+contrib/romega/g_romega.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx proofs/refiner.cmx \
+    contrib/romega/refl_omega.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    lib/util.cmx 
+contrib/romega/refl_omega.cmo: lib/bigint.cmi contrib/romega/const_omega.cmo \
+    interp/coqlib.cmi proofs/logic.cmi kernel/names.cmi \
+    contrib/omega/omega.cmo lib/pp.cmi parsing/printer.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi 
+contrib/romega/refl_omega.cmx: lib/bigint.cmx contrib/romega/const_omega.cmx \
+    interp/coqlib.cmx proofs/logic.cmx kernel/names.cmx \
+    contrib/omega/omega.cmx lib/pp.cmx parsing/printer.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
+contrib/rtauto/g_rtauto.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi proofs/refiner.cmi \
+    contrib/rtauto/refl_tauto.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    lib/util.cmi 
+contrib/rtauto/g_rtauto.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx proofs/refiner.cmx \
+    contrib/rtauto/refl_tauto.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    lib/util.cmx 
+contrib/rtauto/proof_search.cmo: library/goptions.cmi lib/pp.cmi \
+    kernel/term.cmi lib/util.cmi contrib/rtauto/proof_search.cmi 
+contrib/rtauto/proof_search.cmx: library/goptions.cmx lib/pp.cmx \
+    kernel/term.cmx lib/util.cmx contrib/rtauto/proof_search.cmi 
+contrib/rtauto/refl_tauto.cmo: kernel/closure.cmi interp/coqlib.cmi \
+    kernel/environ.cmi pretyping/evd.cmi lib/explore.cmi library/goptions.cmi \
+    kernel/names.cmi lib/pp.cmi contrib/rtauto/proof_search.cmi \
+    pretyping/retyping.cmi lib/system.cmi tactics/tacinterp.cmi \
+    proofs/tacmach.cmi proofs/tactic_debug.cmi tactics/tactics.cmi \
+    kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     contrib/rtauto/refl_tauto.cmi 
-contrib/rtauto/refl_tauto.cmx: lib/util.cmx pretyping/termops.cmx \
-    kernel/term.cmx tactics/tactics.cmx proofs/tactic_debug.cmx \
-    proofs/tacmach.cmx tactics/tacinterp.cmx lib/system.cmx \
-    pretyping/retyping.cmx contrib/rtauto/proof_search.cmx lib/pp.cmx \
-    kernel/names.cmx library/goptions.cmx lib/explore.cmx pretyping/evd.cmx \
-    kernel/environ.cmx interp/coqlib.cmx kernel/closure.cmx \
+contrib/rtauto/refl_tauto.cmx: kernel/closure.cmx interp/coqlib.cmx \
+    kernel/environ.cmx pretyping/evd.cmx lib/explore.cmx library/goptions.cmx \
+    kernel/names.cmx lib/pp.cmx contrib/rtauto/proof_search.cmx \
+    pretyping/retyping.cmx lib/system.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx proofs/tactic_debug.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx lib/util.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 \
-    proofs/proof_type.cmi parsing/printer.cmi pretyping/pretyping.cmi \
-    parsing/pptactic.cmi parsing/ppconstr.cmi lib/pp.cmi parsing/pcoq.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 \
-    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 \
-    proofs/proof_type.cmx parsing/printer.cmx pretyping/pretyping.cmx \
-    parsing/pptactic.cmx parsing/ppconstr.cmx lib/pp.cmx parsing/pcoq.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 \
-    kernel/closure.cmx toplevel/cerrors.cmx 
-contrib/subtac/context.cmo: kernel/term.cmi kernel/names.cmi 
-contrib/subtac/context.cmx: kernel/term.cmx kernel/names.cmx 
-contrib/subtac/eterm.cmo: pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi lib/pp.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 
-contrib/subtac/eterm.cmx: pretyping/termops.cmx kernel/term.cmx \
-    tactics/tactics.cmx tactics/tacticals.cmx proofs/tacmach.cmx lib/pp.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 
-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 library/global.cmi \
-    contrib/subtac/eterm.cmi parsing/egrammar.cmi toplevel/cerrors.cmi 
-contrib/subtac/g_eterm.cmx: lib/util.cmx proofs/tacmach.cmx \
-    tactics/tacinterp.cmx proofs/tacexpr.cmx proofs/refiner.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx library/global.cmx \
-    contrib/subtac/eterm.cmx parsing/egrammar.cmx toplevel/cerrors.cmx 
-contrib/subtac/interp_fixpoint.cmo: lib/util.cmi kernel/typeops.cmi \
-    kernel/type_errors.cmi interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi contrib/subtac/subtac_errors.cmo \
-    contrib/subtac/subtac_coercion.cmo kernel/sign.cmi \
-    contrib/subtac/scoq.cmo pretyping/reductionops.cmi \
-    pretyping/recordops.cmi pretyping/rawterm.cmi parsing/printer.cmi \
-    pretyping/pretype_errors.cmi parsing/ppconstr.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi pretyping/evarconv.cmi contrib/subtac/eterm.cmi \
-    kernel/environ.cmi lib/dyn.cmi interp/coqlib.cmi \
-    contrib/subtac/context.cmo pretyping/classops.cmi 
-contrib/subtac/interp_fixpoint.cmx: lib/util.cmx kernel/typeops.cmx \
-    kernel/type_errors.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx contrib/subtac/subtac_errors.cmx \
-    contrib/subtac/subtac_coercion.cmx kernel/sign.cmx \
-    contrib/subtac/scoq.cmx pretyping/reductionops.cmx \
-    pretyping/recordops.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    pretyping/pretype_errors.cmx parsing/ppconstr.cmx lib/pp.cmx \
-    pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx pretyping/evarconv.cmx contrib/subtac/eterm.cmx \
-    kernel/environ.cmx lib/dyn.cmx interp/coqlib.cmx \
-    contrib/subtac/context.cmx pretyping/classops.cmx 
-contrib/subtac/interp.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_errors.cmo \
-    contrib/subtac/subtac_coercion.cmo kernel/sign.cmi \
-    contrib/subtac/scoq.cmo pretyping/retyping.cmi pretyping/reductionops.cmi \
-    pretyping/recordops.cmi pretyping/rawterm.cmi parsing/printer.cmi \
-    pretyping/pretyping.cmi pretyping/pretype_errors.cmi lib/pp.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi pretyping/inductiveops.cmi kernel/inductive.cmi \
-    library/global.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    pretyping/evarconv.cmi contrib/subtac/eterm.cmi kernel/environ.cmi \
-    lib/dyn.cmi kernel/declarations.cmi interp/coqlib.cmi \
-    contrib/subtac/context.cmo interp/constrintern.cmi pretyping/classops.cmi \
-    pretyping/cases.cmi 
-contrib/subtac/interp.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_errors.cmx \
-    contrib/subtac/subtac_coercion.cmx kernel/sign.cmx \
-    contrib/subtac/scoq.cmx pretyping/retyping.cmx pretyping/reductionops.cmx \
-    pretyping/recordops.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    pretyping/pretyping.cmx pretyping/pretype_errors.cmx lib/pp.cmx \
-    pretyping/pattern.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx pretyping/inductiveops.cmx kernel/inductive.cmx \
-    library/global.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    pretyping/evarconv.cmx contrib/subtac/eterm.cmx kernel/environ.cmx \
-    lib/dyn.cmx kernel/declarations.cmx interp/coqlib.cmx \
-    contrib/subtac/context.cmx interp/constrintern.cmx pretyping/classops.cmx \
-    pretyping/cases.cmx 
-contrib/subtac/scoq.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi parsing/printer.cmi \
-    pretyping/pretype_errors.cmi lib/pp.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 
-contrib/subtac/scoq.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx parsing/printer.cmx \
-    pretyping/pretype_errors.cmx lib/pp.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 
-contrib/subtac/sparser.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.cmo \
-    kernel/reduction.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/sparser.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 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 \
-    kernel/term.cmi contrib/subtac/subtac_errors.cmo contrib/subtac/scoq.cmo \
-    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.cmo pretyping/classops.cmi 
-contrib/subtac/subtac_coercion.cmx: lib/util.cmx kernel/typeops.cmx \
-    kernel/term.cmx contrib/subtac/subtac_errors.cmx contrib/subtac/scoq.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_command.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    pretyping/typing.cmi interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi proofs/tactic_debug.cmi pretyping/tacred.cmi \
-    proofs/tacmach.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    interp/syntax_def.cmi library/states.cmi kernel/sign.cmi \
-    contrib/subtac/scoq.cmo kernel/safe_typing.cmi proofs/refiner.cmi \
-    pretyping/rawterm.cmi proofs/proof_type.cmi parsing/printer.cmi \
-    pretyping/pretyping.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 \
-    contrib/subtac/interp_fixpoint.cmo contrib/subtac/interp.cmo \
-    pretyping/inductiveops.cmi library/impargs.cmi tactics/hiddentac.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.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/constrintern.cmi toplevel/command.cmi \
-    kernel/closure.cmi 
-contrib/subtac/subtac_command.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    pretyping/typing.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx proofs/tactic_debug.cmx pretyping/tacred.cmx \
-    proofs/tacmach.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    interp/syntax_def.cmx library/states.cmx kernel/sign.cmx \
-    contrib/subtac/scoq.cmx kernel/safe_typing.cmx proofs/refiner.cmx \
-    pretyping/rawterm.cmx proofs/proof_type.cmx parsing/printer.cmx \
-    pretyping/pretyping.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 \
-    contrib/subtac/interp_fixpoint.cmx contrib/subtac/interp.cmx \
-    pretyping/inductiveops.cmx library/impargs.cmx tactics/hiddentac.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.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/constrintern.cmx toplevel/command.cmx \
-    kernel/closure.cmx 
-contrib/subtac/subtac_errors.cmo: lib/util.cmi parsing/printer.cmi lib/pp.cmi 
-contrib/subtac/subtac_errors.cmx: lib/util.cmx parsing/printer.cmx lib/pp.cmx 
-contrib/subtac/subtac.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    kernel/typeops.cmi kernel/type_errors.cmi pretyping/termops.cmi \
-    kernel/term.cmi contrib/subtac/subtac_errors.cmo \
-    contrib/subtac/subtac_command.cmo contrib/subtac/subtac_coercion.cmo \
-    kernel/sign.cmi contrib/subtac/scoq.cmo pretyping/reductionops.cmi \
-    pretyping/recordops.cmi pretyping/rawterm.cmi parsing/printer.cmi \
-    pretyping/pretype_errors.cmi parsing/ppconstr.cmi lib/pp.cmi \
-    proofs/pfedit.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/library.cmi library/libnames.cmi \
-    contrib/subtac/interp_fixpoint.cmo contrib/subtac/interp.cmo \
-    toplevel/himsg.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi pretyping/evarconv.cmi contrib/subtac/eterm.cmi \
-    kernel/environ.cmi lib/dyn.cmi interp/coqlib.cmi \
-    contrib/subtac/context.cmo toplevel/command.cmi pretyping/classops.cmi \
-    toplevel/cerrors.cmi 
-contrib/subtac/subtac.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    kernel/typeops.cmx kernel/type_errors.cmx pretyping/termops.cmx \
-    kernel/term.cmx contrib/subtac/subtac_errors.cmx \
-    contrib/subtac/subtac_command.cmx contrib/subtac/subtac_coercion.cmx \
-    kernel/sign.cmx contrib/subtac/scoq.cmx pretyping/reductionops.cmx \
-    pretyping/recordops.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    pretyping/pretype_errors.cmx parsing/ppconstr.cmx lib/pp.cmx \
-    proofs/pfedit.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/library.cmx library/libnames.cmx \
-    contrib/subtac/interp_fixpoint.cmx contrib/subtac/interp.cmx \
-    toplevel/himsg.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx pretyping/evarconv.cmx contrib/subtac/eterm.cmx \
-    kernel/environ.cmx lib/dyn.cmx interp/coqlib.cmx \
-    contrib/subtac/context.cmx toplevel/command.cmx pretyping/classops.cmx \
-    toplevel/cerrors.cmx 
-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 
-contrib/xml/acic2Xml.cmx: contrib/xml/xml.cmx lib/util.cmx kernel/term.cmx \
-    kernel/names.cmx contrib/xml/cic2acic.cmx contrib/xml/acic.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 \
-    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 \
-    pretyping/inductiveops.cmi library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi contrib/xml/doubleTypeInference.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 \
-    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 \
-    pretyping/inductiveops.cmx library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx contrib/xml/doubleTypeInference.cmx \
-    library/dischargedhypsmap.cmx library/declare.cmx kernel/declarations.cmx \
-    contrib/xml/acic.cmx 
-contrib/xml/cic2Xml.cmo: contrib/xml/xml.cmi contrib/xml/unshare.cmi \
-    tactics/tacinterp.cmi contrib/xml/cic2acic.cmo contrib/xml/acic2Xml.cmo \
-    contrib/xml/acic.cmo 
-contrib/xml/cic2Xml.cmx: contrib/xml/xml.cmx contrib/xml/unshare.cmx \
-    tactics/tacinterp.cmx contrib/xml/cic2acic.cmx contrib/xml/acic2Xml.cmx \
-    contrib/xml/acic.cmx 
-contrib/xml/doubleTypeInference.cmo: lib/util.cmi contrib/xml/unshare.cmi \
-    kernel/typeops.cmi pretyping/termops.cmi kernel/term.cmi \
-    pretyping/retyping.cmi pretyping/reductionops.cmi kernel/reduction.cmi \
-    proofs/redexpr.cmi pretyping/rawterm.cmi parsing/printer.cmi lib/pp.cmi \
-    kernel/names.cmi library/libnames.cmi pretyping/inductiveops.cmi \
-    kernel/inductive.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    kernel/environ.cmi kernel/conv_oracle.cmi contrib/xml/acic.cmo \
-    contrib/xml/doubleTypeInference.cmi 
-contrib/xml/doubleTypeInference.cmx: lib/util.cmx contrib/xml/unshare.cmx \
-    kernel/typeops.cmx pretyping/termops.cmx kernel/term.cmx \
-    pretyping/retyping.cmx pretyping/reductionops.cmx kernel/reduction.cmx \
-    proofs/redexpr.cmx pretyping/rawterm.cmx parsing/printer.cmx lib/pp.cmx \
-    kernel/names.cmx library/libnames.cmx pretyping/inductiveops.cmx \
-    kernel/inductive.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    kernel/environ.cmx kernel/conv_oracle.cmx contrib/xml/acic.cmx \
-    contrib/xml/doubleTypeInference.cmi 
-contrib/xml/proof2aproof.cmo: lib/util.cmi contrib/xml/unshare.cmi \
-    pretyping/termops.cmi kernel/term.cmi parsing/tactic_printer.cmi \
-    proofs/tacmach.cmi kernel/sign.cmi proofs/refiner.cmi \
-    proofs/proof_type.cmi lib/pp.cmi proofs/logic.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi 
-contrib/xml/proof2aproof.cmx: lib/util.cmx contrib/xml/unshare.cmx \
-    pretyping/termops.cmx kernel/term.cmx parsing/tactic_printer.cmx \
-    proofs/tacmach.cmx kernel/sign.cmx proofs/refiner.cmx \
-    proofs/proof_type.cmx lib/pp.cmx proofs/logic.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx 
-contrib/xml/proofTree2Xml.cmo: contrib/xml/xml.cmi lib/util.cmi \
-    contrib/xml/unshare.cmi kernel/term.cmi proofs/tacexpr.cmo \
-    kernel/sign.cmi proofs/proof_type.cmi contrib/xml/proof2aproof.cmo \
-    parsing/printer.cmi parsing/pptactic.cmi lib/pp.cmi kernel/names.cmi \
-    proofs/logic.cmi library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    contrib/xml/cic2acic.cmo contrib/xml/acic2Xml.cmo contrib/xml/acic.cmo 
-contrib/xml/proofTree2Xml.cmx: contrib/xml/xml.cmx lib/util.cmx \
-    contrib/xml/unshare.cmx kernel/term.cmx proofs/tacexpr.cmx \
-    kernel/sign.cmx proofs/proof_type.cmx contrib/xml/proof2aproof.cmx \
-    parsing/printer.cmx parsing/pptactic.cmx lib/pp.cmx kernel/names.cmx \
-    proofs/logic.cmx library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    contrib/xml/cic2acic.cmx contrib/xml/acic2Xml.cmx contrib/xml/acic.cmx 
+contrib/setoid_ring/newring.cmo: toplevel/cerrors.cmi kernel/closure.cmi \
+    interp/constrintern.cmi interp/coqlib.cmi parsing/egrammar.cmi \
+    kernel/environ.cmi kernel/esubst.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/global.cmi parsing/lexer.cmi library/lib.cmi \
+    library/libobject.cmi kernel/mod_subst.cmi kernel/names.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/ppconstr.cmi parsing/pptactic.cmi \
+    pretyping/pretyping.cmi parsing/printer.cmi proofs/proof_type.cmi \
+    pretyping/rawterm.cmi proofs/refiner.cmi pretyping/retyping.cmi \
+    tactics/setoid_replace.cmi library/summary.cmi proofs/tacexpr.cmo \
+    tactics/tacinterp.cmi proofs/tacmach.cmi tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi 
+contrib/setoid_ring/newring.cmx: toplevel/cerrors.cmx kernel/closure.cmx \
+    interp/constrintern.cmx interp/coqlib.cmx parsing/egrammar.cmx \
+    kernel/environ.cmx kernel/esubst.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/global.cmx parsing/lexer.cmx library/lib.cmx \
+    library/libobject.cmx kernel/mod_subst.cmx kernel/names.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/ppconstr.cmx parsing/pptactic.cmx \
+    pretyping/pretyping.cmx parsing/printer.cmx proofs/proof_type.cmx \
+    pretyping/rawterm.cmx proofs/refiner.cmx pretyping/retyping.cmx \
+    tactics/setoid_replace.cmx library/summary.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/subtac/context.cmo: kernel/names.cmi kernel/term.cmi \
+    contrib/subtac/context.cmi 
+contrib/subtac/context.cmx: kernel/names.cmx kernel/term.cmx \
+    contrib/subtac/context.cmi 
+contrib/subtac/eterm.cmo: library/decl_kinds.cmo library/declare.cmi \
+    kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.cmi kernel/names.cmi lib/pp.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi \
+    pretyping/termops.cmi contrib/subtac/eterm.cmi 
+contrib/subtac/eterm.cmx: library/decl_kinds.cmx library/declare.cmx \
+    kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.cmx kernel/names.cmx lib/pp.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx tactics/tactics.cmx kernel/term.cmx \
+    pretyping/termops.cmx contrib/subtac/eterm.cmi 
+contrib/subtac/g_eterm.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    contrib/subtac/eterm.cmi parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    proofs/refiner.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    proofs/tacmach.cmi lib/util.cmi 
+contrib/subtac/g_eterm.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    contrib/subtac/eterm.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    proofs/refiner.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx lib/util.cmx 
+contrib/subtac/g_subtac.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    interp/genarg.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi lib/options.cmi parsing/pcoq.cmi lib/pp.cmi \
+    kernel/reduction.cmi contrib/subtac/subtac.cmi proofs/tacexpr.cmo \
+    kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacentries.cmi toplevel/vernacexpr.cmo \
+    toplevel/vernacinterp.cmi 
+contrib/subtac/g_subtac.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    interp/genarg.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx lib/options.cmx parsing/pcoq.cmx lib/pp.cmx \
+    kernel/reduction.cmx contrib/subtac/subtac.cmx proofs/tacexpr.cmx \
+    kernel/term.cmx interp/topconstr.cmx lib/util.cmx \
+    toplevel/vernacentries.cmx toplevel/vernacexpr.cmx \
+    toplevel/vernacinterp.cmx 
+contrib/subtac/subtac_coercion.cmo: pretyping/classops.cmi \
+    contrib/subtac/context.cmi interp/coqlib.cmi kernel/environ.cmi \
+    contrib/subtac/eterm.cmi pretyping/evarconv.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi library/global.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi kernel/reduction.cmi pretyping/reductionops.cmi \
+    pretyping/retyping.cmi contrib/subtac/subtac_errors.cmi \
+    contrib/subtac/subtac_utils.cmi kernel/term.cmi kernel/typeops.cmi \
+    lib/util.cmi contrib/subtac/subtac_coercion.cmi 
+contrib/subtac/subtac_coercion.cmx: pretyping/classops.cmx \
+    contrib/subtac/context.cmx interp/coqlib.cmx kernel/environ.cmx \
+    contrib/subtac/eterm.cmx pretyping/evarconv.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx library/global.cmx kernel/names.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    pretyping/recordops.cmx kernel/reduction.cmx pretyping/reductionops.cmx \
+    pretyping/retyping.cmx contrib/subtac/subtac_errors.cmx \
+    contrib/subtac/subtac_utils.cmx kernel/term.cmx kernel/typeops.cmx \
+    lib/util.cmx contrib/subtac/subtac_coercion.cmi 
+contrib/subtac/subtac_command.cmo: kernel/closure.cmi toplevel/command.cmi \
+    interp/constrintern.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.cmi lib/dyn.cmi kernel/entries.cmi kernel/environ.cmi \
+    contrib/subtac/eterm.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/global.cmi tactics/hiddentac.cmi library/impargs.cmi \
+    pretyping/inductiveops.cmi library/libnames.cmi library/libobject.cmi \
+    pretyping/matching.cmi toplevel/metasyntax.cmi kernel/mod_subst.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    interp/notation.cmi lib/options.cmi pretyping/pattern.cmi \
+    proofs/pfedit.cmi lib/pp.cmi pretyping/pretyping.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/refiner.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi library/states.cmi \
+    contrib/subtac/subtac_interp_fixpoint.cmi \
+    contrib/subtac/subtac_pretyping.cmi contrib/subtac/subtac_utils.cmi \
+    interp/syntax_def.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    proofs/tacmach.cmi pretyping/tacred.cmi proofs/tactic_debug.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi \
+    pretyping/typing.cmi lib/util.cmi toplevel/vernacexpr.cmo \
+    contrib/subtac/subtac_command.cmi 
+contrib/subtac/subtac_command.cmx: kernel/closure.cmx toplevel/command.cmx \
+    interp/constrintern.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.cmx lib/dyn.cmx kernel/entries.cmx kernel/environ.cmx \
+    contrib/subtac/eterm.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/global.cmx tactics/hiddentac.cmx library/impargs.cmx \
+    pretyping/inductiveops.cmx library/libnames.cmx library/libobject.cmx \
+    pretyping/matching.cmx toplevel/metasyntax.cmx kernel/mod_subst.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    interp/notation.cmx lib/options.cmx pretyping/pattern.cmx \
+    proofs/pfedit.cmx lib/pp.cmx pretyping/pretyping.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
+    kernel/safe_typing.cmx kernel/sign.cmx library/states.cmx \
+    contrib/subtac/subtac_interp_fixpoint.cmx \
+    contrib/subtac/subtac_pretyping.cmx contrib/subtac/subtac_utils.cmx \
+    interp/syntax_def.cmx proofs/tacexpr.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx pretyping/tacred.cmx proofs/tactic_debug.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacexpr.cmx \
+    contrib/subtac/subtac_command.cmi 
+contrib/subtac/subtac_errors.cmo: lib/pp.cmi parsing/printer.cmi lib/util.cmi \
+    contrib/subtac/subtac_errors.cmi 
+contrib/subtac/subtac_errors.cmx: lib/pp.cmx parsing/printer.cmx lib/util.cmx \
+    contrib/subtac/subtac_errors.cmi 
+contrib/subtac/subtac_interp_fixpoint.cmo: pretyping/classops.cmi \
+    contrib/subtac/context.cmi interp/coqlib.cmi lib/dyn.cmi \
+    kernel/environ.cmi contrib/subtac/eterm.cmi pretyping/evarconv.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    pretyping/pattern.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi pretyping/reductionops.cmi kernel/sign.cmi \
+    contrib/subtac/subtac_coercion.cmi contrib/subtac/subtac_errors.cmi \
+    contrib/subtac/subtac_utils.cmi kernel/term.cmi pretyping/termops.cmi \
+    interp/topconstr.cmi kernel/type_errors.cmi kernel/typeops.cmi \
+    lib/util.cmi contrib/subtac/subtac_interp_fixpoint.cmi 
+contrib/subtac/subtac_interp_fixpoint.cmx: pretyping/classops.cmx \
+    contrib/subtac/context.cmx interp/coqlib.cmx lib/dyn.cmx \
+    kernel/environ.cmx contrib/subtac/eterm.cmx pretyping/evarconv.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    pretyping/pattern.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    pretyping/recordops.cmx pretyping/reductionops.cmx kernel/sign.cmx \
+    contrib/subtac/subtac_coercion.cmx contrib/subtac/subtac_errors.cmx \
+    contrib/subtac/subtac_utils.cmx kernel/term.cmx pretyping/termops.cmx \
+    interp/topconstr.cmx kernel/type_errors.cmx kernel/typeops.cmx \
+    lib/util.cmx contrib/subtac/subtac_interp_fixpoint.cmi 
+contrib/subtac/subtac.cmo: toplevel/cerrors.cmi pretyping/classops.cmi \
+    toplevel/command.cmi contrib/subtac/context.cmi interp/coqlib.cmi \
+    lib/dyn.cmi kernel/environ.cmi contrib/subtac/eterm.cmi \
+    pretyping/evarconv.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.cmi toplevel/himsg.cmi library/libnames.cmi \
+    library/library.cmi kernel/names.cmi pretyping/pattern.cmi \
+    proofs/pfedit.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi pretyping/reductionops.cmi kernel/sign.cmi \
+    contrib/subtac/subtac_coercion.cmi contrib/subtac/subtac_command.cmi \
+    contrib/subtac/subtac_errors.cmi \
+    contrib/subtac/subtac_interp_fixpoint.cmi \
+    contrib/subtac/subtac_pretyping.cmi contrib/subtac/subtac_utils.cmi \
+    kernel/term.cmi pretyping/termops.cmi kernel/type_errors.cmi \
+    kernel/typeops.cmi lib/util.cmi toplevel/vernacexpr.cmo \
+    contrib/subtac/subtac.cmi 
+contrib/subtac/subtac.cmx: toplevel/cerrors.cmx pretyping/classops.cmx \
+    toplevel/command.cmx contrib/subtac/context.cmx interp/coqlib.cmx \
+    lib/dyn.cmx kernel/environ.cmx contrib/subtac/eterm.cmx \
+    pretyping/evarconv.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.cmx toplevel/himsg.cmx library/libnames.cmx \
+    library/library.cmx kernel/names.cmx pretyping/pattern.cmx \
+    proofs/pfedit.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    pretyping/recordops.cmx pretyping/reductionops.cmx kernel/sign.cmx \
+    contrib/subtac/subtac_coercion.cmx contrib/subtac/subtac_command.cmx \
+    contrib/subtac/subtac_errors.cmx \
+    contrib/subtac/subtac_interp_fixpoint.cmx \
+    contrib/subtac/subtac_pretyping.cmx contrib/subtac/subtac_utils.cmx \
+    kernel/term.cmx pretyping/termops.cmx kernel/type_errors.cmx \
+    kernel/typeops.cmx lib/util.cmx toplevel/vernacexpr.cmx \
+    contrib/subtac/subtac.cmi 
+contrib/subtac/subtac_pretyping.cmo: pretyping/classops.cmi \
+    interp/constrintern.cmi contrib/subtac/context.cmi interp/coqlib.cmi \
+    lib/dyn.cmi kernel/environ.cmi contrib/subtac/eterm.cmi \
+    pretyping/evarconv.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.cmi library/libnames.cmi library/nameops.cmi \
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi pretyping/pretyping.cmi parsing/printer.cmi \
+    pretyping/rawterm.cmi pretyping/recordops.cmi pretyping/reductionops.cmi \
+    kernel/sign.cmi contrib/subtac/subtac_coercion.cmi \
+    contrib/subtac/subtac_errors.cmi contrib/subtac/subtac_utils.cmi \
+    kernel/term.cmi pretyping/termops.cmi interp/topconstr.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo contrib/subtac/subtac_pretyping.cmi 
+contrib/subtac/subtac_pretyping.cmx: pretyping/classops.cmx \
+    interp/constrintern.cmx contrib/subtac/context.cmx interp/coqlib.cmx \
+    lib/dyn.cmx kernel/environ.cmx contrib/subtac/eterm.cmx \
+    pretyping/evarconv.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.cmx library/libnames.cmx library/nameops.cmx \
+    kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx pretyping/pretyping.cmx parsing/printer.cmx \
+    pretyping/rawterm.cmx pretyping/recordops.cmx pretyping/reductionops.cmx \
+    kernel/sign.cmx contrib/subtac/subtac_coercion.cmx \
+    contrib/subtac/subtac_errors.cmx contrib/subtac/subtac_utils.cmx \
+    kernel/term.cmx pretyping/termops.cmx interp/topconstr.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx contrib/subtac/subtac_pretyping.cmi 
+contrib/subtac/subtac_utils.cmo: interp/constrextern.cmi interp/coqlib.cmi \
+    library/decl_kinds.cmo pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.cmi library/libnames.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
+    contrib/subtac/subtac_utils.cmi 
+contrib/subtac/subtac_utils.cmx: interp/constrextern.cmx interp/coqlib.cmx \
+    library/decl_kinds.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.cmx library/libnames.cmx kernel/names.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx lib/util.cmx \
+    contrib/subtac/subtac_utils.cmi 
+contrib/xml/acic2Xml.cmo: contrib/xml/acic.cmo contrib/xml/cic2acic.cmo \
+    kernel/names.cmi kernel/term.cmi lib/util.cmi contrib/xml/xml.cmi 
+contrib/xml/acic2Xml.cmx: contrib/xml/acic.cmx contrib/xml/cic2acic.cmx \
+    kernel/names.cmx kernel/term.cmx lib/util.cmx contrib/xml/xml.cmx 
+contrib/xml/acic.cmo: kernel/names.cmi kernel/term.cmi 
+contrib/xml/acic.cmx: kernel/names.cmx kernel/term.cmx 
+contrib/xml/cic2acic.cmo: contrib/xml/acic.cmo kernel/declarations.cmi \
+    library/declare.cmi library/dischargedhypsmap.cmi \
+    contrib/xml/doubleTypeInference.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi pretyping/inductiveops.cmi library/lib.cmi \
+    library/libnames.cmi library/library.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi lib/pp.cmi parsing/printer.cmi \
+    pretyping/reductionops.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/univ.cmi contrib/xml/unshare.cmi lib/util.cmi 
+contrib/xml/cic2acic.cmx: contrib/xml/acic.cmx kernel/declarations.cmx \
+    library/declare.cmx library/dischargedhypsmap.cmx \
+    contrib/xml/doubleTypeInference.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/global.cmx pretyping/inductiveops.cmx library/lib.cmx \
+    library/libnames.cmx library/library.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx lib/pp.cmx parsing/printer.cmx \
+    pretyping/reductionops.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/univ.cmx contrib/xml/unshare.cmx lib/util.cmx 
+contrib/xml/cic2Xml.cmo: contrib/xml/acic.cmo contrib/xml/acic2Xml.cmo \
+    contrib/xml/cic2acic.cmo tactics/tacinterp.cmi contrib/xml/unshare.cmi \
+    contrib/xml/xml.cmi 
+contrib/xml/cic2Xml.cmx: contrib/xml/acic.cmx contrib/xml/acic2Xml.cmx \
+    contrib/xml/cic2acic.cmx tactics/tacinterp.cmx contrib/xml/unshare.cmx \
+    contrib/xml/xml.cmx 
+contrib/xml/doubleTypeInference.cmo: contrib/xml/acic.cmo \
+    kernel/conv_oracle.cmi kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
+    pretyping/rawterm.cmi proofs/redexpr.cmi kernel/reduction.cmi \
+    pretyping/reductionops.cmi pretyping/retyping.cmi kernel/term.cmi \
+    pretyping/termops.cmi kernel/typeops.cmi contrib/xml/unshare.cmi \
+    lib/util.cmi contrib/xml/doubleTypeInference.cmi 
+contrib/xml/doubleTypeInference.cmx: contrib/xml/acic.cmx \
+    kernel/conv_oracle.cmx kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
+    pretyping/rawterm.cmx proofs/redexpr.cmx kernel/reduction.cmx \
+    pretyping/reductionops.cmx pretyping/retyping.cmx kernel/term.cmx \
+    pretyping/termops.cmx kernel/typeops.cmx contrib/xml/unshare.cmx \
+    lib/util.cmx contrib/xml/doubleTypeInference.cmi 
+contrib/xml/proof2aproof.cmo: kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi proofs/logic.cmi lib/pp.cmi proofs/proof_type.cmi \
+    proofs/refiner.cmi kernel/sign.cmi proofs/tacmach.cmi \
+    parsing/tactic_printer.cmi kernel/term.cmi pretyping/termops.cmi \
+    contrib/xml/unshare.cmi lib/util.cmi 
+contrib/xml/proof2aproof.cmx: kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx proofs/logic.cmx lib/pp.cmx proofs/proof_type.cmx \
+    proofs/refiner.cmx kernel/sign.cmx proofs/tacmach.cmx \
+    parsing/tactic_printer.cmx kernel/term.cmx pretyping/termops.cmx \
+    contrib/xml/unshare.cmx lib/util.cmx 
+contrib/xml/proofTree2Xml.cmo: contrib/xml/acic.cmo contrib/xml/acic2Xml.cmo \
+    contrib/xml/cic2acic.cmo kernel/environ.cmi pretyping/evd.cmi \
+    library/global.cmi proofs/logic.cmi kernel/names.cmi lib/pp.cmi \
+    parsing/pptactic.cmi parsing/printer.cmi contrib/xml/proof2aproof.cmo \
+    proofs/proof_type.cmi kernel/sign.cmi proofs/tacexpr.cmo kernel/term.cmi \
+    contrib/xml/unshare.cmi lib/util.cmi contrib/xml/xml.cmi 
+contrib/xml/proofTree2Xml.cmx: contrib/xml/acic.cmx contrib/xml/acic2Xml.cmx \
+    contrib/xml/cic2acic.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/global.cmx proofs/logic.cmx kernel/names.cmx lib/pp.cmx \
+    parsing/pptactic.cmx parsing/printer.cmx contrib/xml/proof2aproof.cmx \
+    proofs/proof_type.cmx kernel/sign.cmx proofs/tacexpr.cmx kernel/term.cmx \
+    contrib/xml/unshare.cmx lib/util.cmx contrib/xml/xml.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 \
-    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 \
-    pretyping/inductiveops.cmi library/global.cmi pretyping/evd.cmi \
-    pretyping/evarutil.cmi kernel/environ.cmi library/declare.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo 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 \
-    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 \
-    pretyping/inductiveops.cmx library/global.cmx pretyping/evd.cmx \
-    pretyping/evarutil.cmx kernel/environ.cmx library/declare.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx config/coq_config.cmx \
-    contrib/xml/cic2acic.cmx contrib/xml/acic2Xml.cmx contrib/xml/acic.cmx \
+contrib/xml/xmlcommand.cmo: contrib/xml/acic.cmo contrib/xml/acic2Xml.cmo \
+    contrib/xml/cic2acic.cmo config/coq_config.cmi library/decl_kinds.cmo \
+    kernel/declarations.cmi library/declare.cmi kernel/environ.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
+    pretyping/inductiveops.cmi parsing/lexer.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    kernel/names.cmi library/nametab.cmi proofs/pfedit.cmi \
+    contrib/xml/proof2aproof.cmo proofs/proof_trees.cmi \
+    pretyping/recordops.cmi proofs/tacmach.cmi kernel/term.cmi \
+    contrib/xml/unshare.cmi lib/util.cmi toplevel/vernac.cmi \
+    contrib/xml/xml.cmi contrib/xml/xmlcommand.cmi 
+contrib/xml/xmlcommand.cmx: contrib/xml/acic.cmx contrib/xml/acic2Xml.cmx \
+    contrib/xml/cic2acic.cmx config/coq_config.cmx library/decl_kinds.cmx \
+    kernel/declarations.cmx library/declare.cmx kernel/environ.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx \
+    pretyping/inductiveops.cmx parsing/lexer.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    kernel/names.cmx library/nametab.cmx proofs/pfedit.cmx \
+    contrib/xml/proof2aproof.cmx proofs/proof_trees.cmx \
+    pretyping/recordops.cmx proofs/tacmach.cmx kernel/term.cmx \
+    contrib/xml/unshare.cmx lib/util.cmx toplevel/vernac.cmx \
+    contrib/xml/xml.cmx contrib/xml/xmlcommand.cmi 
+contrib/xml/xmlentries.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    parsing/extend.cmi interp/genarg.cmi parsing/lexer.cmi parsing/pcoq.cmi \
+    lib/pp.cmi lib/util.cmi toplevel/vernacinterp.cmi \
     contrib/xml/xmlcommand.cmi 
-contrib/xml/xmlentries.cmo: contrib/xml/xmlcommand.cmi \
-    toplevel/vernacinterp.cmi lib/util.cmi lib/pp.cmi parsing/pcoq.cmi \
-    parsing/lexer.cmi interp/genarg.cmi parsing/extend.cmi \
-    parsing/egrammar.cmi toplevel/cerrors.cmi 
-contrib/xml/xmlentries.cmx: contrib/xml/xmlcommand.cmx \
-    toplevel/vernacinterp.cmx lib/util.cmx lib/pp.cmx parsing/pcoq.cmx \
-    parsing/lexer.cmx interp/genarg.cmx parsing/extend.cmx \
-    parsing/egrammar.cmx toplevel/cerrors.cmx 
+contrib/xml/xmlentries.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    parsing/extend.cmx interp/genarg.cmx parsing/lexer.cmx parsing/pcoq.cmx \
+    lib/pp.cmx lib/util.cmx toplevel/vernacinterp.cmx \
+    contrib/xml/xmlcommand.cmx 
 contrib/xml/xml.cmo: contrib/xml/xml.cmi 
 contrib/xml/xml.cmx: contrib/xml/xml.cmi 
 ide/utils/config_file.cmo: ide/utils/config_file.cmi 
 ide/utils/config_file.cmx: ide/utils/config_file.cmi 
-ide/utils/configwin_html_config.cmo: ide/utils/configwin_types.cmo \
-    ide/utils/configwin_messages.cmo ide/utils/configwin_ihm.cmo \
-    ide/utils/config_file.cmi 
-ide/utils/configwin_html_config.cmx: ide/utils/configwin_types.cmx \
-    ide/utils/configwin_messages.cmx ide/utils/configwin_ihm.cmx \
-    ide/utils/config_file.cmx 
-ide/utils/configwin_ihm.cmo: ide/utils/okey.cmi ide/utils/configwin_types.cmo \
-    ide/utils/configwin_messages.cmo ide/utils/config_file.cmi 
-ide/utils/configwin_ihm.cmx: ide/utils/okey.cmx ide/utils/configwin_types.cmx \
-    ide/utils/configwin_messages.cmx ide/utils/config_file.cmx 
-ide/utils/configwin.cmo: ide/utils/configwin_types.cmo \
-    ide/utils/configwin_ihm.cmo ide/utils/configwin.cmi 
-ide/utils/configwin.cmx: ide/utils/configwin_types.cmx \
-    ide/utils/configwin_ihm.cmx ide/utils/configwin.cmi 
-ide/utils/configwin_types.cmo: ide/utils/configwin_keys.cmo \
-    ide/utils/config_file.cmi 
-ide/utils/configwin_types.cmx: ide/utils/configwin_keys.cmx \
-    ide/utils/config_file.cmx 
+ide/utils/configwin_html_config.cmo: ide/utils/config_file.cmi \
+    ide/utils/configwin_ihm.cmo ide/utils/configwin_messages.cmo \
+    ide/utils/configwin_types.cmo 
+ide/utils/configwin_html_config.cmx: ide/utils/config_file.cmx \
+    ide/utils/configwin_ihm.cmx ide/utils/configwin_messages.cmx \
+    ide/utils/configwin_types.cmx 
+ide/utils/configwin_ihm.cmo: ide/utils/config_file.cmi \
+    ide/utils/configwin_messages.cmo ide/utils/configwin_types.cmo \
+    ide/utils/okey.cmi 
+ide/utils/configwin_ihm.cmx: ide/utils/config_file.cmx \
+    ide/utils/configwin_messages.cmx ide/utils/configwin_types.cmx \
+    ide/utils/okey.cmx 
+ide/utils/configwin.cmo: ide/utils/configwin_ihm.cmo \
+    ide/utils/configwin_types.cmo ide/utils/configwin.cmi 
+ide/utils/configwin.cmx: ide/utils/configwin_ihm.cmx \
+    ide/utils/configwin_types.cmx ide/utils/configwin.cmi 
+ide/utils/configwin_types.cmo: ide/utils/config_file.cmi \
+    ide/utils/configwin_keys.cmo 
+ide/utils/configwin_types.cmx: ide/utils/config_file.cmx \
+    ide/utils/configwin_keys.cmx 
 ide/utils/okey.cmo: ide/utils/okey.cmi 
 ide/utils/okey.cmx: ide/utils/okey.cmi 
 ide/utils/uoptions.cmo: ide/utils/uoptions.cmi 
 ide/utils/uoptions.cmx: ide/utils/uoptions.cmi 
 tools/coqdoc/alpha.cmo: tools/coqdoc/alpha.cmi 
 tools/coqdoc/alpha.cmx: tools/coqdoc/alpha.cmi 
-tools/coqdoc/index.cmo: tools/coqdoc/cdglobals.cmo tools/coqdoc/alpha.cmi \
+tools/coqdoc/index.cmo: tools/coqdoc/alpha.cmi tools/coqdoc/cdglobals.cmo \
     tools/coqdoc/index.cmi 
-tools/coqdoc/index.cmx: tools/coqdoc/cdglobals.cmx tools/coqdoc/alpha.cmx \
+tools/coqdoc/index.cmx: tools/coqdoc/alpha.cmx tools/coqdoc/cdglobals.cmx \
     tools/coqdoc/index.cmi 
-tools/coqdoc/main.cmo: tools/coqdoc/pretty.cmi tools/coqdoc/output.cmi \
-    tools/coqdoc/index.cmi config/coq_config.cmi tools/coqdoc/cdglobals.cmo 
-tools/coqdoc/main.cmx: tools/coqdoc/pretty.cmx tools/coqdoc/output.cmx \
-    tools/coqdoc/index.cmx config/coq_config.cmx tools/coqdoc/cdglobals.cmx 
-tools/coqdoc/output.cmo: tools/coqdoc/index.cmi tools/coqdoc/cdglobals.cmo \
+tools/coqdoc/main.cmo: tools/coqdoc/cdglobals.cmo config/coq_config.cmi \
+    tools/coqdoc/index.cmi tools/coqdoc/output.cmi tools/coqdoc/pretty.cmi 
+tools/coqdoc/main.cmx: tools/coqdoc/cdglobals.cmx config/coq_config.cmx \
+    tools/coqdoc/index.cmx tools/coqdoc/output.cmx tools/coqdoc/pretty.cmx 
+tools/coqdoc/output.cmo: tools/coqdoc/cdglobals.cmo tools/coqdoc/index.cmi \
     tools/coqdoc/output.cmi 
-tools/coqdoc/output.cmx: tools/coqdoc/index.cmx tools/coqdoc/cdglobals.cmx \
+tools/coqdoc/output.cmx: tools/coqdoc/cdglobals.cmx tools/coqdoc/index.cmx \
     tools/coqdoc/output.cmi 
-tools/coqdoc/pretty.cmo: tools/coqdoc/output.cmi tools/coqdoc/index.cmi \
-    tools/coqdoc/cdglobals.cmo tools/coqdoc/pretty.cmi 
-tools/coqdoc/pretty.cmx: tools/coqdoc/output.cmx tools/coqdoc/index.cmx \
-    tools/coqdoc/cdglobals.cmx tools/coqdoc/pretty.cmi 
+tools/coqdoc/pretty.cmo: tools/coqdoc/cdglobals.cmo tools/coqdoc/index.cmi \
+    tools/coqdoc/output.cmi tools/coqdoc/pretty.cmi 
+tools/coqdoc/pretty.cmx: tools/coqdoc/cdglobals.cmx tools/coqdoc/index.cmx \
+    tools/coqdoc/output.cmx tools/coqdoc/pretty.cmi 
 tactics/tauto.cmo: parsing/grammar.cma
 tactics/tauto.cmx: parsing/grammar.cma
 tactics/eqdecide.cmo: parsing/grammar.cma
@@ -3771,8 +3802,8 @@ contrib/funind/tacinv.cmo: parsing/grammar.cma
 contrib/funind/tacinv.cmx: parsing/grammar.cma
 contrib/first-order/g_ground.cmo: parsing/grammar.cma
 contrib/first-order/g_ground.cmx: parsing/grammar.cma
-contrib/subtac/sparser.cmo: parsing/grammar.cma
-contrib/subtac/sparser.cmx: parsing/grammar.cma
+contrib/subtac/g_subtac.cmo: parsing/grammar.cma
+contrib/subtac/g_subtac.cmx: parsing/grammar.cma
 contrib/subtac/g_eterm.cmo: parsing/grammar.cma
 contrib/subtac/g_eterm.cmx: parsing/grammar.cma
 contrib/rtauto/g_rtauto.cmo: parsing/grammar.cma
@@ -3836,58 +3867,50 @@ tools/coq_makefile.cmx:
 tools/coq-tex.cmo: 
 tools/coq-tex.cmx: 
 coq_fix_code.o: kernel/byterun/coq_fix_code.c \
-  /usr/local/lib/ocaml/caml/config.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/misc.h /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/misc.h /usr/lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/fail.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 \
-  /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/config.h /usr/local/lib/ocaml/caml/misc.h \
-  /usr/local/lib/ocaml/caml/alloc.h kernel/byterun/coq_instruct.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 kernel/byterun/coq_instruct.h \
   kernel/byterun/coq_fix_code.h kernel/byterun/coq_memory.h \
-  /usr/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h \
+  /usr/lib/ocaml/caml/fail.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 \
-  /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/config.h /usr/local/lib/ocaml/caml/misc.h \
-  /usr/local/lib/ocaml/caml/alloc.h kernel/byterun/coq_instruct.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 kernel/byterun/coq_instruct.h \
   kernel/byterun/coq_fix_code.h kernel/byterun/coq_memory.h \
-  /usr/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/memory.h
 coq_values.o: kernel/byterun/coq_values.c kernel/byterun/coq_fix_code.h \
-  /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/config.h /usr/local/lib/ocaml/caml/misc.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/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h \
-  kernel/byterun/coq_values.h /usr/local/lib/ocaml/caml/alloc.h
+  /usr/lib/ocaml/caml/fail.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 \
-  /usr/local/lib/ocaml/caml/config.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/misc.h /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h \
+  /usr/lib/ocaml/caml/config.h /usr/lib/ocaml/caml/compatibility.h \
+  /usr/lib/ocaml/caml/misc.h /usr/lib/ocaml/caml/mlvalues.h \
+  /usr/lib/ocaml/caml/fail.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 \
-  /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/config.h /usr/local/lib/ocaml/caml/misc.h \
-  /usr/local/lib/ocaml/caml/alloc.h kernel/byterun/coq_instruct.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 kernel/byterun/coq_instruct.h \
   kernel/byterun/coq_fix_code.h kernel/byterun/coq_memory.h \
-  /usr/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h \
+  /usr/lib/ocaml/caml/fail.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 \
-  /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/config.h /usr/local/lib/ocaml/caml/misc.h \
-  /usr/local/lib/ocaml/caml/alloc.h kernel/byterun/coq_instruct.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 kernel/byterun/coq_instruct.h \
   kernel/byterun/coq_fix_code.h kernel/byterun/coq_memory.h \
-  /usr/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/memory.h
 coq_values.d.o: kernel/byterun/coq_values.c kernel/byterun/coq_fix_code.h \
-  /usr/local/lib/ocaml/caml/mlvalues.h \
-  /usr/local/lib/ocaml/caml/compatibility.h \
-  /usr/local/lib/ocaml/caml/config.h /usr/local/lib/ocaml/caml/misc.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/local/lib/ocaml/caml/fail.h /usr/local/lib/ocaml/caml/memory.h \
-  kernel/byterun/coq_values.h /usr/local/lib/ocaml/caml/alloc.h
+  /usr/lib/ocaml/caml/fail.h /usr/lib/ocaml/caml/memory.h \
+  kernel/byterun/coq_values.h /usr/lib/ocaml/caml/alloc.h
diff --git a/.depend.camlp4 b/.depend.camlp4
index ba5ebda57c..e1a671bc49 100644
--- a/.depend.camlp4
+++ b/.depend.camlp4
@@ -19,7 +19,7 @@ contrib/jprover/jprover.ml: parsing/grammar.cma
 contrib/cc/g_congruence.ml: parsing/grammar.cma
 contrib/funind/tacinv.ml: parsing/grammar.cma
 contrib/first-order/g_ground.ml: parsing/grammar.cma
-contrib/subtac/sparser.ml: parsing/grammar.cma
+contrib/subtac/g_subtac.ml: parsing/grammar.cma
 contrib/subtac/g_eterm.ml: parsing/grammar.cma
 contrib/rtauto/g_rtauto.ml: parsing/grammar.cma
 contrib/recdef/recdef.ml: parsing/grammar.cma
diff --git a/Makefile b/Makefile
index aca30acbaa..ebafe9f33a 100644
--- a/Makefile
+++ b/Makefile
@@ -293,16 +293,17 @@ CCCMO=contrib/cc/ccalgo.cmo contrib/cc/ccproof.cmo contrib/cc/cctac.cmo \
   contrib/cc/g_congruence.cmo 
 
 SUBTACCMO=\
-	contrib/subtac/scoq.cmo \
+	contrib/subtac/subtac_utils.cmo \
 	contrib/subtac/eterm.cmo \
+	contrib/subtac/g_eterm.cmo \
 	contrib/subtac/context.cmo \
 	contrib/subtac/subtac_errors.cmo \
 	contrib/subtac/subtac_coercion.cmo \
-	contrib/subtac/interp.cmo \
-	contrib/subtac/interp_fixpoint.cmo \
+	contrib/subtac/subtac_pretyping.cmo \
+	contrib/subtac/subtac_interp_fixpoint.cmo \
 	contrib/subtac/subtac_command.cmo \
 	contrib/subtac/subtac.cmo \
-	contrib/subtac/sparser.cmo
+	contrib/subtac/g_subtac.cmo
 
 
 RTAUTOCMO=contrib/rtauto/proof_search.cmo contrib/rtauto/refl_tauto.cmo \
@@ -310,7 +311,7 @@ RTAUTOCMO=contrib/rtauto/proof_search.cmo contrib/rtauto/refl_tauto.cmo \
 
 ML4FILES += contrib/jprover/jprover.ml4 contrib/cc/g_congruence.ml4 \
 	contrib/funind/tacinv.ml4 contrib/first-order/g_ground.ml4 \
-	contrib/subtac/sparser.ml4 contrib/subtac/g_eterm.ml4 \
+	contrib/subtac/g_subtac.ml4 contrib/subtac/g_eterm.ml4 \
 	contrib/rtauto/g_rtauto.ml4 contrib/recdef/recdef.ml4 \
 	contrib/funind/indfun_main.ml4 
 
diff --git a/contrib/first-order/instances.ml b/contrib/first-order/instances.ml
index 04852da664..8eeb8b642d 100644
--- a/contrib/first-order/instances.ml
+++ b/contrib/first-order/instances.ml
@@ -130,7 +130,7 @@ let mk_open_instance id gl m t=
 	      RLambda(loc,name,RHole (dummy_loc,Evd.BinderType name),t1)
 	| _-> anomaly "can't happen" in
   let ntt=try 
-    Pretyping.understand evmap env (raux m rawt)
+    Pretyping.Default.understand evmap env (raux m rawt)
   with _ -> 
     error "Untypable instance, maybe higher-order non-prenex quantification" in
     Sign.decompose_lam_n_assum m ntt
diff --git a/contrib/interface/centaur.ml4 b/contrib/interface/centaur.ml4
index cb43a45ed9..8fcdb5d90a 100644
--- a/contrib/interface/centaur.ml4
+++ b/contrib/interface/centaur.ml4
@@ -400,7 +400,7 @@ let inspect n =
 			   add_search2 (Nametab.locate (qualid_of_sp sp)) typ
 		     | (sp,kn), "MUTUALINDUCTIVE" ->
 			 add_search2 (Nametab.locate (qualid_of_sp sp))
-			   (Pretyping.understand Evd.empty (Global.env())
+			   (Pretyping.Default.understand Evd.empty (Global.env())
 			      (RRef(dummy_loc, IndRef(kn,0))))
 		     | _ -> failwith ("unexpected value 1 for "^ 
 				      (string_of_id (basename (fst oname)))))
diff --git a/contrib/interface/pbp.ml b/contrib/interface/pbp.ml
index 19b06a30d3..d2f71bfc2f 100644
--- a/contrib/interface/pbp.ml
+++ b/contrib/interface/pbp.ml
@@ -34,7 +34,7 @@ let get_hyp_by_name g name =
   let evd = project g in
   let env = pf_env g in
   try (let judgment = 
-         Pretyping.understand_judgment 
+         Pretyping.Default.understand_judgment 
           evd env (RVar(zz, name)) in
        ("hyp",judgment.uj_type))
 (* je sais, c'est pas beau, mais je ne sais pas trop me servir de look_up...
diff --git a/contrib/recdef/recdef.ml4 b/contrib/recdef/recdef.ml4
index f973548457..36ebaff11f 100644
--- a/contrib/recdef/recdef.ml4
+++ b/contrib/recdef/recdef.ml4
@@ -34,6 +34,7 @@ open Pfedit
 open Topconstr
 open Rawterm
 open Pretyping
+open Pretyping.Default
 open Safe_typing
 open Constrintern
 open Hiddentac
diff --git a/contrib/subtac/FixSub.v b/contrib/subtac/FixSub.v
index 14990a24c5..6face72d11 100644
--- a/contrib/subtac/FixSub.v
+++ b/contrib/subtac/FixSub.v
@@ -21,7 +21,7 @@ End FixPoint.
 
 End Well_founded.
 
-Check Fix_sub.
+(*Check Fix_sub.*)
 
 Notation "'forall' { x : A | P } , Q" :=
   (forall x:{x:A|P}, (fun x => Q) (proj1_sig x))
diff --git a/contrib/subtac/context.mli b/contrib/subtac/context.mli
new file mode 100644
index 0000000000..671d6f3619
--- /dev/null
+++ b/contrib/subtac/context.mli
@@ -0,0 +1,5 @@
+type t = Term.rel_declaration list
+val assoc : 'a -> ('a * 'b * 'c) list -> 'b * 'c
+val assoc_and_index : 'a -> ('a * 'b * 'c) list -> int * 'b * 'c
+val id_of_name : Names.name -> Names.identifier
+val subst_env : 'a -> 'b -> 'a * 'b
diff --git a/contrib/subtac/g_eterm.ml4 b/contrib/subtac/g_eterm.ml4
index f435219936..095e5fafc9 100644
--- a/contrib/subtac/g_eterm.ml4
+++ b/contrib/subtac/g_eterm.ml4
@@ -23,5 +23,5 @@ TACTIC EXTEND eterm
   [ "eterm" ] -> [ 
     (fun gl ->
        let evm = Tacmach.project gl and t = Tacmach.pf_concl gl in
-         Eterm.etermtac (Global.env ()) (evm, t) gl) ]
+         Eterm.etermtac (evm, t) gl) ]
 END
diff --git a/contrib/subtac/sparser.ml4 b/contrib/subtac/g_subtac.ml4
index 43214c87bd..d9c7a8c023 100644
--- a/contrib/subtac/sparser.ml4
+++ b/contrib/subtac/g_subtac.ml4
@@ -49,7 +49,7 @@ GEXTEND Gram
     ;
   END
 
-(* type wf_proof_type_argtype = (Scoq.wf_proof_type, constr_expr, Tacexpr.raw_tactic_expr) Genarg.abstract_argument_type *)
+(* type wf_proof_type_argtype = (Subtac_utils.wf_proof_type, constr_expr, Tacexpr.raw_tactic_expr) Genarg.abstract_argument_type *)
 
 (* let (wit_subtac_wf_proof_type : wf_proof_type_argtype), *)
 (*   (globwit_subtac_wf_proof_type : wf_proof_type_argtype), *)
@@ -63,7 +63,7 @@ let (wit_subtac_gallina_loc : gallina_loc_argtype),
   (rawwit_subtac_gallina_loc : gallina_loc_argtype) =
   Genarg.create_arg "subtac_gallina_loc"
 
-(* type subtac_recdef_argtype = (Scoq.recursion_order option, constr_expr, Tacexpr.raw_tactic_expr) Genarg.abstract_argument_type *)
+(* type subtac_recdef_argtype = (Subtac_utils.recursion_order option, constr_expr, Tacexpr.raw_tactic_expr) Genarg.abstract_argument_type *)
 
 (* let (wit_subtac_recdef : subtac_recdef_argtype), *)
 (*   (globwit_subtac_recdef : subtac_recdef_argtype), *)
diff --git a/contrib/subtac/interp.ml b/contrib/subtac/interp.ml
deleted file mode 100644
index d338c34452..0000000000
--- a/contrib/subtac/interp.ml
+++ /dev/null
@@ -1,666 +0,0 @@
-(************************************************************************)
-(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, * CNRS-Ecole Polytechnique-INRIA Futurs-Universite Paris Sud *)
-(*   \VV/  **************************************************************)
-(*    //   *      This file is distributed under the terms of the       *)
-(*         *       GNU Lesser General Public License Version 2.1        *)
-(************************************************************************)
-
-(* $Id$ *)
-
-open Global
-open Pp
-open Util
-open Names
-open Sign
-open Evd
-open Term
-open Termops
-open Reductionops
-open Environ
-open Type_errors
-open Typeops
-open Libnames
-open Classops
-open List
-open Recordops 
-open Evarutil
-open Pretype_errors
-open Rawterm
-open Evarconv
-open Pattern
-open Dyn
-open Pretyping
-
-open Subtac_coercion
-open Scoq
-open Coqlib
-open Printer
-open Subtac_errors
-open Context
-open Eterm
-
-type recursion_info = {
-  arg_name: name;
-  arg_type: types; (* A *)
-  args_after : rel_context;
-  wf_relation: constr; (* R : A -> A -> Prop *)
-  wf_proof: constr; (* : well_founded R *)
-  f_type: types; (* f: A -> Set *)
-  f_fulltype: types; (* Type with argument and wf proof product first *)
-}
-
-let my_print_rec_info env t = 
-  str "Name: " ++ Nameops.pr_name t.arg_name ++ spc () ++
-  str "Arg type: " ++ my_print_constr env t.arg_type ++ spc () ++
-  str "Wf relation: " ++ my_print_constr env t.wf_relation ++ spc () ++
-  str "Wf proof: " ++ my_print_constr env t.wf_proof ++ spc () ++
-  str "Abbreviated Type: " ++ my_print_constr env t.f_type ++ spc () ++
-  str "Full type: " ++ my_print_constr env t.f_fulltype
-
-(* Taken from pretyping.ml *)
-let evd_comb0 f isevars =
-  let (evd',x) = f !isevars in
-  isevars := evd';
-  x
-let evd_comb1 f isevars x =
-  let (evd',y) = f !isevars x in
-  isevars := evd';
-  y
-let evd_comb2 f isevars x y =
-  let (evd',z) = f !isevars x y in
-  isevars := evd';
-  z
-let evd_comb3 f isevars x y z =
-  let (evd',t) = f !isevars x y z in
-  isevars := evd';
-  t
-
-(************************************************************************)
-(* This concerns Cases *)
-open Declarations
-open Inductive
-open Inductiveops
-
-(************************************************************************)
-
-let mt_evd = Evd.empty
-
-let vect_lift_type = Array.mapi (fun i t -> type_app (lift i) t)
-
-(* Utilisé pour inférer le prédicat des Cases *)
-(* Semble exagérement fort *)
-(* Faudra préférer une unification entre les types de toutes les clauses *)
-(* et autoriser des ? à rester dans le résultat de l'unification *)
-
-let evar_type_fixpoint loc env isevars lna lar vdefj =
-  let lt = Array.length vdefj in 
-    if Array.length lar = lt then 
-      for i = 0 to lt-1 do 
-        if not (e_cumul env isevars (vdefj.(i)).uj_type
-		  (lift lt lar.(i))) then
-          error_ill_typed_rec_body_loc loc env (evars_of !isevars)
-            i lna vdefj lar
-      done
-
-let check_branches_message loc env isevars c (explft,lft) = 
-  for i = 0 to Array.length explft - 1 do
-    if not (e_cumul env isevars lft.(i) explft.(i)) then 
-      let sigma = evars_of !isevars in
-      error_ill_formed_branch_loc loc env sigma c i lft.(i) explft.(i)
-  done
-
-(* coerce to tycon if any *)
-let inh_conv_coerce_to_tycon loc env isevars j = function
-   | None -> j
-   | Some typ -> evd_comb2 (Subtac_coercion.inh_conv_coerce_to loc env) isevars j typ
-
-let push_rels vars env = List.fold_right push_rel vars env
-
-let strip_meta id = (* For Grammar v7 compatibility *)
-  let s = string_of_id id in
-  if s.[0]='$' then id_of_string (String.sub s 1 (String.length s - 1))
-  else id
-
-let pretype_id loc env (lvar,unbndltacvars) id =
-  let id = strip_meta id in (* May happen in tactics defined by Grammar *)
-  try
-    let (n,typ) = lookup_rel_id id (rel_context env) in
-    { uj_val  = mkRel n; uj_type = type_app (lift n) typ }
-  with Not_found ->
-  try
-    List.assoc id lvar
-  with Not_found ->
-  try
-    let (_,_,typ) = lookup_named id env in
-    { uj_val  = mkVar id; uj_type = typ }
-  with Not_found ->
-  try (* To build a nicer ltac error message *)
-    match List.assoc id unbndltacvars with
-      | None -> user_err_loc (loc,"",
-	  str (string_of_id id ^ " ist not bound to a term"))
-      | Some id0 -> Pretype_errors.error_var_not_found_loc loc id0
-  with Not_found ->
-    error_var_not_found_loc loc id
-
-(* make a dependent predicate from an undependent one *)
-
-let make_dep_of_undep env (IndType (indf,realargs)) pj =
-  let n = List.length realargs in
-  let rec decomp n p =
-    if n=0 then p else
-      match kind_of_term p with
-	| Lambda (_,_,c) -> decomp (n-1) c
-	| _ -> decomp (n-1) (applist (lift 1 p, [mkRel 1])) 
-  in
-  let sign,s = decompose_prod_n n pj.uj_type in
-  let ind = build_dependent_inductive env indf in
-  let s' = mkProd (Anonymous, ind, s) in
-  let ccl = lift 1 (decomp n pj.uj_val) in
-  let ccl' = mkLambda (Anonymous, ind, ccl) in
-  {uj_val=lam_it ccl' sign; uj_type=prod_it s' sign} 
-
-(*************************************************************************)
-(* Main pretyping function                                               *)
-
-let pretype_ref isevars env ref = 
-  let c = constr_of_global ref in
-  make_judge c (Retyping.get_type_of env Evd.empty c)
-
-let pretype_sort = function
-  | RProp c -> judge_of_prop_contents c
-  | RType _ -> judge_of_new_Type ()
-
-let my_print_tycon env = function
-    Some t -> my_print_constr env t
-  | None -> str "None"
-
-(* [pretype tycon env isevars lvar lmeta cstr] attempts to type [cstr] *)
-(* in environment [env], with existential variables [(evars_of isevars)] and *)
-(* the type constraint tycon *)
-let rec pretype tycon env isevars lvar c = 
-  trace (str "pretype for " ++ (my_print_rawconstr env c) ++
-	   str " and tycon "++ my_print_tycon env tycon ++
-	   str " in environment: " ++ my_print_env env);
-  match c with
-
-  | RRef (loc,ref) ->
-      inh_conv_coerce_to_tycon loc env isevars
-	(pretype_ref isevars env ref)
-	tycon
-
-  | RVar (loc, id) ->
-      inh_conv_coerce_to_tycon loc env isevars
-	(pretype_id loc env lvar id)
-	tycon
-
-  | REvar (loc, ev, instopt) ->
-      (* Ne faudrait-il pas s'assurer que hyps est bien un
-      sous-contexte du contexte courant, et qu'il n'y a pas de Rel "caché" *)
-      let hyps = evar_context (Evd.map (evars_of !isevars) ev) in
-      let args = match instopt with
-        | None -> instance_from_named_context hyps
-        | Some inst -> failwith "Evar subtitutions not implemented" in
-      let c = mkEvar (ev, args) in
-      let j = (Retyping.get_judgment_of env (evars_of !isevars) c) in
-      inh_conv_coerce_to_tycon loc env isevars j tycon
-
-  | RPatVar (loc,(someta,n)) -> 
-      anomaly "Found a pattern variable in a rawterm to type"
-	   
-  | RHole (loc,k) ->
-      let ty =
-        match tycon with 
-          | Some ty -> ty
-          | None ->
-              e_new_evar isevars env ~src:(loc,InternalHole) (new_Type ()) in
-      { uj_val = e_new_evar isevars env ~src:(loc,k) ty; uj_type = ty }
-
-  | RRec (loc,fixkind,names,bl,lar,vdef) ->
-      let rec type_bl env ctxt = function
-          [] -> ctxt
-        | (na,None,ty)::bl ->
-            let ty' = pretype_type empty_valcon env isevars lvar ty in
-            let dcl = (na,None,ty'.utj_val) in
-            type_bl (push_rel dcl env) (add_rel_decl dcl ctxt) bl
-        | (na,Some bd,ty)::bl ->
-            let ty' = pretype_type empty_valcon env isevars lvar ty in
-            let bd' = pretype (mk_tycon ty'.utj_val) env isevars lvar ty in
-            let dcl = (na,Some bd'.uj_val,ty'.utj_val) in
-            type_bl (push_rel dcl env) (add_rel_decl dcl ctxt) bl in
-      let ctxtv = Array.map (type_bl env empty_rel_context) bl in
-      let larj =
-        array_map2
-          (fun e ar ->
-            pretype_type empty_valcon (push_rel_context e env) isevars lvar ar)
-          ctxtv lar in
-      let lara = Array.map (fun a -> a.utj_val) larj in
-      let ftys = array_map2 (fun e a -> it_mkProd_or_LetIn a e) ctxtv lara in
-      let nbfix = Array.length lar in
-      let names = Array.map (fun id -> Name id) names in
-      (* Note: bodies are not used by push_rec_types, so [||] is safe *)
-      let newenv = push_rec_types (names,ftys,[||]) env in
-      let vdefj =
-	array_map2_i 
-	  (fun i ctxt def ->
-            (* we lift nbfix times the type in tycon, because of
-	     * the nbfix variables pushed to newenv *)
-            let (ctxt,ty) =
-              decompose_prod_n_assum (rel_context_length ctxt)
-                (lift nbfix ftys.(i)) in
-            let nenv = push_rel_context ctxt newenv in
-            let j = pretype (mk_tycon ty) nenv isevars lvar def in
-            { uj_val = it_mkLambda_or_LetIn j.uj_val ctxt;
-              uj_type = it_mkProd_or_LetIn j.uj_type ctxt })
-          ctxtv vdef in
-      evar_type_fixpoint loc env isevars names ftys vdefj;
-      let fixj =
-	match fixkind with
-	  | RFix (vn,i) ->
-	      let fix = ((Array.map fst vn, i),(names,ftys,Array.map j_val vdefj)) in
-	      (try check_fix env fix with e -> Stdpp.raise_with_loc loc e);
-	      make_judge (mkFix fix) ftys.(i)
-	  | RCoFix i -> 
-	      let cofix = (i,(names,ftys,Array.map j_val vdefj)) in
-	      (try check_cofix env cofix with e -> Stdpp.raise_with_loc loc e);
-	      make_judge (mkCoFix cofix) ftys.(i) in
-      inh_conv_coerce_to_tycon loc env isevars fixj tycon
-
-  | RSort (loc,s) ->
-      inh_conv_coerce_to_tycon loc env isevars (pretype_sort s) tycon
-
-  | RApp (loc,f,args) -> 
-      let fj = pretype empty_tycon env isevars lvar f in
-      let floc = loc_of_rawconstr f in
-      let rec apply_rec env n resj = function
-	| [] -> resj
-	| c::rest ->
-	    let argloc = loc_of_rawconstr c in
-	    let resj = evd_comb1 (inh_app_fun env) isevars resj in
-            let resty =
-              whd_betadeltaiota env (evars_of !isevars) resj.uj_type in
-	      match kind_of_term resty with
-	      | Prod (na,c1,c2) ->
-		  let hj = pretype (mk_tycon c1) env isevars lvar c in
-		  let newresj =
-      		    { uj_val = applist (j_val resj, [j_val hj]);
-		      uj_type = subst1 hj.uj_val c2 } in
-		  apply_rec env (n+1) newresj rest
-
-	      | _ ->
-		  let hj = pretype empty_tycon env isevars lvar c in
-		  error_cant_apply_not_functional_loc 
-		    (join_loc floc argloc) env (evars_of !isevars)
-	      	    resj [hj]
-      in let resj = apply_rec env 1 fj args in
-      inh_conv_coerce_to_tycon loc env isevars resj tycon
-
-  | RLambda(loc,name,c1,c2)      ->
-      let (name',dom,rng) = evd_comb1 (split_tycon loc env) isevars tycon in
-      let dom_valcon = valcon_of_tycon dom in
-      let j = pretype_type dom_valcon env isevars lvar c1 in
-      let var = (name,None,j.utj_val) in
-      let j' = pretype rng (push_rel var env) isevars lvar c2 in 
-      judge_of_abstraction env name j j'
-
-  | RProd(loc,name,c1,c2)        ->
-      let j = pretype_type empty_valcon env isevars lvar c1 in
-      let var = (name,j.utj_val) in
-      let env' = push_rel_assum var env in
-      let j' = pretype_type empty_valcon env' isevars lvar c2 in
-      let resj =
-	try judge_of_product env name j j'
-	with TypeError _ as e -> Stdpp.raise_with_loc loc e in
-      inh_conv_coerce_to_tycon loc env isevars resj tycon
-	
-  | RLetIn(loc,name,c1,c2)      ->
-      let j = pretype empty_tycon env isevars lvar c1 in
-      let t = refresh_universes j.uj_type in
-      let var = (name,Some j.uj_val,t) in
-        let tycon = option_app (lift 1) tycon in
-      let j' = pretype tycon (push_rel var env) isevars lvar c2 in
-      { uj_val = mkLetIn (name, j.uj_val, t, j'.uj_val) ;
-	uj_type = subst1 j.uj_val j'.uj_type }
-
-  | RLetTuple (loc,nal,(na,po),c,d) ->
-      let cj = pretype empty_tycon env isevars lvar c in
-      let (IndType (indf,realargs)) = 
-	try find_rectype env (evars_of !isevars) cj.uj_type
-	with Not_found ->
-	  let cloc = loc_of_rawconstr c in
-	  error_case_not_inductive_loc cloc env (evars_of !isevars) cj 
-      in
-      let cstrs = get_constructors env indf in
-      if Array.length cstrs <> 1 then
-        user_err_loc (loc,"",str "Destructing let is only for inductive types with one constructor");
-      let cs = cstrs.(0) in
-      if List.length nal <> cs.cs_nargs then
-        user_err_loc (loc,"", str "Destructing let on this type expects " ++ int cs.cs_nargs ++ str " variables");
-      let fsign = List.map2 (fun na (_,c,t) -> (na,c,t))
-        (List.rev nal) cs.cs_args in
-      let env_f = push_rels fsign env in
-      (* Make dependencies from arity signature impossible *)
-      let arsgn,_ = get_arity env indf in
-      let arsgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) arsgn in
-      let psign = (na,None,build_dependent_inductive env indf)::arsgn in
-      let nar = List.length arsgn in
-      (match po with
-	 | Some p ->
-             let env_p = push_rels psign env in
-             let pj = pretype_type empty_valcon env_p isevars lvar p in
-             let ccl = nf_evar (evars_of !isevars) pj.utj_val in
-	     let psign = make_arity_signature env true indf in (* with names *)
-	     let p = it_mkLambda_or_LetIn ccl psign in
-             let inst = 
-	       (Array.to_list cs.cs_concl_realargs)
-	       @[build_dependent_constructor cs] in
-	     let lp = lift cs.cs_nargs p in
-             let fty = hnf_lam_applist env (evars_of !isevars) lp inst in
-	     let fj = pretype (mk_tycon fty) env_f isevars lvar d in
-	     let f = it_mkLambda_or_LetIn fj.uj_val fsign in
-	     let v =
-	       let mis,_ = dest_ind_family indf in
-	       let ci = make_default_case_info env LetStyle mis in
-	       mkCase (ci, p, cj.uj_val,[|f|]) in 
-	     { uj_val = v; uj_type = substl (realargs@[cj.uj_val]) ccl }
-
-	 | None -> 
-             let tycon = option_app (lift cs.cs_nargs) tycon in
-	     let fj = pretype tycon env_f isevars lvar d in
-	     let f = it_mkLambda_or_LetIn fj.uj_val fsign in
-	     let ccl = nf_evar (evars_of !isevars) fj.uj_type in
-             let ccl =
-               if noccur_between 1 cs.cs_nargs ccl then
-                 lift (- cs.cs_nargs) ccl 
-               else
-                 error_cant_find_case_type_loc loc env (evars_of !isevars) 
-                   cj.uj_val in
-             let p = it_mkLambda_or_LetIn (lift (nar+1) ccl) psign in
-	     let v =
-	       let mis,_ = dest_ind_family indf in
-	       let ci = make_default_case_info env LetStyle mis in
-	       mkCase (ci, p, cj.uj_val,[|f|] ) 
-	     in
-	     { uj_val = v; uj_type = ccl })
-
-  | RIf (loc,c,(na,po),b1,b2) ->
-      let cj = pretype empty_tycon env isevars lvar c in
-      let (IndType (indf,realargs)) = 
-	try find_rectype env (evars_of !isevars) cj.uj_type
-	with Not_found ->
-	  let cloc = loc_of_rawconstr c in
-	  error_case_not_inductive_loc cloc env (evars_of !isevars) cj in
-      let cstrs = get_constructors env indf in 
-      if Array.length cstrs <> 2 then
-        user_err_loc (loc,"",
-	  str "If is only for inductive types with two constructors");
-
-      (* Make dependencies from arity signature possible ! *)
-      let arsgn,_ = get_arity env indf in
-      let arsgn = List.map (fun (n,b,t) -> 
-			      debug 2 (str "If case arg: " ++ Nameops.pr_name n);
-			      (n,b,t)) arsgn in
-      let nar = List.length arsgn in
-      let psign = (na,None,build_dependent_inductive env indf)::arsgn in
-      let pred,p = match po with
-	| Some p ->
-	    let env_p = push_rels psign env in
-            let pj = pretype_type empty_valcon env_p isevars lvar p in
-            let ccl = nf_evar (evars_of !isevars) pj.utj_val in
-	    let pred = it_mkLambda_or_LetIn ccl psign in
-	    pred, lift (- nar) (beta_applist (pred,[cj.uj_val]))
-	| None -> 
-	    let p = match tycon with
-	    | Some ty -> ty
-	    | None ->
-                e_new_evar isevars env ~src:(loc,InternalHole) (new_Type ())
-	    in
-	    it_mkLambda_or_LetIn (lift (nar+1) p) psign, p in
-      let f cs b =
-	let n = rel_context_length cs.cs_args in
-	let pi = liftn n 2 pred in
-	let pi = beta_applist (pi, [build_dependent_constructor cs]) in
-	let csgn = 
-	  List.map (fun (n,b,t) ->
-		      match n with 
-			  Name _ -> (n, b, t)
-			| Anonymous -> (Name (id_of_string "H"), b, t))
-	    cs.cs_args 
-	in
-	let env_c = push_rels csgn env in 
-	let bj = pretype (Some pi) env_c isevars lvar b in
-	it_mkLambda_or_LetIn bj.uj_val cs.cs_args in
-      let b1 = f cstrs.(0) b1 in
-      let b2 = f cstrs.(1) b2 in
-      let pred = nf_evar (evars_of !isevars) pred in
-      let p = nf_evar (evars_of !isevars) p in
-      let v =
-	let mis,_ = dest_ind_family indf in
-	let ci = make_default_case_info env IfStyle mis in
-	mkCase (ci, pred, cj.uj_val, [|b1;b2|])
-      in
-      { uj_val = v; uj_type = p }
-
-  | RCases (loc,po,tml,eqns) ->
-      Cases.compile_cases loc
-	((fun vtyc env -> pretype vtyc env isevars lvar),isevars)
-	tycon env (* loc *) (po,tml,eqns)
-    
-  | RCast(loc,c,k,t) ->
-      let tj = pretype_type empty_tycon env isevars lvar t in
-      let cj = pretype (mk_tycon tj.utj_val) env isevars lvar c in
-      (* User Casts are for helping pretyping, experimentally not to be kept*)
-      (* ... except for Correctness *)
-      let v = mkCast (cj.uj_val, k, tj.utj_val) in
-      let cj = { uj_val = v; uj_type = tj.utj_val } in
-      inh_conv_coerce_to_tycon loc env isevars cj tycon
-
-  | RDynamic (loc,d) ->
-    if (tag d) = "constr" then
-      let c = Pretyping.constr_out d in
-      let j = (Retyping.get_judgment_of env (evars_of !isevars) c) in
-      j
-      (*inh_conv_coerce_to_tycon loc env isevars j tycon*)
-    else
-      user_err_loc (loc,"pretype",(str "Not a constr tagged Dynamic"))
-
-(* [pretype_type valcon env isevars lvar c] coerces [c] into a type *)
-and pretype_type valcon env isevars lvar = function
-  | RHole loc ->
-      (match valcon with
-	 | Some v ->
-             let s =
-               let sigma = evars_of !isevars in
-               let t = Retyping.get_type_of env sigma v in
-               match kind_of_term (whd_betadeltaiota env sigma t) with
-                 | Sort s -> s
-                 | Evar v when is_Type (existential_type sigma v) -> 
-                     evd_comb1 (define_evar_as_sort) isevars v
-                 | _ -> anomaly "Found a type constraint which is not a type"
-             in
-	     { utj_val = v;
-	       utj_type = s }
-	 | None ->
-	     let s = new_Type_sort () in
-	     { utj_val = e_new_evar isevars env ~src:loc (mkSort s);
-	       utj_type = s})
-  | c ->
-      let j = pretype empty_tycon env isevars lvar c in
-      let loc = loc_of_rawconstr c in
-      let tj = evd_comb1 (inh_coerce_to_sort loc env) isevars j in
-      match valcon with
-	| None -> tj
-	| Some v ->
-	    if e_cumul env isevars v tj.utj_val then tj
-	    else
-	      (debug 2 (str "here we are");
-	       error_unexpected_type_loc
-                 (loc_of_rawconstr c) env (evars_of !isevars) tj.utj_val v)
-
-
-
-let merge_evms x y = 
-  Evd.fold (fun ev evi evm -> Evd.add evm ev evi) x y
-
-let interp env isevars c tycon = 
-  let j = pretype tycon env isevars ([],[]) c in
-    j.uj_val, j.uj_type
-
-let find_with_index x l =
-  let rec aux i = function
-      (y, _, _) as t :: tl -> if x = y then i, t else aux (succ i) tl
-    | [] -> raise Not_found
-  in aux 0 l
-
-let list_split_at index l = 
-  let rec aux i acc = function
-      hd :: tl when i = index -> (List.rev acc), tl
-    | hd :: tl -> aux (succ i) (hd :: acc) tl
-    | [] -> failwith "list_split_at: Invalid argument"
-  in aux 0 [] l
-
-open Vernacexpr
-
-let coqintern evd env : Topconstr.constr_expr -> Rawterm.rawconstr = Constrintern.intern_constr (evars_of evd) env
-let coqinterp evd env : Topconstr.constr_expr -> Term.constr = Constrintern.interp_constr (evars_of evd) env
-
-let env_with_binders env isevars l =
-  let rec aux ((env, rels) as acc) = function
-      Topconstr.LocalRawDef ((loc, name), def) :: tl -> 
-	let rawdef = coqintern !isevars env def in
-	let coqdef, deftyp = interp env isevars rawdef empty_tycon in
-	let reldecl = (name, Some coqdef, deftyp) in
-	  aux  (push_rel reldecl env, reldecl :: rels) tl
-    | Topconstr.LocalRawAssum (bl, typ) :: tl ->
-	let rawtyp = coqintern !isevars env typ in
-	let coqtyp, typtyp = interp env isevars rawtyp empty_tycon in
-	let acc = 
-	  List.fold_left (fun (env, rels) (loc, name) -> 
-			    let reldecl = (name, None, coqtyp) in
-			      (push_rel reldecl env, 
-			       reldecl :: rels))
-	    (env, rels) bl
-	in aux acc tl
-    | [] -> acc
-  in aux (env, []) l
-
-let subtac_process env isevars id l c tycon =
-  let evars () = evars_of !isevars in
-  let _ = trace (str "Creating env with binders") in
-  let env_binders, binders_rel = env_with_binders env isevars l in
-  let _ = trace (str "New env created:" ++ my_print_context env_binders) in
-  let tycon = 
-    match tycon with
-	None -> empty_tycon
-      | Some t -> 
-	  let t = coqintern !isevars env_binders t in
-	  let _ = trace (str "Internalized specification: " ++ my_print_rawconstr env_binders t) in
-	  let coqt, ttyp = interp env_binders isevars t empty_tycon in
-	  let _ = trace (str "Interpreted type: " ++ my_print_constr env_binders coqt) in
-	    mk_tycon coqt
-  in    
-  let c = coqintern !isevars env_binders c in
-  let _ = trace (str "Internalized term: " ++ my_print_rawconstr env c) in
-  let coqc, ctyp = interp env_binders isevars c tycon in
-  let _ = trace (str "Interpreted term: " ++ my_print_constr env_binders coqc ++ spc () ++
-		 str "Coq type: " ++ my_print_constr env_binders ctyp)
-  in
-  let _ = trace (str "Original evar map: " ++ Evd.pr_evar_map (evars ())) in
-    
-  let fullcoqc = it_mkLambda_or_LetIn coqc binders_rel 
-  and fullctyp = it_mkProd_or_LetIn ctyp binders_rel
-  in
-  let fullcoqc = Evarutil.nf_evar (evars_of !isevars) fullcoqc in
-  let fullctyp = Evarutil.nf_evar (evars_of !isevars) fullctyp in
-
-  let _ = trace (str "After evar normalization: " ++ spc () ++
-		 str "Coq term: " ++ my_print_constr env fullcoqc ++ spc ()
-		 ++ str "Coq type: " ++ my_print_constr env fullctyp) 
-  in
-  let evm = non_instanciated_map env isevars in
-  let _ = trace (str "Non instanciated evars map: " ++ Evd.pr_evar_map evm) in
-    evm, fullcoqc, fullctyp
-
-let pretype_gen isevars env lvar kind c =
-  let c' = match kind with
-  | OfType exptyp ->
-    let tycon = match exptyp with None -> empty_tycon | Some t -> mk_tycon t in
-    (pretype tycon env isevars lvar c).uj_val
-  | IsType ->
-    (pretype_type empty_valcon env isevars lvar c).utj_val in
-  nf_evar (evars_of !isevars) c'
-
-(* [check_evars] fails if some unresolved evar remains *)
-(* it assumes that the defined existentials have already been substituted
-   (should be done in unsafe_infer and unsafe_infer_type) *)
-
-let check_evars env initial_sigma isevars c =
-  let sigma = evars_of !isevars in
-  let rec proc_rec c =
-    match kind_of_term c with
-      | Evar (ev,args) ->
-          assert (Evd.in_dom sigma ev);
-	  if not (Evd.in_dom initial_sigma ev) then
-            let (loc,k) = evar_source ev !isevars in
-	    let _ = trace (str "Evar " ++ int ev ++ str " not solved, applied to args : " ++
-			   Scoq.print_args env args ++ str " in evar map: " ++
-			   Evd.pr_evar_map sigma) 
-	    in
-	    error_unsolvable_implicit loc env sigma k
-      | _ -> iter_constr proc_rec c
-  in
-  proc_rec c(*;
-  let (_,pbs) = get_conv_pbs !isevars (fun _ -> true) in
-  if pbs <> [] then begin
-    pperrnl
-      (str"TYPING OF "++Termops.print_constr_env env c++fnl()++
-      prlist_with_sep fnl
-        (fun  (pb,c1,c2) ->
-          Termops.print_constr c1 ++
-          (if pb=Reduction.CUMUL then str " <="++ spc()
-           else str" =="++spc()) ++
-          Termops.print_constr c2)
-        pbs ++ fnl())
-  end*)
-
-(* TODO: comment faire remonter l'information si le typage a resolu des
-       variables du sigma original. il faudrait que la fonction de typage
-       retourne aussi le nouveau sigma...
-*)
-
-let understand_judgment isevars env c =
-  let j = pretype empty_tycon env isevars ([],[]) c in
-  let j = j_nf_evar (evars_of !isevars) j in
-  check_evars env (Evd.evars_of !isevars) isevars (mkCast(j.uj_val,DEFAULTcast, j.uj_type));
-  j
-
-(* Raw calls to the unsafe inference machine: boolean says if we must
-   fail on unresolved evars; the unsafe_judgment list allows us to
-   extend env with some bindings *)
-
-let ise_pretype_gen fail_evar isevars env lvar kind c : Evd.open_constr =
-  let c = pretype_gen isevars env lvar kind c in
-  if fail_evar then check_evars env (Evd.evars_of !isevars) isevars c;
-    let c = nf_evar (evars_of !isevars) c in
-    let evm = non_instanciated_map env isevars in
-      (evm, c)
-
-(** Entry points of the high-level type synthesis algorithm *)
-
-let understand_gen kind isevars env c =
-  ise_pretype_gen false isevars env ([],[]) kind c
-
-let understand isevars env ?expected_type:exptyp c =
-  ise_pretype_gen false isevars env ([],[]) (OfType exptyp) c
-
-let understand_type isevars env c =
-  ise_pretype_gen false isevars env ([],[]) IsType c
-
-let understand_ltac isevars env lvar kind c =
-  ise_pretype_gen false isevars env lvar kind c
-
-let understand_tcc isevars env ?expected_type:exptyp c =
-  ise_pretype_gen false isevars env ([],[]) (OfType exptyp) c
-
-
-    
diff --git a/contrib/subtac/subtac.ml b/contrib/subtac/subtac.ml
index c34338236d..12755960ef 100644
--- a/contrib/subtac/subtac.ml
+++ b/contrib/subtac/subtac.ml
@@ -33,7 +33,7 @@ open Dyn
 open Vernacexpr
 
 open Subtac_coercion
-open Scoq
+open Subtac_utils
 open Coqlib
 open Printer
 open Subtac_errors
@@ -46,7 +46,7 @@ let require_library dirpath =
 
 let subtac_one_fixpoint env isevars (f, decl) = 
   let ((id, n, bl, typ, body), decl) = 
-    Interp_fixpoint.rewrite_fixpoint env [] (f, decl) 
+    Subtac_interp_fixpoint.rewrite_fixpoint env [] (f, decl) 
   in
   let _ = trace (str "Working on a single fixpoint rewritten as: " ++ spc () ++
 		 Ppconstr.pr_constr_expr body)
@@ -125,13 +125,13 @@ let subtac (loc, command) =
 	  let isevars = ref (create_evar_defs Evd.empty) in
 	    (match expr with
 		 ProveBody (bl, c) -> 
-		   let evm, c, ctyp = Interp.subtac_process env isevars id bl c None in
+		   let evm, c, ctyp = Subtac_pretyping.subtac_process env isevars id bl c None in
 		     trace (str "Starting proof");
 		     Command.start_proof id goal_kind c hook;
 		     trace (str "Started proof");	     
 		     
 	       | DefineBody (bl, _, c, tycon) -> 
-		   let evm, c, ctyp = Interp.subtac_process env isevars id bl c tycon in
+		   let evm, c, ctyp = Subtac_pretyping.subtac_process env isevars id bl c tycon in
 		   let tac = Eterm.etermtac (evm, c) in 
 		     trace (str "Starting proof");
 		     Command.start_proof id goal_kind ctyp hook;
diff --git a/contrib/subtac/subtac.mli b/contrib/subtac/subtac.mli
new file mode 100644
index 0000000000..a0d2fb2b9e
--- /dev/null
+++ b/contrib/subtac/subtac.mli
@@ -0,0 +1,14 @@
+val require_library : string -> unit
+val subtac_one_fixpoint :
+  'a ->
+  'b ->
+  (Names.identifier * (int * Topconstr.recursion_order_expr) *
+   Topconstr.local_binder list * Topconstr.constr_expr *
+   Topconstr.constr_expr) *
+  'c ->
+  (Names.identifier * (int * Topconstr.recursion_order_expr) *
+   Topconstr.local_binder list * Topconstr.constr_expr *
+   Topconstr.constr_expr) *
+  'c
+val subtac_fixpoint : 'a -> 'b -> unit
+val subtac : Util.loc * Vernacexpr.vernac_expr -> unit
diff --git a/contrib/subtac/subtac_coercion.ml b/contrib/subtac/subtac_coercion.ml
index 015eb5d171..c605314018 100644
--- a/contrib/subtac/subtac_coercion.ml
+++ b/contrib/subtac/subtac_coercion.ml
@@ -22,7 +22,7 @@ open Retyping
 open Evd
 
 open Global
-open Scoq
+open Subtac_utils
 open Coqlib
 open Printer
 open Subtac_errors
@@ -33,340 +33,343 @@ open Pp
 let pair_of_array a = (a.(0), a.(1))
 let make_name s = Name (id_of_string s)
 
-exception NoCoercion
+module Coercion = struct
 
-let rec disc_subset x = 
-  match kind_of_term x with
-    | App (c, l) ->
-	(match kind_of_term c with
-	     Ind i ->
-	       let len = Array.length l in
-	       let sig_ = Lazy.force sig_ in
-		 if len = 2 && i = Term.destInd sig_.typ
-		 then
-		   let (a, b) = pair_of_array l in
-		     Some (a, b)
-		 else None
-	   | _ -> None)
-    | _ -> None
-	
-and disc_exist env x =
-  trace (str "Disc_exist: " ++ my_print_constr env x);
-  match kind_of_term x with
-    | App (c, l) ->
-	(match kind_of_term c with
-	     Construct c ->	       
-	       if c = Term.destConstruct (Lazy.force sig_).intro
-	       then Some (l.(0), l.(1), l.(2), l.(3))
-	       else None
-	   | _ -> None)
-    | _ -> None
+  exception NoCoercion
 
+  let rec disc_subset x = 
+    match kind_of_term x with
+      | App (c, l) ->
+	  (match kind_of_term c with
+	       Ind i ->
+		 let len = Array.length l in
+		 let sig_ = Lazy.force sig_ in
+		   if len = 2 && i = Term.destInd sig_.typ
+		   then
+		     let (a, b) = pair_of_array l in
+		       Some (a, b)
+		   else None
+	     | _ -> None)
+      | _ -> None
+	  
+  and disc_exist env x =
+    trace (str "Disc_exist: " ++ my_print_constr env x);
+    match kind_of_term x with
+      | App (c, l) ->
+	  (match kind_of_term c with
+	       Construct c ->	       
+		 if c = Term.destConstruct (Lazy.force sig_).intro
+		 then Some (l.(0), l.(1), l.(2), l.(3))
+		 else None
+	     | _ -> None)
+      | _ -> None
 
-let disc_proj_exist env x =
-  trace (str "disc_proj_exist: " ++ my_print_constr env x);
-  match kind_of_term x with
-    | App (c, l) ->
-	(if Term.eq_constr c (Lazy.force sig_).proj1 
-	   && Array.length l = 3 
-	 then disc_exist env l.(2)
-	 else None)
-    | _ -> None
 
+  let disc_proj_exist env x =
+    trace (str "disc_proj_exist: " ++ my_print_constr env x);
+    match kind_of_term x with
+      | App (c, l) ->
+	  (if Term.eq_constr c (Lazy.force sig_).proj1 
+	     && Array.length l = 3 
+	   then disc_exist env l.(2)
+	   else None)
+      | _ -> None
 
-let sort_rel s1 s2 = 
-  match s1, s2 with
-      Prop Pos, Prop Pos -> Prop Pos
-    | Prop Pos, Prop Null -> Prop Null
-    | Prop Null, Prop Null -> Prop Null
-    | Prop Null, Prop Pos -> Prop Pos
-    | Type _, Prop Pos -> Prop Pos
-    | Type _, Prop Null -> Prop Null
-    | _, Type _ -> s2
 
-let rec mu env isevars t =   
-  let rec aux v = 
-    match disc_subset v with
-      Some (u, p) -> 
-	let f, ct = aux u in
-	  (Some (fun x ->		   
-		   app_opt f (mkApp ((Lazy.force sig_).proj1, 
-				     [| u; p; x |]))),
-	   ct)
-    | None -> (None, t)
-  in aux t
+  let sort_rel s1 s2 = 
+    match s1, s2 with
+	Prop Pos, Prop Pos -> Prop Pos
+      | Prop Pos, Prop Null -> Prop Null
+      | Prop Null, Prop Null -> Prop Null
+      | Prop Null, Prop Pos -> Prop Pos
+      | Type _, Prop Pos -> Prop Pos
+      | Type _, Prop Null -> Prop Null
+      | _, Type _ -> s2
 
-and coerce loc env isevars (x : Term.constr) (y : Term.constr) 
-    : (Term.constr -> Term.constr) option 
-    =
-  trace (str "Coerce called for " ++ (my_print_constr env x) ++ 
-	 str " and "++ my_print_constr env y);
+  let rec mu env isevars t =   
+    let rec aux v = 
+      match disc_subset v with
+	  Some (u, p) -> 
+	    let f, ct = aux u in
+	      (Some (fun x ->		   
+		       app_opt f (mkApp ((Lazy.force sig_).proj1, 
+					 [| u; p; x |]))),
+	       ct)
+	| None -> (None, t)
+    in aux t
 
-  let rec coerce_unify env x y =
-    if e_cumul env isevars x y then (
-      trace (str "Unified " ++ (my_print_constr env x) ++ 
+  and coerce loc env isevars (x : Term.constr) (y : Term.constr) 
+      : (Term.constr -> Term.constr) option 
+      =
+    trace (str "Coerce called for " ++ (my_print_constr env x) ++ 
 	     str " and "++ my_print_constr env y);
-      None
-    ) else coerce' env x y (* head recutions needed *)
-  and coerce' env x y : (Term.constr -> Term.constr) option =
-    let subco () = subset_coerce env x y in
-      trace (str "coerce' from " ++ (my_print_constr env x) ++ 
-	     str " to "++ my_print_constr env y);
-      match (kind_of_term x, kind_of_term y) with
-	| Sort s, Sort s' -> 
-	    (match s, s' with
-		 Prop x, Prop y when x = y -> None
-	       | Prop _, Type _ -> None
-	       | Type x, Type y when x = y -> None (* false *)
-	       | _ -> subco ())
-	| Prod (name, a, b), Prod (name', a', b') ->
-	    let c1 = coerce_unify env a' a in
-	    let env' = push_rel (name', None, a') env in
-	    let c2 = coerce_unify env' b b' in
-	      (match c1, c2 with
-		   None, None -> failwith "subtac.coerce': Should have detected equivalence earlier"
-		 | _, _ ->
-		     Some
-		       (fun f -> 
-			  mkLambda (name', a',
-				    app_opt c2
-				      (mkApp (Term.lift 1 f, 
-					      [| app_opt c1 (mkRel 1) |])))))
-		
-	| App (c, l), App (c', l') ->
-	    (match kind_of_term c, kind_of_term c' with
-		 Ind i, Ind i' ->
-		   let len = Array.length l in
-		   let existS = Lazy.force existS in
-		     if len = Array.length l' && len = 2
-		       && i = i' && i = Term.destInd existS.typ 
-		     then
-		       begin (* Sigma types *)
-			 debug 1 (str "In coerce sigma types");
-			 let (a, pb), (a', pb') = 
-			   pair_of_array l, pair_of_array l' 
-			 in
-			 let c1 = coerce_unify env a a' in
-			 let remove_head c = 
-			   let (_, _, x) = Term.destProd c in
-			     x
-			 in
-			 let b, b' = remove_head pb, remove_head pb' in
-			 let env' = push_rel (make_name "x", None, a) env in
-			 let c2 = coerce_unify env' b b' in
-			   match c1, c2 with
-			       None, None -> None
-			     | _, _ ->
-				 Some 
-				   (fun x ->
-				      let x, y = 
-					app_opt c1 (mkApp (existS.proj1,
-							   [| a; pb; x |])),
-					app_opt c2 (mkApp (existS.proj2, 
-							   [| a; pb'; x |]))
-				      in
-					mkApp (existS.intro, [| x ; y |]))
-		       end
-		     else subco ()
-	       | _ ->  subco ())
-	| _, _ ->  subco ()
 
-  and subset_coerce env x y =
-    match disc_subset x with
-	Some (u, p) -> 
-	  let c = coerce_unify env u y in
-	  let f x = 
-	    app_opt c (mkApp ((Lazy.force sig_).proj1, 
-			      [| u; p; x |]))
-	  in Some f
-      | None ->
-	  match disc_subset y with
-	    Some (u, p) ->
-	      let c = coerce_unify env x u in
-		Some 
-		  (fun x ->
-		     let cx = app_opt c x in
-		     let evar = make_existential dummy_loc env isevars (mkApp (p, [| cx |]))
-		     in
-		       (mkApp 
-			  ((Lazy.force sig_).intro, 
-			   [| u; p; cx; evar |])))
-	    | None -> raise NoCoercion
-  in coerce_unify env x y
+    let rec coerce_unify env x y =
+      if e_cumul env isevars x y then (
+	trace (str "Unified " ++ (my_print_constr env x) ++ 
+		 str " and "++ my_print_constr env y);
+	None
+      ) else coerce' env x y (* head recutions needed *)
+    and coerce' env x y : (Term.constr -> Term.constr) option =
+      let subco () = subset_coerce env x y in
+	trace (str "coerce' from " ++ (my_print_constr env x) ++ 
+		 str " to "++ my_print_constr env y);
+	match (kind_of_term x, kind_of_term y) with
+	  | Sort s, Sort s' -> 
+	      (match s, s' with
+		   Prop x, Prop y when x = y -> None
+		 | Prop _, Type _ -> None
+		 | Type x, Type y when x = y -> None (* false *)
+		 | _ -> subco ())
+	  | Prod (name, a, b), Prod (name', a', b') ->
+	      let c1 = coerce_unify env a' a in
+	      let env' = push_rel (name', None, a') env in
+	      let c2 = coerce_unify env' b b' in
+		(match c1, c2 with
+		     None, None -> failwith "subtac.coerce': Should have detected equivalence earlier"
+		   | _, _ ->
+		       Some
+			 (fun f -> 
+			    mkLambda (name', a',
+				      app_opt c2
+					(mkApp (Term.lift 1 f, 
+						[| app_opt c1 (mkRel 1) |])))))
+		  
+	  | App (c, l), App (c', l') ->
+	      (match kind_of_term c, kind_of_term c' with
+		   Ind i, Ind i' ->
+		     let len = Array.length l in
+		     let existS = Lazy.force existS in
+		       if len = Array.length l' && len = 2
+			 && i = i' && i = Term.destInd existS.typ 
+		       then
+			 begin (* Sigma types *)
+			   debug 1 (str "In coerce sigma types");
+			   let (a, pb), (a', pb') = 
+			     pair_of_array l, pair_of_array l' 
+			   in
+			   let c1 = coerce_unify env a a' in
+			   let remove_head c = 
+			     let (_, _, x) = Term.destProd c in
+			       x
+			   in
+			   let b, b' = remove_head pb, remove_head pb' in
+			   let env' = push_rel (make_name "x", None, a) env in
+			   let c2 = coerce_unify env' b b' in
+			     match c1, c2 with
+				 None, None -> None
+			       | _, _ ->
+				   Some 
+				     (fun x ->
+					let x, y = 
+					  app_opt c1 (mkApp (existS.proj1,
+							     [| a; pb; x |])),
+					  app_opt c2 (mkApp (existS.proj2, 
+							     [| a; pb'; x |]))
+					in
+					  mkApp (existS.intro, [| x ; y |]))
+			 end
+		       else subco ()
+		 | _ ->  subco ())
+	  | _, _ ->  subco ()
 
-let coerce_itf loc env isevars hj c1 =
-  let {uj_val = v; uj_type = t} = hj in
-  let evars = ref isevars in
-  let coercion = coerce loc env evars t c1 in
-    !evars, {uj_val = app_opt coercion v;
-	     uj_type = t}
-      
-(* Taken from pretyping/coercion.ml *)
+    and subset_coerce env x y =
+      match disc_subset x with
+	  Some (u, p) -> 
+	    let c = coerce_unify env u y in
+	    let f x = 
+	      app_opt c (mkApp ((Lazy.force sig_).proj1, 
+				[| u; p; x |]))
+	    in Some f
+	| None ->
+	    match disc_subset y with
+		Some (u, p) ->
+		  let c = coerce_unify env x u in
+		    Some 
+		      (fun x ->
+			 let cx = app_opt c x in
+			 let evar = make_existential dummy_loc env isevars (mkApp (p, [| cx |]))
+			 in
+			   (mkApp 
+			      ((Lazy.force sig_).intro, 
+			       [| u; p; cx; evar |])))
+	      | None -> raise NoCoercion
+    in coerce_unify env x y
 
-(* Typing operations dealing with coercions *)
+  let coerce_itf loc env isevars hj c1 =
+    let {uj_val = v; uj_type = t} = hj in
+    let evars = ref isevars in
+    let coercion = coerce loc env evars t c1 in
+      !evars, {uj_val = app_opt coercion v;
+	       uj_type = t}
+	
+  (* Taken from pretyping/coercion.ml *)
 
-let class_of1 env sigma t = class_of env sigma (nf_evar sigma t)
+  (* Typing operations dealing with coercions *)
 
-(* Here, funj is a coercion therefore already typed in global context *)
-let apply_coercion_args env argl funj =
-  let rec apply_rec acc typ = function
-    | [] -> { uj_val = applist (j_val funj,argl);
-              uj_type = typ }
-    | h::restl ->
-    (* On devrait pouvoir s'arranger pour qu'on n'ait pas à faire hnf_constr *)
-  	match kind_of_term (whd_betadeltaiota env Evd.empty typ) with
-	  | Prod (_,c1,c2) -> 
-              (* Typage garanti par l'appel à app_coercion*)
-	      apply_rec (h::acc) (subst1 h c2) restl
-	  | _ -> anomaly "apply_coercion_args"
-  in 
-  apply_rec [] funj.uj_type argl
+  let class_of1 env sigma t = class_of env sigma (nf_evar sigma t)
 
-exception NoCoercion
+  (* Here, funj is a coercion therefore already typed in global context *)
+  let apply_coercion_args env argl funj =
+    let rec apply_rec acc typ = function
+      | [] -> { uj_val = applist (j_val funj,argl);
+		uj_type = typ }
+      | h::restl ->
+	  (* On devrait pouvoir s'arranger pour qu'on n'ait pas à faire hnf_constr *)
+  	  match kind_of_term (whd_betadeltaiota env Evd.empty typ) with
+	    | Prod (_,c1,c2) -> 
+		(* Typage garanti par l'appel à app_coercion*)
+		apply_rec (h::acc) (subst1 h c2) restl
+	    | _ -> anomaly "apply_coercion_args"
+    in 
+      apply_rec [] funj.uj_type argl
 
-(* appliquer le chemin de coercions de patterns p *)
+  exception NoCoercion
 
-let apply_pattern_coercion loc pat p =
-  List.fold_left
-    (fun pat (co,n) ->
-       let f i = if i<n then Rawterm.PatVar (loc, Anonymous) else pat in
-       Rawterm.PatCstr (loc, co, list_tabulate f (n+1), Anonymous))
-    pat p
+  (* appliquer le chemin de coercions de patterns p *)
 
-(* raise Not_found if no coercion found *)
-let inh_pattern_coerce_to loc pat ind1 ind2 =
-  let i1 = inductive_class_of ind1 in
-  let i2 = inductive_class_of ind2 in
-  let p = lookup_pattern_path_between (i1,i2) in
-  apply_pattern_coercion loc pat p
+  let apply_pattern_coercion loc pat p =
+    List.fold_left
+      (fun pat (co,n) ->
+	 let f i = if i<n then Rawterm.PatVar (loc, Anonymous) else pat in
+	   Rawterm.PatCstr (loc, co, list_tabulate f (n+1), Anonymous))
+      pat p
 
-(* appliquer le chemin de coercions p à hj *)
+  (* raise Not_found if no coercion found *)
+  let inh_pattern_coerce_to loc pat ind1 ind2 =
+    let i1 = inductive_class_of ind1 in
+    let i2 = inductive_class_of ind2 in
+    let p = lookup_pattern_path_between (i1,i2) in
+      apply_pattern_coercion loc pat p
 
-let apply_coercion env p hj typ_cl =
-  try 
-    fst (List.fold_left
-           (fun (ja,typ_cl) i -> 
-              let fv,isid = coercion_value i in
-              let argl = (class_args_of typ_cl)@[ja.uj_val] in
-              let jres = apply_coercion_args env argl fv in
-              (if isid then 
-		 { uj_val = ja.uj_val; uj_type = jres.uj_type }
-               else 
-		 jres),
-	      jres.uj_type)
-           (hj,typ_cl) p)
-  with _ -> anomaly "apply_coercion"
+  (* appliquer le chemin de coercions p à hj *)
 
-let inh_app_fun env isevars j = 
-  let t = whd_betadeltaiota env (evars_of isevars) j.uj_type in
-  match kind_of_term t with
-    | Prod (_,_,_) -> (isevars,j)
-    | Evar ev when not (is_defined_evar isevars ev) ->
-	let (isevars',t) = define_evar_as_arrow isevars ev in
-	(isevars',{ uj_val = j.uj_val; uj_type = t })
-    | _ ->
-       	(try
- 	   let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
-      	   let p = lookup_path_to_fun_from i1 in
-           (isevars,apply_coercion env p j t)
-	 with Not_found ->
-	   try 
-	     let coercef, t = mu env isevars t in
-	       (isevars, { uj_val = app_opt coercef j.uj_val; uj_type = t })
-	   with NoCoercion ->
-	     (isevars,j))
+  let apply_coercion env p hj typ_cl =
+    try 
+      fst (List.fold_left
+             (fun (ja,typ_cl) i -> 
+		let fv,isid = coercion_value i in
+		let argl = (class_args_of typ_cl)@[ja.uj_val] in
+		let jres = apply_coercion_args env argl fv in
+		  (if isid then 
+		     { uj_val = ja.uj_val; uj_type = jres.uj_type }
+		   else 
+		     jres),
+		jres.uj_type)
+             (hj,typ_cl) p)
+    with _ -> anomaly "apply_coercion"
 
-let inh_tosort_force loc env isevars j =
-  try
-    let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
-    let p = lookup_path_to_sort_from i1 in
-    let j1 = apply_coercion env p j t in 
-    (isevars,type_judgment env (j_nf_evar (evars_of isevars) j1))
-  with Not_found ->
-    error_not_a_type_loc loc env (evars_of isevars) j
+  let inh_app_fun env isevars j = 
+    let t = whd_betadeltaiota env (evars_of isevars) j.uj_type in
+      match kind_of_term t with
+	| Prod (_,_,_) -> (isevars,j)
+	| Evar ev when not (is_defined_evar isevars ev) ->
+	    let (isevars',t) = define_evar_as_arrow isevars ev in
+	      (isevars',{ uj_val = j.uj_val; uj_type = t })
+	| _ ->
+       	    (try
+ 	       let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
+      	       let p = lookup_path_to_fun_from i1 in
+		 (isevars,apply_coercion env p j t)
+	     with Not_found ->
+	       try 
+		 let coercef, t = mu env isevars t in
+		   (isevars, { uj_val = app_opt coercef j.uj_val; uj_type = t })
+	       with NoCoercion ->
+		 (isevars,j))
 
-let inh_coerce_to_sort loc env isevars j =
-  let typ = whd_betadeltaiota env (evars_of isevars) j.uj_type in
-  match kind_of_term typ with
-    | Sort s -> (isevars,{ utj_val = j.uj_val; utj_type = s })
-    | Evar ev when not (is_defined_evar isevars ev) ->
-	let (isevars',s) = define_evar_as_sort isevars ev in
-	(isevars',{ utj_val = j.uj_val; utj_type = s })
-    | _ ->
-	inh_tosort_force loc env isevars j
+  let inh_tosort_force loc env isevars j =
+    try
+      let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
+      let p = lookup_path_to_sort_from i1 in
+      let j1 = apply_coercion env p j t in 
+	(isevars,type_judgment env (j_nf_evar (evars_of isevars) j1))
+    with Not_found ->
+      error_not_a_type_loc loc env (evars_of isevars) j
 
-let inh_coerce_to_fail env isevars c1 hj =
-  let hj' =
-    try 
-      let t1,i1 = class_of1 env (evars_of isevars) c1 in
-      let t2,i2 = class_of1 env (evars_of isevars) hj.uj_type in
-      let p = lookup_path_between (i2,i1) in
-      apply_coercion env p hj t2
-    with Not_found -> raise NoCoercion 
-  in
-  try (the_conv_x_leq env hj'.uj_type c1 isevars, hj')
-  with Reduction.NotConvertible -> raise NoCoercion
+  let inh_coerce_to_sort loc env isevars j =
+    let typ = whd_betadeltaiota env (evars_of isevars) j.uj_type in
+      match kind_of_term typ with
+	| Sort s -> (isevars,{ utj_val = j.uj_val; utj_type = s })
+	| Evar ev when not (is_defined_evar isevars ev) ->
+	    let (isevars',s) = define_evar_as_sort isevars ev in
+	      (isevars',{ utj_val = j.uj_val; utj_type = s })
+	| _ ->
+	    inh_tosort_force loc env isevars j
 
-let rec inh_conv_coerce_to_fail env isevars hj c1 =
-  let {uj_val = v; uj_type = t} = hj in
-  try (the_conv_x_leq env t c1 isevars, hj)
-  with Reduction.NotConvertible ->
-    (try 
-      inh_coerce_to_fail env isevars c1 hj
-    with NoCoercion ->
-      (match kind_of_term (whd_betadeltaiota env (evars_of isevars) t),
-	     kind_of_term (whd_betadeltaiota env (evars_of isevars) c1) with
-	 | Prod (_,t1,t2), Prod (name,u1,u2) -> 
-             let v' = whd_betadeltaiota env (evars_of isevars) v in
-             let (evd',b) =
-               match kind_of_term v' with
-                 | Lambda (_,v1,v2) ->
-                     (try the_conv_x env v1 u1 isevars, true  (* leq v1 u1? *)
-                     with Reduction.NotConvertible -> (isevars, false))
-                 | _  -> (isevars,false) in
-             if b
-             then 
-	       let (x,v1,v2) = destLambda v' in
-               let env1 = push_rel (x,None,v1) env in
-               let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
+  let inh_coerce_to_fail env isevars c1 hj =
+    let hj' =
+      try 
+	let t1,i1 = class_of1 env (evars_of isevars) c1 in
+	let t2,i2 = class_of1 env (evars_of isevars) hj.uj_type in
+	let p = lookup_path_between (i2,i1) in
+	  apply_coercion env p hj t2
+      with Not_found -> raise NoCoercion 
+    in
+      try (the_conv_x_leq env hj'.uj_type c1 isevars, hj')
+      with Reduction.NotConvertible -> raise NoCoercion
+
+  let rec inh_conv_coerce_to_fail env isevars hj c1 =
+    let {uj_val = v; uj_type = t} = hj in
+      try (the_conv_x_leq env t c1 isevars, hj)
+      with Reduction.NotConvertible ->
+	(try 
+	   inh_coerce_to_fail env isevars c1 hj
+	 with NoCoercion ->
+	   (match kind_of_term (whd_betadeltaiota env (evars_of isevars) t),
+	      kind_of_term (whd_betadeltaiota env (evars_of isevars) c1) with
+		| Prod (_,t1,t2), Prod (name,u1,u2) -> 
+		    let v' = whd_betadeltaiota env (evars_of isevars) v in
+		    let (evd',b) =
+		      match kind_of_term v' with
+			| Lambda (_,v1,v2) ->
+			    (try the_conv_x env v1 u1 isevars, true  (* leq v1 u1? *)
+			     with Reduction.NotConvertible -> (isevars, false))
+			| _  -> (isevars,false) in
+		      if b
+		      then 
+			let (x,v1,v2) = destLambda v' in
+			let env1 = push_rel (x,None,v1) env in
+			let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
 			  {uj_val = v2; uj_type = t2 } u2 in
-               (evd'',{ uj_val = mkLambda (x, v1, h2.uj_val);
-                 uj_type = mkProd (x, v1, h2.uj_type) })
-             else 
-               (* Mismatch on t1 and u1 or not a lambda: we eta-expand *)
-               (* we look for a coercion c:u1->t1 s.t. [name:u1](v' (c x)) *)
-               (* has type (name:u1)u2 (with v' recursively obtained) *)
-               let name = (match name with 
-			     | Anonymous -> Name (id_of_string "x")
-                             | _ -> name) in
-               let env1 = push_rel (name,None,u1) env in
-               let (evd',h1) =
-		 inh_conv_coerce_to_fail env1 isevars
-		   {uj_val = mkRel 1; uj_type = (lift 1 u1) }
-                   (lift 1 t1) in
-               let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
-			 { uj_val = mkApp (lift 1 v, [|h1.uj_val|]);
-                           uj_type = subst1 h1.uj_val t2 }
+			  (evd'',{ uj_val = mkLambda (x, v1, h2.uj_val);
+				   uj_type = mkProd (x, v1, h2.uj_type) })
+		      else 
+			(* Mismatch on t1 and u1 or not a lambda: we eta-expand *)
+			(* we look for a coercion c:u1->t1 s.t. [name:u1](v' (c x)) *)
+			(* has type (name:u1)u2 (with v' recursively obtained) *)
+			let name = (match name with 
+				      | Anonymous -> Name (id_of_string "x")
+				      | _ -> name) in
+			let env1 = push_rel (name,None,u1) env in
+			let (evd',h1) =
+			  inh_conv_coerce_to_fail env1 isevars
+			    {uj_val = mkRel 1; uj_type = (lift 1 u1) }
+			    (lift 1 t1) in
+			let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
+			  { uj_val = mkApp (lift 1 v, [|h1.uj_val|]);
+                            uj_type = subst1 h1.uj_val t2 }
                           u2
-	       in
-               (evd'',
-                { uj_val = mkLambda (name, u1, h2.uj_val);
-                  uj_type = mkProd (name, u1, h2.uj_type) })
-	 | _ -> raise NoCoercion))
+			in
+			  (evd'',
+			   { uj_val = mkLambda (name, u1, h2.uj_val);
+			     uj_type = mkProd (name, u1, h2.uj_type) })
+		| _ -> raise NoCoercion))
 
-(* Look for cj' obtained from cj by inserting coercions, s.t. cj'.typ = t *)
-let inh_conv_coerce_to loc env isevars cj t =
-  trace (str "inh_conv_coerce_to called for " ++ (my_print_constr env cj.uj_type) ++ 
-	   str " and "++ my_print_constr env t);
-  let (evd',cj') = 
-    try 
-      inh_conv_coerce_to_fail env isevars cj t
-    with NoCoercion ->
-      try
-	coerce_itf loc env isevars cj t
+  (* Look for cj' obtained from cj by inserting coercions, s.t. cj'.typ = t *)
+  let inh_conv_coerce_to loc env isevars cj t =
+    trace (str "inh_conv_coerce_to called for " ++ (my_print_constr env cj.uj_type) ++ 
+	     str " and "++ my_print_constr env t);
+    let (evd',cj') = 
+      try 
+	inh_conv_coerce_to_fail env isevars cj t
       with NoCoercion ->
-	let sigma = evars_of isevars in
-	  debug 2 (str "No coercion found");
-	  error_actual_type_loc loc env sigma cj t
-  in
-  (evd',{ uj_val = cj'.uj_val; uj_type = t })
+	try
+	  coerce_itf loc env isevars cj t
+	with NoCoercion ->
+	  let sigma = evars_of isevars in
+	    debug 2 (str "No coercion found");
+	    error_actual_type_loc loc env sigma cj t
+    in
+      (evd',{ uj_val = cj'.uj_val; uj_type = t })
+end
diff --git a/contrib/subtac/subtac_coercion.mli b/contrib/subtac/subtac_coercion.mli
new file mode 100644
index 0000000000..53a8d21338
--- /dev/null
+++ b/contrib/subtac/subtac_coercion.mli
@@ -0,0 +1 @@
+module Coercion : Coercion.S
diff --git a/contrib/subtac/subtac_command.ml b/contrib/subtac/subtac_command.ml
index 34eff9a176..64aee76119 100644
--- a/contrib/subtac/subtac_command.ml
+++ b/contrib/subtac/subtac_command.ml
@@ -34,15 +34,14 @@ open Mod_subst
 open Printer
 open Inductiveops
 open Syntax_def
-open Pretyping
 
 open Tacinterp
 open Vernacexpr
 open Notation
 
-open Interp
-open Scoq
-
+module SPretyping = Subtac_pretyping.Pretyping
+open Subtac_utils
+open Pretyping
 
 (*********************************************************************)
 (* Functions to parse and interpret constructions *)
@@ -50,11 +49,10 @@ open Scoq
 let interp_gen kind isevars env 
                ?(impls=([],[])) ?(allow_soapp=false) ?(ltacvars=([],[]))
                c =
-  let c' = Constrintern.intern_gen (kind=Pretyping.IsType) ~impls ~allow_soapp ~ltacvars (Evd.evars_of !isevars) env c in
-  let c'' = Interp_fixpoint.rewrite_cases c' in
-    understand_gen kind isevars env c''
+  let c' = Constrintern.intern_gen (kind=IsType) ~impls ~allow_soapp ~ltacvars (Evd.evars_of !isevars) env c in
+  let c'' = Subtac_interp_fixpoint.rewrite_cases c' in
+    Evd.evars_of !isevars, SPretyping.pretype_gen isevars env ([],[]) kind c''
     
-
 let interp_constr isevars env c =
   interp_gen (OfType None) isevars env c 
 
@@ -65,10 +63,14 @@ let interp_casted_constr isevars env ?(impls=([],[])) c typ =
   interp_gen (OfType (Some typ)) isevars env ~impls c 
 
 let interp_open_constr isevars env c =
-  understand_tcc isevars env (Constrintern.intern_constr (Evd.evars_of !isevars) env c)
+  SPretyping.pretype_gen isevars env ([], []) (OfType None) 
+    (Constrintern.intern_constr (Evd.evars_of !isevars) env c)
 
 let interp_constr_judgment isevars env c =
-  understand_judgment isevars env (Constrintern.intern_constr (Evd.evars_of !isevars) env c)
+  let s, j = SPretyping.understand_judgment_tcc (Evd.evars_of !isevars) env
+    (Constrintern.intern_constr (Evd.evars_of !isevars) env c)
+  in 
+    Evd.create_evar_defs s, j
 
 (* try to find non recursive definitions *)
 
@@ -118,7 +120,7 @@ let build_recursive (lnameargsardef:(fixpoint_expr * decl_notation) list) boxed
   and protos = List.map (fun ((f, n, _, _, _),_) -> f,n) lnameargsardef
   in 
   let lnameargsardef = 
-    List.map (fun (f, d) -> Interp_fixpoint.rewrite_fixpoint env0 protos (f, d))
+    List.map (fun (f, d) -> Subtac_interp_fixpoint.rewrite_fixpoint env0 protos (f, d))
       lnameargsardef
   in
   let lrecnames = List.map (fun ((f,_,_,_,_),_) -> f) lnameargsardef 
diff --git a/contrib/subtac/subtac_command.mli b/contrib/subtac/subtac_command.mli
new file mode 100644
index 0000000000..23a03290c8
--- /dev/null
+++ b/contrib/subtac/subtac_command.mli
@@ -0,0 +1,103 @@
+module SPretyping :
+  sig
+    module Cases :
+      sig
+        val compile_cases :
+          Util.loc ->
+          (Evarutil.type_constraint ->
+           Environ.env -> Rawterm.rawconstr -> Environ.unsafe_judgment) *
+          Evd.evar_defs ref ->
+          Evarutil.type_constraint ->
+          Environ.env ->
+          Rawterm.rawconstr option *
+          (Rawterm.rawconstr *
+           (Names.name *
+            (Util.loc * Names.inductive * Names.name list) option))
+          list *
+          (Util.loc * Names.identifier list * Rawterm.cases_pattern list *
+           Rawterm.rawconstr)
+          list -> Environ.unsafe_judgment
+      end
+    val understand_tcc :
+      Evd.evar_map ->
+      Environ.env ->
+      ?expected_type:Term.types -> Rawterm.rawconstr -> Evd.open_constr
+    val understand_ltac :
+      Evd.evar_map ->
+      Environ.env ->
+      Pretyping.var_map * Pretyping.unbound_ltac_var_map ->
+      Pretyping.typing_constraint ->
+      Rawterm.rawconstr -> Evd.evar_defs * Term.constr
+    val understand :
+      Evd.evar_map ->
+      Environ.env ->
+      ?expected_type:Term.types -> Rawterm.rawconstr -> Term.constr
+    val understand_type :
+      Evd.evar_map -> Environ.env -> Rawterm.rawconstr -> Term.constr
+    val understand_gen :
+      Pretyping.typing_constraint ->
+      Evd.evar_map -> Environ.env -> Rawterm.rawconstr -> Term.constr
+    val understand_judgment :
+      Evd.evar_map ->
+      Environ.env -> Rawterm.rawconstr -> Environ.unsafe_judgment
+    val understand_judgment_tcc :
+      Evd.evar_map ->
+      Environ.env ->
+      Rawterm.rawconstr -> Evd.evar_map * Environ.unsafe_judgment
+    val pretype :
+      Evarutil.type_constraint ->
+      Environ.env ->
+      Evd.evar_defs ref ->
+      Pretyping.var_map * (Names.identifier * Names.identifier option) list ->
+      Rawterm.rawconstr -> Environ.unsafe_judgment
+    val pretype_type :
+      Evarutil.val_constraint ->
+      Environ.env ->
+      Evd.evar_defs ref ->
+      Pretyping.var_map * (Names.identifier * Names.identifier option) list ->
+      Rawterm.rawconstr -> Environ.unsafe_type_judgment
+    val pretype_gen :
+      Evd.evar_defs ref ->
+      Environ.env ->
+      Pretyping.var_map * (Names.identifier * Names.identifier option) list ->
+      Pretyping.typing_constraint -> Rawterm.rawconstr -> Term.constr
+  end
+val interp_gen :
+  Pretyping.typing_constraint ->
+  Evd.evar_defs ref ->
+  Environ.env ->
+  ?impls:Constrintern.full_implicits_env ->
+  ?allow_soapp:bool ->
+  ?ltacvars:Constrintern.ltac_sign ->
+  Topconstr.constr_expr -> Evd.evar_map * Term.constr
+val interp_constr :
+  Evd.evar_defs ref ->
+  Environ.env -> Topconstr.constr_expr -> Evd.evar_map * Term.constr
+val interp_type :
+  Evd.evar_defs ref ->
+  Environ.env ->
+  ?impls:Constrintern.full_implicits_env ->
+  Topconstr.constr_expr -> Evd.evar_map * Term.constr
+val interp_casted_constr :
+  Evd.evar_defs ref ->
+  Environ.env ->
+  ?impls:Constrintern.full_implicits_env ->
+  Topconstr.constr_expr -> Term.types -> Evd.evar_map * Term.constr
+val interp_open_constr :
+  Evd.evar_defs ref -> Environ.env -> Topconstr.constr_expr -> Term.constr
+val interp_constr_judgment :
+  Evd.evar_defs ref ->
+  Environ.env ->
+  Topconstr.constr_expr -> Evd.evar_defs * Environ.unsafe_judgment
+val list_chop_hd : int -> 'a list -> 'a list * 'a * 'a list
+val collect_non_rec :
+  Environ.env ->
+  Names.identifier list ->
+  ('a * Term.types) list ->
+  'b list ->
+  'c list ->
+  (Names.identifier * ('a * Term.types) * 'b) list *
+  (Names.identifier array * ('a * Term.types) array * 'b array * 'c array)
+val recursive_message : Libnames.global_reference array -> Pp.std_ppcmds
+val build_recursive :
+  (Topconstr.fixpoint_expr * Vernacexpr.decl_notation) list -> bool -> unit
diff --git a/contrib/subtac/subtac_errors.mli b/contrib/subtac/subtac_errors.mli
new file mode 100644
index 0000000000..8d75b9c017
--- /dev/null
+++ b/contrib/subtac/subtac_errors.mli
@@ -0,0 +1,15 @@
+type term_pp = Pp.std_ppcmds
+type subtyping_error =
+    UncoercibleInferType of Util.loc * term_pp * term_pp
+  | UncoercibleInferTerm of Util.loc * term_pp * term_pp * term_pp * term_pp
+  | UncoercibleRewrite of term_pp * term_pp
+type typing_error =
+    NonFunctionalApp of Util.loc * term_pp * term_pp * term_pp
+  | NonConvertible of Util.loc * term_pp * term_pp
+  | NonSigma of Util.loc * term_pp
+  | IllSorted of Util.loc * term_pp
+exception Subtyping_error of subtyping_error
+exception Typing_error of typing_error
+exception Debug_msg of string
+val typing_error : typing_error -> 'a
+val subtyping_error : subtyping_error -> 'a
diff --git a/contrib/subtac/interp_fixpoint.ml b/contrib/subtac/subtac_interp_fixpoint.ml
index 8191357091..c668c3503b 100644
--- a/contrib/subtac/interp_fixpoint.ml
+++ b/contrib/subtac/subtac_interp_fixpoint.ml
@@ -23,7 +23,7 @@ open Dyn
 open Topconstr
 
 open Subtac_coercion
-open Scoq
+open Subtac_utils
 open Coqlib
 open Printer
 open Subtac_errors
diff --git a/contrib/subtac/subtac_interp_fixpoint.mli b/contrib/subtac/subtac_interp_fixpoint.mli
new file mode 100644
index 0000000000..5a84b27730
--- /dev/null
+++ b/contrib/subtac/subtac_interp_fixpoint.mli
@@ -0,0 +1,42 @@
+val mkAppExplC :
+  Libnames.reference * Topconstr.constr_expr list -> Topconstr.constr_expr
+val mkSubset :
+  Names.name Util.located ->
+  Topconstr.constr_expr -> Topconstr.constr_expr -> Topconstr.constr_expr
+val mkProj1 :
+  Topconstr.constr_expr ->
+  Topconstr.constr_expr -> Topconstr.constr_expr -> Topconstr.constr_expr
+val mkProj2 :
+  Topconstr.constr_expr ->
+  Topconstr.constr_expr -> Topconstr.constr_expr -> Topconstr.constr_expr
+val list_of_local_binders :
+  Topconstr.local_binder list ->
+  (Names.name Util.located * Topconstr.constr_expr) list
+val abstract_constr_expr_bl :
+  Topconstr.constr_expr ->
+  (Names.name Util.located * Topconstr.constr_expr) list ->
+  Topconstr.constr_expr
+val pr_binder_list :
+  (('a * Names.name) * Topconstr.constr_expr) list -> Pp.std_ppcmds
+val rewrite_rec_calls : 'a -> 'b -> 'b
+val rewrite_fixpoint :
+  'a ->
+  'b ->
+  (Names.identifier * (int * Topconstr.recursion_order_expr) *
+   Topconstr.local_binder list * Topconstr.constr_expr *
+   Topconstr.constr_expr) *
+  'c ->
+  (Names.identifier * (int * Topconstr.recursion_order_expr) *
+   Topconstr.local_binder list * Topconstr.constr_expr *
+   Topconstr.constr_expr) *
+  'c
+val list_mapi : (int -> 'a -> 'b) -> 'a list -> 'b list
+val rewrite_cases_aux :
+  Util.loc * Rawterm.rawconstr option *
+  (Rawterm.rawconstr *
+   (Names.name * (Util.loc * Names.inductive * Names.name list) option))
+  list *
+  (Util.loc * Names.identifier list * Rawterm.cases_pattern list *
+   Rawterm.rawconstr)
+  list -> Rawterm.rawconstr
+val rewrite_cases : Rawterm.rawconstr -> Rawterm.rawconstr
diff --git a/contrib/subtac/subtac_pretyping.ml b/contrib/subtac/subtac_pretyping.ml
new file mode 100644
index 0000000000..8dd6f9b8fe
--- /dev/null
+++ b/contrib/subtac/subtac_pretyping.ml
@@ -0,0 +1,146 @@
+(************************************************************************)
+(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
+(* <O___,, * CNRS-Ecole Polytechnique-INRIA Futurs-Universite Paris Sud *)
+(*   \VV/  **************************************************************)
+(*    //   *      This file is distributed under the terms of the       *)
+(*         *       GNU Lesser General Public License Version 2.1        *)
+(************************************************************************)
+
+(* $Id$ *)
+
+open Global
+open Pp
+open Util
+open Names
+open Sign
+open Evd
+open Term
+open Termops
+open Reductionops
+open Environ
+open Type_errors
+open Typeops
+open Libnames
+open Classops
+open List
+open Recordops 
+open Evarutil
+open Pretype_errors
+open Rawterm
+open Evarconv
+open Pattern
+open Dyn
+
+open Subtac_coercion
+open Subtac_utils
+open Coqlib
+open Printer
+open Subtac_errors
+open Context
+open Eterm
+
+module Pretyping = Pretyping.Pretyping_F(Subtac_coercion.Coercion)
+open Pretyping
+
+type recursion_info = {
+  arg_name: name;
+  arg_type: types; (* A *)
+  args_after : rel_context;
+  wf_relation: constr; (* R : A -> A -> Prop *)
+  wf_proof: constr; (* : well_founded R *)
+  f_type: types; (* f: A -> Set *)
+  f_fulltype: types; (* Type with argument and wf proof product first *)
+}
+
+let my_print_rec_info env t = 
+  str "Name: " ++ Nameops.pr_name t.arg_name ++ spc () ++
+  str "Arg type: " ++ my_print_constr env t.arg_type ++ spc () ++
+  str "Wf relation: " ++ my_print_constr env t.wf_relation ++ spc () ++
+  str "Wf proof: " ++ my_print_constr env t.wf_proof ++ spc () ++
+  str "Abbreviated Type: " ++ my_print_constr env t.f_type ++ spc () ++
+  str "Full type: " ++ my_print_constr env t.f_fulltype
+(*   trace (str "pretype for " ++ (my_print_rawconstr env c) ++ *)
+(* 	   str " and tycon "++ my_print_tycon env tycon ++ *)
+(* 	   str " in environment: " ++ my_print_env env); *)
+
+let merge_evms x y = 
+  Evd.fold (fun ev evi evm -> Evd.add evm ev evi) x y
+
+let interp env isevars c tycon = 
+  let j = pretype tycon env isevars ([],[]) c in
+    j.uj_val, j.uj_type
+
+let find_with_index x l =
+  let rec aux i = function
+      (y, _, _) as t :: tl -> if x = y then i, t else aux (succ i) tl
+    | [] -> raise Not_found
+  in aux 0 l
+
+let list_split_at index l = 
+  let rec aux i acc = function
+      hd :: tl when i = index -> (List.rev acc), tl
+    | hd :: tl -> aux (succ i) (hd :: acc) tl
+    | [] -> failwith "list_split_at: Invalid argument"
+  in aux 0 [] l
+
+open Vernacexpr
+
+let coqintern evd env : Topconstr.constr_expr -> Rawterm.rawconstr = Constrintern.intern_constr (evars_of evd) env
+let coqinterp evd env : Topconstr.constr_expr -> Term.constr = Constrintern.interp_constr (evars_of evd) env
+
+let env_with_binders env isevars l =
+  let rec aux ((env, rels) as acc) = function
+      Topconstr.LocalRawDef ((loc, name), def) :: tl -> 
+	let rawdef = coqintern !isevars env def in
+	let coqdef, deftyp = interp env isevars rawdef empty_tycon in
+	let reldecl = (name, Some coqdef, deftyp) in
+	  aux  (push_rel reldecl env, reldecl :: rels) tl
+    | Topconstr.LocalRawAssum (bl, typ) :: tl ->
+	let rawtyp = coqintern !isevars env typ in
+	let coqtyp, typtyp = interp env isevars rawtyp empty_tycon in
+	let acc = 
+	  List.fold_left (fun (env, rels) (loc, name) -> 
+			    let reldecl = (name, None, coqtyp) in
+			      (push_rel reldecl env, 
+			       reldecl :: rels))
+	    (env, rels) bl
+	in aux acc tl
+    | [] -> acc
+  in aux (env, []) l
+
+let subtac_process env isevars id l c tycon =
+  let evars () = evars_of !isevars in
+  let _ = trace (str "Creating env with binders") in
+  let env_binders, binders_rel = env_with_binders env isevars l in
+  let _ = trace (str "New env created:" ++ my_print_context env_binders) in
+  let tycon = 
+    match tycon with
+	None -> empty_tycon
+      | Some t -> 
+	  let t = coqintern !isevars env_binders t in
+	  let _ = trace (str "Internalized specification: " ++ my_print_rawconstr env_binders t) in
+	  let coqt, ttyp = interp env_binders isevars t empty_tycon in
+	  let _ = trace (str "Interpreted type: " ++ my_print_constr env_binders coqt) in
+	    mk_tycon coqt
+  in    
+  let c = coqintern !isevars env_binders c in
+  let _ = trace (str "Internalized term: " ++ my_print_rawconstr env c) in
+  let coqc, ctyp = interp env_binders isevars c tycon in
+  let _ = trace (str "Interpreted term: " ++ my_print_constr env_binders coqc ++ spc () ++
+		 str "Coq type: " ++ my_print_constr env_binders ctyp)
+  in
+  let _ = trace (str "Original evar map: " ++ Evd.pr_evar_map (evars ())) in
+    
+  let fullcoqc = it_mkLambda_or_LetIn coqc binders_rel 
+  and fullctyp = it_mkProd_or_LetIn ctyp binders_rel
+  in
+  let fullcoqc = Evarutil.nf_evar (evars_of !isevars) fullcoqc in
+  let fullctyp = Evarutil.nf_evar (evars_of !isevars) fullctyp in
+
+  let _ = trace (str "After evar normalization: " ++ spc () ++
+		 str "Coq term: " ++ my_print_constr env fullcoqc ++ spc ()
+		 ++ str "Coq type: " ++ my_print_constr env fullctyp) 
+  in
+  let evm = non_instanciated_map env isevars in
+  let _ = trace (str "Non instanciated evars map: " ++ Evd.pr_evar_map evm) in
+    evm, fullcoqc, fullctyp
diff --git a/contrib/subtac/subtac_pretyping.mli b/contrib/subtac/subtac_pretyping.mli
new file mode 100644
index 0000000000..97e56ecb24
--- /dev/null
+++ b/contrib/subtac/subtac_pretyping.mli
@@ -0,0 +1,12 @@
+open Term
+open Environ
+open Names
+open Sign
+open Evd
+open Global
+open Topconstr
+
+module Pretyping : Pretyping.S
+
+val subtac_process : env -> evar_defs ref -> identifier -> local_binder list ->
+  constr_expr -> constr_expr option -> evar_map * constr * types
diff --git a/contrib/subtac/scoq.ml b/contrib/subtac/subtac_utils.ml
index eb9888c161..eb9888c161 100644
--- a/contrib/subtac/scoq.ml
+++ b/contrib/subtac/subtac_utils.ml
diff --git a/contrib/subtac/subtac_utils.mli b/contrib/subtac/subtac_utils.mli
new file mode 100644
index 0000000000..5bbd4639eb
--- /dev/null
+++ b/contrib/subtac/subtac_utils.mli
@@ -0,0 +1,53 @@
+val contrib_name : string
+val subtac_dir : string list
+val fix_sub_module : string
+val fixsub_module : string list
+val init_constant : string list -> string -> Term.constr
+val init_reference : string list -> string -> Libnames.global_reference
+val fixsub : Term.constr lazy_t
+val make_ref : string -> Libnames.reference
+val well_founded_ref : Libnames.reference
+val acc_ref : Libnames.reference
+val acc_inv_ref : Libnames.reference
+val fix_sub_ref : Libnames.reference
+val lt_wf_ref : Libnames.reference
+val sig_ref : Libnames.reference
+val proj1_sig_ref : Libnames.reference
+val proj2_sig_ref : Libnames.reference
+val build_sig : unit -> Coqlib.coq_sigma_data
+val sig_ : Coqlib.coq_sigma_data lazy_t
+val eqind : Term.constr lazy_t
+val eqind_ref : Libnames.global_reference lazy_t
+val refl_equal_ref : Libnames.global_reference lazy_t
+val boolind : Term.constr lazy_t
+val sumboolind : Term.constr lazy_t
+val natind : Term.constr lazy_t
+val intind : Term.constr lazy_t
+val existSind : Term.constr lazy_t
+val existS : Coqlib.coq_sigma_data lazy_t
+val well_founded : Term.constr lazy_t
+val fix : Term.constr lazy_t
+val extconstr : Term.constr -> Topconstr.constr_expr
+val extsort : Term.sorts -> Topconstr.constr_expr
+val my_print_constr : Environ.env -> Term.constr -> Pp.std_ppcmds
+val my_print_context : Environ.env -> Pp.std_ppcmds
+val my_print_env : Environ.env -> Pp.std_ppcmds
+val my_print_rawconstr : Environ.env -> Rawterm.rawconstr -> Pp.std_ppcmds
+val debug_level : int ref
+val debug : int -> Pp.std_ppcmds -> unit
+val debug_msg : int -> Pp.std_ppcmds -> Pp.std_ppcmds
+val trace : Pp.std_ppcmds -> unit
+val wf_relations : (Term.constr, Term.constr lazy_t) Hashtbl.t
+val std_relations : unit Lazy.t
+type binders = Topconstr.local_binder list
+val app_opt : ('a -> 'a) option -> 'a -> 'a
+val print_args : Environ.env -> Term.constr array -> Pp.std_ppcmds
+val make_existential :
+  Util.loc -> Environ.env -> Evd.evar_defs ref -> Term.types -> Term.constr
+val make_existential_expr : Util.loc -> 'a -> 'b -> Topconstr.constr_expr
+val string_of_hole_kind : Evd.hole_kind -> string
+val non_instanciated_map : Environ.env -> Evd.evar_defs ref -> Evd.evar_map
+val global_kind : Decl_kinds.logical_kind
+val goal_kind : Decl_kinds.locality_flag * Decl_kinds.goal_object_kind
+val global_fix_kind : Decl_kinds.logical_kind
+val goal_fix_kind : Decl_kinds.locality_flag * Decl_kinds.goal_object_kind
diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index bda43f8121..2057eb5b27 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -18,6 +18,7 @@ open Impargs
 open Rawterm
 open Pattern
 open Pretyping
+open Cases
 open Topconstr
 open Nametab
 open Notation
@@ -387,12 +388,12 @@ let check_constructor_length env loc cstr pl pl0 =
   let nargs = Inductiveops.constructor_nrealargs env cstr in
   let nhyps = Inductiveops.constructor_nrealhyps env cstr in
   if n <> nargs && n <> nhyps (* i.e. with let's *) then
-    Cases.error_wrong_numarg_constructor_loc loc env cstr nargs
+    error_wrong_numarg_constructor_loc loc env cstr nargs
 
 let check_inductive_length env (loc,ind,nal) =
   let n = Inductiveops.inductive_nargs env ind in
   if n <> List.length nal then
-    Cases.error_wrong_numarg_inductive_loc loc env ind n
+    error_wrong_numarg_inductive_loc loc env ind n
 
 (* Manage multiple aliases *)
 
@@ -1068,7 +1069,7 @@ let intern_ltac isarity ltacvars sigma env c =
 let interp_gen kind sigma env 
                ?(impls=([],[])) ?(allow_soapp=false) ?(ltacvars=([],[]))
                c =
-  understand_gen kind sigma env 
+  Default.understand_gen kind sigma env 
     (intern_gen (kind=IsType) ~impls ~allow_soapp ~ltacvars sigma env c)
 
 let interp_constr sigma env c =
@@ -1081,10 +1082,10 @@ let interp_casted_constr sigma env ?(impls=([],[])) c typ =
   interp_gen (OfType (Some typ)) sigma env ~impls c 
 
 let interp_open_constr sigma env c =
-  understand_tcc sigma env (intern_constr sigma env c)
+  Default.understand_tcc sigma env (intern_constr sigma env c)
 
 let interp_constr_judgment sigma env c =
-  understand_judgment sigma env (intern_constr sigma env c)
+  Default.understand_judgment sigma env (intern_constr sigma env c)
 
 type ltac_sign = identifier list * unbound_ltac_var_map
 
@@ -1109,7 +1110,7 @@ let interp_aconstr impls vars a =
 
 let interp_binder sigma env na t =
   let t = intern_gen true sigma env t in
-  understand_type sigma env (locate_if_isevar (loc_of_rawconstr t) na t)
+  Default.understand_type sigma env (locate_if_isevar (loc_of_rawconstr t) na t)
 
 open Environ
 open Term
diff --git a/pretyping/cases.ml b/pretyping/cases.ml
index f5dd223283..b2ef8060d6 100644
--- a/pretyping/cases.ml
+++ b/pretyping/cases.ml
@@ -63,6 +63,19 @@ let error_wrong_predicate_arity_loc loc env c n1 n2 =
 let error_needs_inversion env x t =
   raise (PatternMatchingError (env, NeedsInversion (x,t)))
 
+module type S = sig
+  val compile_cases :
+    loc ->
+    (type_constraint -> env -> rawconstr -> unsafe_judgment) *    
+      Evd.evar_defs ref ->
+    type_constraint -> 
+    env ->
+    rawconstr option *
+      (rawconstr * (name * (loc * inductive * name list) option)) list *
+      (loc * identifier list * cases_pattern list * rawconstr) list ->
+    unsafe_judgment
+end
+
 (************************************************************************)
 (*            Pattern-matching compilation (Cases)                      *)
 (************************************************************************)
@@ -371,6 +384,9 @@ let evd_comb2 f isevars x y =
   isevars := evd';
   y
 
+
+module Cases_F(Coercion : Coercion.S) : S = struct
+
 let adjust_tomatch_to_pattern pb ((current,typ),deps) =
   (* Ideally, we could find a common inductive type to which both the
      term to match and the patterns coerce *)
@@ -1654,46 +1670,47 @@ let prepare_predicate loc typing_fun isevars env tomatchs sign tycon = function
 
 (**************************************************************************)
 (* Main entry of the matching compilation                                 *)
-
-let compile_cases loc (typing_fun,isevars) tycon env (predopt, tomatchl, eqns)=
-
-  (* We build the matrix of patterns and right-hand-side *)
-  let matx = matx_of_eqns env tomatchl eqns in
-
-  (* We build the vector of terms to match consistently with the *)
-  (* constructors found in patterns *)
-  let tomatchs = coerce_to_indtype typing_fun isevars env matx tomatchl in
-
-  (* We build the elimination predicate if any and check its consistency *)
-  (* with the type of arguments to match *)
-  let tmsign = List.map snd tomatchl in
-  let pred = prepare_predicate loc typing_fun isevars env tomatchs tmsign tycon predopt in
-
-  (* We deal with initial aliases *)
-  let matx = prepare_initial_aliases (known_dependent pred) tomatchs matx in 
-
-  (* We push the initial terms to match and push their alias to rhs' envs *)
-  (* names of aliases will be recovered from patterns (hence Anonymous here) *)
-  let initial_pushed = List.map (fun tm -> Pushed (tm,[])) tomatchs in
- 
-  let pb =
-    { env      = env;
-      isevars  = isevars;
-      pred     = pred;
-      tomatch  = initial_pushed;
-      history  = start_history (List.length initial_pushed);
-      mat      = matx;
-      caseloc  = loc;
-      typing_function = typing_fun } in
-  
-  let _, j = compile pb in
-
-  (* We check for unused patterns *)
-  List.iter (check_unused_pattern env) matx;
   
-  match tycon with
-    | Some p ->
-	let (evd',j) = Coercion.inh_conv_coerce_to loc env !isevars j p in
-        isevars := evd';
-        j
-    | None -> j
+  let compile_cases loc (typing_fun, isevars) tycon env (predopt, tomatchl, eqns)=
+    
+    (* We build the matrix of patterns and right-hand-side *)
+    let matx = matx_of_eqns env tomatchl eqns in
+      
+    (* We build the vector of terms to match consistently with the *)
+    (* constructors found in patterns *)
+    let tomatchs = coerce_to_indtype typing_fun isevars env matx tomatchl in
+      
+    (* We build the elimination predicate if any and check its consistency *)
+    (* with the type of arguments to match *)
+    let tmsign = List.map snd tomatchl in
+    let pred = prepare_predicate loc typing_fun isevars env tomatchs tmsign tycon predopt in
+      
+    (* We deal with initial aliases *)
+    let matx = prepare_initial_aliases (known_dependent pred) tomatchs matx in 
+      
+    (* We push the initial terms to match and push their alias to rhs' envs *)
+    (* names of aliases will be recovered from patterns (hence Anonymous here) *)
+    let initial_pushed = List.map (fun tm -> Pushed (tm,[])) tomatchs in
+      
+    let pb =
+      { env      = env;
+	isevars  = isevars;
+	pred     = pred;
+	tomatch  = initial_pushed;
+	history  = start_history (List.length initial_pushed);
+	mat      = matx;
+	caseloc  = loc;
+	typing_function = typing_fun } in
+      
+    let _, j = compile pb in
+      
+      (* We check for unused patterns *)
+      List.iter (check_unused_pattern env) matx;
+      
+      match tycon with
+	| Some p ->
+	    let (evd',j) = Coercion.inh_conv_coerce_to loc env !isevars j p in
+              isevars := evd';
+              j
+	| None -> j
+end
diff --git a/pretyping/cases.mli b/pretyping/cases.mli
index f08b2c4a3c..e9fba44d22 100644
--- a/pretyping/cases.mli
+++ b/pretyping/cases.mli
@@ -38,13 +38,17 @@ val error_wrong_numarg_inductive_loc : loc -> env -> inductive -> int -> 'a
 
 (*s Compilation of pattern-matching. *)
 
-val compile_cases :
-  loc ->
-  (type_constraint -> env -> rawconstr -> unsafe_judgment) *
-  evar_defs ref ->
-  type_constraint -> 
-  env ->
-  rawconstr option *
-  (rawconstr * (name * (loc * inductive * name list) option)) list *
-  (loc * identifier list * cases_pattern list * rawconstr) list ->
-  unsafe_judgment
+module type S = sig
+  val compile_cases :
+    loc ->
+    (type_constraint -> env -> rawconstr -> unsafe_judgment) *    
+      evar_defs ref ->
+    type_constraint -> 
+    env ->
+    rawconstr option *
+      (rawconstr * (name * (loc * inductive * name list) option)) list *
+      (loc * identifier list * cases_pattern list * rawconstr) list ->
+    unsafe_judgment
+end
+
+module Cases_F(C : Coercion.S) : S
diff --git a/pretyping/clenv.ml b/pretyping/clenv.ml
index 6c4dbf5ed8..cb8c2cf2b5 100644
--- a/pretyping/clenv.ml
+++ b/pretyping/clenv.ml
@@ -31,7 +31,7 @@ open Mod_subst
 (* *)
 let w_coerce env c ctyp target evd =
   let j = make_judge c ctyp in
-  let (evd',j') = Coercion.inh_conv_coerce_to dummy_loc env evd j target in
+  let (evd',j') = Coercion.Default.inh_conv_coerce_to dummy_loc env evd j target in
   (evd',j'.uj_val)
 
 let pf_env gls = Global.env_of_context gls.it.evar_hyps
diff --git a/pretyping/coercion.ml b/pretyping/coercion.ml
index d2c3e255c5..3b2d85b1ff 100644
--- a/pretyping/coercion.ml
+++ b/pretyping/coercion.ml
@@ -21,159 +21,188 @@ open Evarconv
 open Retyping
 open Evd
 
-(* Typing operations dealing with coercions *)
-
-let class_of1 env sigma t = class_of env sigma (nf_evar sigma t)
-
-(* Here, funj is a coercion therefore already typed in global context *)
-let apply_coercion_args env argl funj =
-  let rec apply_rec acc typ = function
-    | [] -> { uj_val = applist (j_val funj,argl);
-              uj_type = typ }
-    | h::restl ->
-    (* On devrait pouvoir s'arranger pour qu'on n'ait pas à faire hnf_constr *)
-  	match kind_of_term (whd_betadeltaiota env Evd.empty typ) with
-	  | Prod (_,c1,c2) -> 
-              (* Typage garanti par l'appel à app_coercion*)
-	      apply_rec (h::acc) (subst1 h c2) restl
-	  | _ -> anomaly "apply_coercion_args"
-  in 
-  apply_rec [] funj.uj_type argl
-
-exception NoCoercion
-
-(* appliquer le chemin de coercions de patterns p *)
-
-let apply_pattern_coercion loc pat p =
-  List.fold_left
-    (fun pat (co,n) ->
-       let f i = if i<n then Rawterm.PatVar (loc, Anonymous) else pat in
-       Rawterm.PatCstr (loc, co, list_tabulate f (n+1), Anonymous))
-    pat p
-
-(* raise Not_found if no coercion found *)
-let inh_pattern_coerce_to loc pat ind1 ind2 =
-  let i1 = inductive_class_of ind1 in
-  let i2 = inductive_class_of ind2 in
-  let p = lookup_pattern_path_between (i1,i2) in
-  apply_pattern_coercion loc pat p
-
-(* appliquer le chemin de coercions p à hj *)
-
-let apply_coercion env p hj typ_cl =
-  try 
-    fst (List.fold_left
-           (fun (ja,typ_cl) i -> 
-              let fv,isid = coercion_value i in
-              let argl = (class_args_of typ_cl)@[ja.uj_val] in
-              let jres = apply_coercion_args env argl fv in
-              (if isid then 
-		 { uj_val = ja.uj_val; uj_type = jres.uj_type }
-               else 
-		 jres),
-	      jres.uj_type)
-           (hj,typ_cl) p)
-  with _ -> anomaly "apply_coercion"
-
-let inh_app_fun env isevars j = 
-  let t = whd_betadeltaiota env (evars_of isevars) j.uj_type in
-  match kind_of_term t with
-    | Prod (_,_,_) -> (isevars,j)
-    | Evar ev when not (is_defined_evar isevars ev) ->
-	let (isevars',t) = define_evar_as_arrow isevars ev in
-	(isevars',{ uj_val = j.uj_val; uj_type = t })
-    | _ ->
-       	(try
- 	   let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
-      	   let p = lookup_path_to_fun_from i1 in
-           (isevars,apply_coercion env p j t)
-	 with Not_found -> (isevars,j))
-
-let inh_tosort_force loc env isevars j =
-  try
-    let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
-    let p = lookup_path_to_sort_from i1 in
-    let j1 = apply_coercion env p j t in 
-    (isevars,type_judgment env (j_nf_evar (evars_of isevars) j1))
-  with Not_found ->
-    error_not_a_type_loc loc env (evars_of isevars) j
-
-let inh_coerce_to_sort loc env isevars j =
-  let typ = whd_betadeltaiota env (evars_of isevars) j.uj_type in
-  match kind_of_term typ with
-    | Sort s -> (isevars,{ utj_val = j.uj_val; utj_type = s })
-    | Evar ev when not (is_defined_evar isevars ev) ->
-	let (isevars',s) = define_evar_as_sort isevars ev in
-	(isevars',{ utj_val = j.uj_val; utj_type = s })
-    | _ ->
-	inh_tosort_force loc env isevars j
-
-let inh_coerce_to_fail env isevars c1 hj =
-  let hj' =
+module type S = sig
+  (*s Coercions. *)
+  
+  (* [inh_app_fun env isevars j] coerces [j] to a function; i.e. it
+     inserts a coercion into [j], if needed, in such a way it gets as
+     type a product; it returns [j] if no coercion is applicable *)
+  val inh_app_fun :
+    env -> evar_defs -> unsafe_judgment -> evar_defs * unsafe_judgment
+    
+  (* [inh_coerce_to_sort env isevars j] coerces [j] to a type; i.e. it
+     inserts a coercion into [j], if needed, in such a way it gets as
+     type a sort; it fails if no coercion is applicable *)
+  val inh_coerce_to_sort : loc ->
+    env -> evar_defs -> unsafe_judgment -> evar_defs * unsafe_type_judgment
+    
+  (* [inh_conv_coerce_to loc env isevars j t] coerces [j] to an object of type 
+     [t]; i.e. it inserts a coercion into [j], if needed, in such a way [t] and
+     [j.uj_type] are convertible; it fails if no coercion is applicable *)
+  val inh_conv_coerce_to : loc -> 
+    env -> evar_defs -> unsafe_judgment -> types -> evar_defs * unsafe_judgment
+    
+  (* [inh_pattern_coerce_to loc env isevars pat ind1 ind2] coerces the Cases
+     pattern [pat] typed in [ind1] into a pattern typed in [ind2];
+     raises [Not_found] if no coercion found *)
+  val inh_pattern_coerce_to :
+    loc  -> Rawterm.cases_pattern -> inductive -> inductive -> Rawterm.cases_pattern
+end
+
+module Default = struct
+  (* Typing operations dealing with coercions *)
+  exception NoCoercion
+
+  let class_of1 env sigma t = class_of env sigma (nf_evar sigma t)
+
+  (* Here, funj is a coercion therefore already typed in global context *)
+  let apply_coercion_args env argl funj =
+    let rec apply_rec acc typ = function
+      | [] -> { uj_val = applist (j_val funj,argl);
+		uj_type = typ }
+      | h::restl ->
+	  (* On devrait pouvoir s'arranger pour qu'on n'ait pas à faire hnf_constr *)
+  	  match kind_of_term (whd_betadeltaiota env Evd.empty typ) with
+	    | Prod (_,c1,c2) -> 
+		(* Typage garanti par l'appel à app_coercion*)
+		apply_rec (h::acc) (subst1 h c2) restl
+	    | _ -> anomaly "apply_coercion_args"
+    in 
+      apply_rec [] funj.uj_type argl
+
+  (* appliquer le chemin de coercions de patterns p *)
+
+  let apply_pattern_coercion loc pat p =
+    List.fold_left
+      (fun pat (co,n) ->
+	 let f i = if i<n then Rawterm.PatVar (loc, Anonymous) else pat in
+	   Rawterm.PatCstr (loc, co, list_tabulate f (n+1), Anonymous))
+      pat p
+
+  (* raise Not_found if no coercion found *)
+  let inh_pattern_coerce_to loc pat ind1 ind2 =
+    let i1 = inductive_class_of ind1 in
+    let i2 = inductive_class_of ind2 in
+    let p = lookup_pattern_path_between (i1,i2) in
+      apply_pattern_coercion loc pat p
+
+  (* appliquer le chemin de coercions p à hj *)
+
+  let apply_coercion env p hj typ_cl =
     try 
-      let t1,i1 = class_of1 env (evars_of isevars) c1 in
-      let t2,i2 = class_of1 env (evars_of isevars) hj.uj_type in
-      let p = lookup_path_between (i2,i1) in
-      apply_coercion env p hj t2
-    with Not_found -> raise NoCoercion 
-  in
-  try (the_conv_x_leq env hj'.uj_type c1 isevars, hj')
-  with Reduction.NotConvertible -> raise NoCoercion
-
-let rec inh_conv_coerce_to_fail env isevars hj c1 =
-  let {uj_val = v; uj_type = t} = hj in
-  try (the_conv_x_leq env t c1 isevars, hj)
-  with Reduction.NotConvertible ->
-    (try 
-      inh_coerce_to_fail env isevars c1 hj
-    with NoCoercion ->
-      (match kind_of_term (whd_betadeltaiota env (evars_of isevars) t),
-	     kind_of_term (whd_betadeltaiota env (evars_of isevars) c1) with
-	 | Prod (_,t1,t2), Prod (name,u1,u2) -> 
-             let v' = whd_betadeltaiota env (evars_of isevars) v in
-             let (evd',b) =
-               match kind_of_term v' with
-                 | Lambda (_,v1,v2) ->
-                     (try the_conv_x env v1 u1 isevars, true  (* leq v1 u1? *)
-                     with Reduction.NotConvertible -> (isevars, false))
-                 | _  -> (isevars,false) in
-             if b
-             then 
-	       let (x,v1,v2) = destLambda v' in
-               let env1 = push_rel (x,None,v1) env in
-               let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
+      fst (List.fold_left
+             (fun (ja,typ_cl) i -> 
+		let fv,isid = coercion_value i in
+		let argl = (class_args_of typ_cl)@[ja.uj_val] in
+		let jres = apply_coercion_args env argl fv in
+		  (if isid then 
+		     { uj_val = ja.uj_val; uj_type = jres.uj_type }
+		   else 
+		     jres),
+		jres.uj_type)
+             (hj,typ_cl) p)
+    with _ -> anomaly "apply_coercion"
+
+  let inh_app_fun env isevars j = 
+    let t = whd_betadeltaiota env (evars_of isevars) j.uj_type in
+      match kind_of_term t with
+	| Prod (_,_,_) -> (isevars,j)
+	| Evar ev when not (is_defined_evar isevars ev) ->
+	    let (isevars',t) = define_evar_as_arrow isevars ev in
+	      (isevars',{ uj_val = j.uj_val; uj_type = t })
+	| _ ->
+       	    (try
+ 	       let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
+      	       let p = lookup_path_to_fun_from i1 in
+		 (isevars,apply_coercion env p j t)
+	     with Not_found -> (isevars,j))
+
+  let inh_tosort_force loc env isevars j =
+    try
+      let t,i1 = class_of1 env (evars_of isevars) j.uj_type in
+      let p = lookup_path_to_sort_from i1 in
+      let j1 = apply_coercion env p j t in 
+	(isevars,type_judgment env (j_nf_evar (evars_of isevars) j1))
+    with Not_found ->
+      error_not_a_type_loc loc env (evars_of isevars) j
+
+  let inh_coerce_to_sort loc env isevars j =
+    let typ = whd_betadeltaiota env (evars_of isevars) j.uj_type in
+      match kind_of_term typ with
+	| Sort s -> (isevars,{ utj_val = j.uj_val; utj_type = s })
+	| Evar ev when not (is_defined_evar isevars ev) ->
+	    let (isevars',s) = define_evar_as_sort isevars ev in
+	      (isevars',{ utj_val = j.uj_val; utj_type = s })
+	| _ ->
+	    inh_tosort_force loc env isevars j
+
+  let inh_coerce_to_fail env isevars c1 hj =
+    let hj' =
+      try 
+	let t1,i1 = class_of1 env (evars_of isevars) c1 in
+	let t2,i2 = class_of1 env (evars_of isevars) hj.uj_type in
+	let p = lookup_path_between (i2,i1) in
+	  apply_coercion env p hj t2
+      with Not_found -> raise NoCoercion 
+    in
+      try (the_conv_x_leq env hj'.uj_type c1 isevars, hj')
+      with Reduction.NotConvertible -> raise NoCoercion
+
+  let rec inh_conv_coerce_to_fail env isevars hj c1 =
+    let {uj_val = v; uj_type = t} = hj in
+      try (the_conv_x_leq env t c1 isevars, hj)
+      with Reduction.NotConvertible ->
+	(try 
+	   inh_coerce_to_fail env isevars c1 hj
+	 with NoCoercion ->
+	   (match kind_of_term (whd_betadeltaiota env (evars_of isevars) t),
+	      kind_of_term (whd_betadeltaiota env (evars_of isevars) c1) with
+		| Prod (_,t1,t2), Prod (name,u1,u2) -> 
+		    let v' = whd_betadeltaiota env (evars_of isevars) v in
+		    let (evd',b) =
+		      match kind_of_term v' with
+			| Lambda (_,v1,v2) ->
+			    (try the_conv_x env v1 u1 isevars, true  (* leq v1 u1? *)
+			     with Reduction.NotConvertible -> (isevars, false))
+			| _  -> (isevars,false) in
+		      if b
+		      then 
+			let (x,v1,v2) = destLambda v' in
+			let env1 = push_rel (x,None,v1) env in
+			let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
 			  {uj_val = v2; uj_type = t2 } u2 in
-               (evd'',{ uj_val = mkLambda (x, v1, h2.uj_val);
-                 uj_type = mkProd (x, v1, h2.uj_type) })
-             else 
-               (* Mismatch on t1 and u1 or not a lambda: we eta-expand *)
-               (* we look for a coercion c:u1->t1 s.t. [name:u1](v' (c x)) *)
-               (* has type (name:u1)u2 (with v' recursively obtained) *)
-               let name = (match name with 
-			     | Anonymous -> Name (id_of_string "x")
-                             | _ -> name) in
-               let env1 = push_rel (name,None,u1) env in
-               let (evd',h1) =
-		 inh_conv_coerce_to_fail env1 isevars
-		   {uj_val = mkRel 1; uj_type = (lift 1 u1) }
-                   (lift 1 t1) in
-               let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
-			 { uj_val = mkApp (lift 1 v, [|h1.uj_val|]);
-                           uj_type = subst1 h1.uj_val t2 }
+			  (evd'',{ uj_val = mkLambda (x, v1, h2.uj_val);
+				   uj_type = mkProd (x, v1, h2.uj_type) })
+		      else 
+			(* Mismatch on t1 and u1 or not a lambda: we eta-expand *)
+			(* we look for a coercion c:u1->t1 s.t. [name:u1](v' (c x)) *)
+			(* has type (name:u1)u2 (with v' recursively obtained) *)
+			let name = (match name with 
+				      | Anonymous -> Name (id_of_string "x")
+				      | _ -> name) in
+			let env1 = push_rel (name,None,u1) env in
+			let (evd',h1) =
+			  inh_conv_coerce_to_fail env1 isevars
+			    {uj_val = mkRel 1; uj_type = (lift 1 u1) }
+			    (lift 1 t1) in
+			let (evd'',h2) = inh_conv_coerce_to_fail env1 evd'
+			  { uj_val = mkApp (lift 1 v, [|h1.uj_val|]);
+                            uj_type = subst1 h1.uj_val t2 }
                           u2
-	       in
-               (evd'',
-                { uj_val = mkLambda (name, u1, h2.uj_val);
-                  uj_type = mkProd (name, u1, h2.uj_type) })
-	 | _ -> raise NoCoercion))
-
-(* Look for cj' obtained from cj by inserting coercions, s.t. cj'.typ = t *)
-let inh_conv_coerce_to loc env isevars cj t =
-  let (evd',cj') = 
-    try 
-      inh_conv_coerce_to_fail env isevars cj t
-    with NoCoercion ->
-      let sigma = evars_of isevars in
-      error_actual_type_loc loc env sigma cj t
-  in
-  (evd',{ uj_val = cj'.uj_val; uj_type = t })
+			in
+			  (evd'',
+			   { uj_val = mkLambda (name, u1, h2.uj_val);
+			     uj_type = mkProd (name, u1, h2.uj_type) })
+		| _ -> raise NoCoercion))
+
+  (* Look for cj' obtained from cj by inserting coercions, s.t. cj'.typ = t *)
+  let inh_conv_coerce_to loc env isevars cj t =
+    let (evd',cj') = 
+      try 
+	inh_conv_coerce_to_fail env isevars cj t
+      with NoCoercion ->
+	let sigma = evars_of isevars in
+	  error_actual_type_loc loc env sigma cj t
+    in
+      (evd',{ uj_val = cj'.uj_val; uj_type = t })
+end
diff --git a/pretyping/coercion.mli b/pretyping/coercion.mli
index f5356d432c..cc2211f5f8 100644
--- a/pretyping/coercion.mli
+++ b/pretyping/coercion.mli
@@ -19,28 +19,32 @@ open Evarutil
 open Rawterm
 (*i*)
 
-(*s Coercions. *)
+module type S = sig
+  (*s Coercions. *)
+  
+  (* [inh_app_fun env isevars j] coerces [j] to a function; i.e. it
+     inserts a coercion into [j], if needed, in such a way it gets as
+     type a product; it returns [j] if no coercion is applicable *)
+  val inh_app_fun :
+    env -> evar_defs -> unsafe_judgment -> evar_defs * unsafe_judgment
+    
+  (* [inh_coerce_to_sort env isevars j] coerces [j] to a type; i.e. it
+     inserts a coercion into [j], if needed, in such a way it gets as
+     type a sort; it fails if no coercion is applicable *)
+  val inh_coerce_to_sort : loc ->
+    env -> evar_defs -> unsafe_judgment -> evar_defs * unsafe_type_judgment
+    
+  (* [inh_conv_coerce_to loc env isevars j t] coerces [j] to an object of type 
+     [t]; i.e. it inserts a coercion into [j], if needed, in such a way [t] and
+     [j.uj_type] are convertible; it fails if no coercion is applicable *)
+  val inh_conv_coerce_to : loc -> 
+    env -> evar_defs -> unsafe_judgment -> types -> evar_defs * unsafe_judgment
+    
+  (* [inh_pattern_coerce_to loc env isevars pat ind1 ind2] coerces the Cases
+     pattern [pat] typed in [ind1] into a pattern typed in [ind2];
+     raises [Not_found] if no coercion found *)
+  val inh_pattern_coerce_to :
+    loc  -> cases_pattern -> inductive -> inductive -> cases_pattern
+end
 
-(* [inh_app_fun env isevars j] coerces [j] to a function; i.e. it
-   inserts a coercion into [j], if needed, in such a way it gets as
-   type a product; it returns [j] if no coercion is applicable *)
-val inh_app_fun :
-  env -> evar_defs -> unsafe_judgment -> evar_defs * unsafe_judgment
-
-(* [inh_coerce_to_sort env isevars j] coerces [j] to a type; i.e. it
-   inserts a coercion into [j], if needed, in such a way it gets as
-   type a sort; it fails if no coercion is applicable *)
-val inh_coerce_to_sort : loc ->
-  env -> evar_defs -> unsafe_judgment -> evar_defs * unsafe_type_judgment
-
-(* [inh_conv_coerce_to loc env isevars j t] coerces [j] to an object of type 
-   [t]; i.e. it inserts a coercion into [j], if needed, in such a way [t] and
-   [j.uj_type] are convertible; it fails if no coercion is applicable *)
-val inh_conv_coerce_to : loc -> 
-  env -> evar_defs -> unsafe_judgment -> types -> evar_defs * unsafe_judgment
-
-(* [inh_pattern_coerce_to loc env isevars pat ind1 ind2] coerces the Cases
-   pattern [pat] typed in [ind1] into a pattern typed in [ind2];
-   raises [Not_found] if no coercion found *)
-val inh_pattern_coerce_to :
-  loc  -> cases_pattern -> inductive -> inductive -> cases_pattern
+module Default : S
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml
index df76f992d0..14326bf449 100644
--- a/pretyping/pretyping.ml
+++ b/pretyping/pretyping.ml
@@ -28,27 +28,12 @@ open Evarutil
 open Pretype_errors
 open Rawterm
 open Evarconv
-open Coercion
 open Pattern
 open Dyn
 
-
-let evd_comb0 f isevars =
-  let (evd',x) = f !isevars in
-  isevars := evd';
-  x
-let evd_comb1 f isevars x =
-  let (evd',y) = f !isevars x in
-  isevars := evd';
-  y
-let evd_comb2 f isevars x y =
-  let (evd',z) = f !isevars x y in
-  isevars := evd';
-  z
-let evd_comb3 f isevars x y z =
-  let (evd',t) = f !isevars x y z in
-  isevars := evd';
-  t
+type typing_constraint = OfType of types option | IsType
+type var_map = (identifier * unsafe_judgment) list
+type unbound_ltac_var_map = (identifier * identifier option) list
 
 (************************************************************************)
 (* This concerns Cases *)
@@ -62,513 +47,613 @@ open Inductiveops
 let ((constr_in : constr -> Dyn.t),
      (constr_out : Dyn.t -> constr)) = create "constr"
 
-let mt_evd = Evd.empty
-
-let vect_lift_type = Array.mapi (fun i t -> type_app (lift i) t)
-
-(* Utilisé pour inférer le prédicat des Cases *)
-(* Semble exagérement fort *)
-(* Faudra préférer une unification entre les types de toutes les clauses *)
-(* et autoriser des ? à rester dans le résultat de l'unification *)
-
-let evar_type_fixpoint loc env isevars lna lar vdefj =
-  let lt = Array.length vdefj in 
-    if Array.length lar = lt then 
-      for i = 0 to lt-1 do 
-        if not (e_cumul env isevars (vdefj.(i)).uj_type
-		  (lift lt lar.(i))) then
-          error_ill_typed_rec_body_loc loc env (evars_of !isevars)
-            i lna vdefj lar
-      done
-
-let check_branches_message loc env isevars c (explft,lft) = 
-  for i = 0 to Array.length explft - 1 do
-    if not (e_cumul env isevars lft.(i) explft.(i)) then 
-      let sigma = evars_of !isevars in
-      error_ill_formed_branch_loc loc env sigma c i lft.(i) explft.(i)
-  done
-
-(* coerce to tycon if any *)
-let inh_conv_coerce_to_tycon loc env isevars j = function
-   | None -> j
-   | Some typ -> evd_comb2 (inh_conv_coerce_to loc env) isevars j typ
-
-let push_rels vars env = List.fold_right push_rel vars env
-
-(*
-let evar_type_case isevars env ct pt lft p c =
-  let (mind,bty,rslty) = type_case_branches env (evars_of isevars) ct pt p c
-  in check_branches_message isevars env (c,ct) (bty,lft); (mind,rslty)
-*)
-
-let strip_meta id = (* For Grammar v7 compatibility *)
-  let s = string_of_id id in
-  if s.[0]='$' then id_of_string (String.sub s 1 (String.length s - 1))
-  else id
-
-let pretype_id loc env (lvar,unbndltacvars) id =
-  let id = strip_meta id in (* May happen in tactics defined by Grammar *)
-  try
-    let (n,typ) = lookup_rel_id id (rel_context env) in
-    { uj_val  = mkRel n; uj_type = type_app (lift n) typ }
-  with Not_found ->
-  try
-    List.assoc id lvar
-  with Not_found ->
-  try
-    let (_,_,typ) = lookup_named id env in
-    { uj_val  = mkVar id; uj_type = typ }
-  with Not_found ->
-  try (* To build a nicer ltac error message *)
-    match List.assoc id unbndltacvars with
-      | None -> user_err_loc (loc,"",
-	str "variable " ++ pr_id id ++ str " should be bound to a term")
-      | Some id0 -> Pretype_errors.error_var_not_found_loc loc id0
-  with Not_found ->
-    error_var_not_found_loc loc id
-
-(* make a dependent predicate from an undependent one *)
-
-let make_dep_of_undep env (IndType (indf,realargs)) pj =
-  let n = List.length realargs in
-  let rec decomp n p =
-    if n=0 then p else
-      match kind_of_term p with
-	| Lambda (_,_,c) -> decomp (n-1) c
-	| _ -> decomp (n-1) (applist (lift 1 p, [mkRel 1])) 
-  in
-  let sign,s = decompose_prod_n n pj.uj_type in
-  let ind = build_dependent_inductive env indf in
-  let s' = mkProd (Anonymous, ind, s) in
-  let ccl = lift 1 (decomp n pj.uj_val) in
-  let ccl' = mkLambda (Anonymous, ind, ccl) in
-  {uj_val=lam_it ccl' sign; uj_type=prod_it s' sign} 
-
-(*************************************************************************)
-(* Main pretyping function                                               *)
-
-let pretype_ref isevars env ref = 
-  let c = constr_of_global ref in
-  make_judge c (Retyping.get_type_of env Evd.empty c)
-
-let pretype_sort = function
-  | RProp c -> judge_of_prop_contents c
-  | RType _ -> judge_of_new_Type ()
-
-(* [pretype tycon env isevars lvar lmeta cstr] attempts to type [cstr] *)
-(* in environment [env], with existential variables [(evars_of isevars)] and *)
-(* the type constraint tycon *)
-let rec pretype tycon env isevars lvar = function
-
-  | RRef (loc,ref) ->
-      inh_conv_coerce_to_tycon loc env isevars
-	(pretype_ref isevars env ref)
-	tycon
-
-  | RVar (loc, id) ->
-      inh_conv_coerce_to_tycon loc env isevars
-	(pretype_id loc env lvar id)
-	tycon
-
-  | REvar (loc, ev, instopt) ->
-      (* Ne faudrait-il pas s'assurer que hyps est bien un
-      sous-contexte du contexte courant, et qu'il n'y a pas de Rel "caché" *)
-      let hyps = evar_context (Evd.map (evars_of !isevars) ev) in
-      let args = match instopt with
-        | None -> instance_from_named_context hyps
-        | Some inst -> failwith "Evar subtitutions not implemented" in
-      let c = mkEvar (ev, args) in
-      let j = (Retyping.get_judgment_of env (evars_of !isevars) c) in
-      inh_conv_coerce_to_tycon loc env isevars j tycon
-
-  | RPatVar (loc,(someta,n)) -> 
-      anomaly "Found a pattern variable in a rawterm to type"
-	   
-  | RHole (loc,k) ->
-      let ty =
-        match tycon with 
-          | Some ty -> ty
-          | None ->
-              e_new_evar isevars env ~src:(loc,InternalHole) (new_Type ()) in
-      { uj_val = e_new_evar isevars env ~src:(loc,k) ty; uj_type = ty }
-
-  | RRec (loc,fixkind,names,bl,lar,vdef) ->
-      let rec type_bl env ctxt = function
-          [] -> ctxt
-        | (na,None,ty)::bl ->
-            let ty' = pretype_type empty_valcon env isevars lvar ty in
-            let dcl = (na,None,ty'.utj_val) in
-            type_bl (push_rel dcl env) (add_rel_decl dcl ctxt) bl
-        | (na,Some bd,ty)::bl ->
-            let ty' = pretype_type empty_valcon env isevars lvar ty in
-            let bd' = pretype (mk_tycon ty'.utj_val) env isevars lvar ty in
-            let dcl = (na,Some bd'.uj_val,ty'.utj_val) in
-            type_bl (push_rel dcl env) (add_rel_decl dcl ctxt) bl in
-      let ctxtv = Array.map (type_bl env empty_rel_context) bl in
-      let larj =
-        array_map2
-          (fun e ar ->
-            pretype_type empty_valcon (push_rel_context e env) isevars lvar ar)
-          ctxtv lar in
-      let lara = Array.map (fun a -> a.utj_val) larj in
-      let ftys = array_map2 (fun e a -> it_mkProd_or_LetIn a e) ctxtv lara in
-      let nbfix = Array.length lar in
-      let names = Array.map (fun id -> Name id) names in
-      (* Note: bodies are not used by push_rec_types, so [||] is safe *)
-      let newenv = push_rec_types (names,ftys,[||]) env in
-      let vdefj =
-	array_map2_i 
-	  (fun i ctxt def ->
-            (* we lift nbfix times the type in tycon, because of
-	     * the nbfix variables pushed to newenv *)
-            let (ctxt,ty) =
-              decompose_prod_n_assum (rel_context_length ctxt)
-                (lift nbfix ftys.(i)) in
-            let nenv = push_rel_context ctxt newenv in
-            let j = pretype (mk_tycon ty) nenv isevars lvar def in
-            { uj_val = it_mkLambda_or_LetIn j.uj_val ctxt;
-              uj_type = it_mkProd_or_LetIn j.uj_type ctxt })
-          ctxtv vdef in
-      evar_type_fixpoint loc env isevars names ftys vdefj;
-      let fixj =
-	match fixkind with
-	  | RFix (vn,i) ->
-	      let fix = ((Array.map fst vn, i),(names,ftys,Array.map j_val vdefj)) in
-	      (try check_fix env fix with e -> Stdpp.raise_with_loc loc e);
-	      make_judge (mkFix fix) ftys.(i)
-	  | RCoFix i -> 
-	      let cofix = (i,(names,ftys,Array.map j_val vdefj)) in
-	      (try check_cofix env cofix with e -> Stdpp.raise_with_loc loc e);
-	      make_judge (mkCoFix cofix) ftys.(i) in
-      inh_conv_coerce_to_tycon loc env isevars fixj tycon
-
-  | RSort (loc,s) ->
-      inh_conv_coerce_to_tycon loc env isevars (pretype_sort s) tycon
-
-  | RApp (loc,f,args) -> 
-      let fj = pretype empty_tycon env isevars lvar f in
-      let floc = loc_of_rawconstr f in
-      let rec apply_rec env n resj = function
-	| [] -> resj
-	| c::rest ->
-	    let argloc = loc_of_rawconstr c in
-	    let resj = evd_comb1 (inh_app_fun env) isevars resj in
-            let resty =
-              whd_betadeltaiota env (evars_of !isevars) resj.uj_type in
-      	    match kind_of_term resty with
-	      | Prod (na,c1,c2) ->
-		  let hj = pretype (mk_tycon c1) env isevars lvar c in
-		  let newresj =
-      		    { uj_val = applist (j_val resj, [j_val hj]);
-		      uj_type = subst1 hj.uj_val c2 } in
-		  apply_rec env (n+1) newresj rest
-
-	      | _ ->
-		  let hj = pretype empty_tycon env isevars lvar c in
-		  error_cant_apply_not_functional_loc 
-		    (join_loc floc argloc) env (evars_of !isevars)
-	      	    resj [hj]
-
-      in let resj = apply_rec env 1 fj args in
-      (*
-	let apply_one_arg (floc,tycon,jl) c =
-	let (dom,rng) = split_tycon floc env isevars tycon in
-	let cj = pretype dom env isevars lvar c in
-	let rng_tycon =
-	  option_app (subst1 cj.uj_val) rng in
-	let argloc = loc_of_rawconstr c in
-	(join_loc floc argloc,rng_tycon,(argloc,cj)::jl)  in
-	let _,_,jl =
-	List.fold_left apply_one_arg (floc,mk_tycon j.uj_type,[]) args in
-	let jl = List.rev jl in
-	let resj = inh_apply_rel_list loc env isevars jl (floc,j) tycon in
-      *)
-      inh_conv_coerce_to_tycon loc env isevars resj tycon
-
-  | RLambda(loc,name,c1,c2)      ->
-      let (name',dom,rng) = evd_comb1 (split_tycon loc env) isevars tycon in
-      let dom_valcon = valcon_of_tycon dom in
-      let j = pretype_type dom_valcon env isevars lvar c1 in
-      let var = (name,None,j.utj_val) in
-      let j' = pretype rng (push_rel var env) isevars lvar c2 in 
-      judge_of_abstraction env name j j'
-
-  | RProd(loc,name,c1,c2)        ->
-      let j = pretype_type empty_valcon env isevars lvar c1 in
-      let var = (name,j.utj_val) in
-      let env' = push_rel_assum var env in
-      let j' = pretype_type empty_valcon env' isevars lvar c2 in
-      let resj =
-	try judge_of_product env name j j'
-	with TypeError _ as e -> Stdpp.raise_with_loc loc e in
-      inh_conv_coerce_to_tycon loc env isevars resj tycon
+(** Miscellaneous interpretation functions *)
+  
+let interp_sort = function
+  | RProp c -> Prop c
+  | RType _ -> new_Type_sort ()
+      
+let interp_elimination_sort = function
+  | RProp Null -> InProp
+  | RProp Pos  -> InSet
+  | RType _ -> InType
+
+module type S = 
+sig
+
+  module Cases : Cases.S
+  
+  (* Generic call to the interpreter from rawconstr to open_constr, leaving
+     unresolved holes as evars and returning the typing contexts of
+     these evars. Work as [understand_gen] for the rest. *)
+  
+  val understand_tcc :
+    evar_map -> env -> ?expected_type:types -> rawconstr -> open_constr
+    
+  (* More general entry point with evars from ltac *)
+    
+  (* Generic call to the interpreter from rawconstr to constr, failing
+     unresolved holes in the rawterm cannot be instantiated.
+     
+     In [understand_ltac sigma env ltac_env constraint c],
+     
+     sigma : initial set of existential variables (typically dependent subgoals)
+     ltac_env : partial substitution of variables (used for the tactic language)
+     constraint : tell if interpreted as a possibly constrained term or a type 
+  *)
+    
+  val understand_ltac :
+    evar_map -> env -> var_map * unbound_ltac_var_map ->
+    typing_constraint -> rawconstr -> evar_defs * constr
+    
+  (* Standard call to get a constr from a rawconstr, resolving implicit args *)
+    
+  val understand : evar_map -> env -> ?expected_type:Term.types ->
+    rawconstr -> constr
+    
+  (* Idem but the rawconstr is intended to be a type *)
+    
+  val understand_type : evar_map -> env -> rawconstr -> constr
+    
+  (* A generalization of the two previous case *)
+    
+  val understand_gen : typing_constraint -> evar_map -> env -> 
+    rawconstr -> constr
+    
+  (* Idem but returns the judgment of the understood term *)
+    
+  val understand_judgment : evar_map -> env -> rawconstr -> unsafe_judgment
+
+  (* Idem but do not fail on unresolved evars *)
+
+  val understand_judgment_tcc : evar_map -> env -> rawconstr -> evar_map * unsafe_judgment
+
+  (*i*)
+  (* Internal of Pretyping...
+   * Unused outside, but useful for debugging
+   *)
+  val pretype : 
+    type_constraint -> env -> evar_defs ref -> 
+    var_map * (identifier * identifier option) list ->
+    rawconstr -> unsafe_judgment
+    
+  val pretype_type : 
+    val_constraint -> env -> evar_defs ref ->
+    var_map * (identifier * identifier option) list ->
+    rawconstr -> unsafe_type_judgment
+
+  val pretype_gen :
+    evar_defs ref -> env -> 
+    var_map * (identifier * identifier option) list ->
+    typing_constraint -> rawconstr -> constr
+
+    (*i*)
+end
+
+module Pretyping_F (Coercion : Coercion.S) = struct
+
+  module Cases = Cases.Cases_F(Coercion)
+
+  let evd_comb0 f isevars =
+    let (evd',x) = f !isevars in
+      isevars := evd';
+      x
+
+  let evd_comb1 f isevars x =
+    let (evd',y) = f !isevars x in
+      isevars := evd';
+      y
+
+  let evd_comb2 f isevars x y =
+    let (evd',z) = f !isevars x y in
+      isevars := evd';
+      z
+
+  let evd_comb3 f isevars x y z =
+    let (evd',t) = f !isevars x y z in
+      isevars := evd';
+      t
 	
-  | RLetIn(loc,name,c1,c2)      ->
-      let j = pretype empty_tycon env isevars lvar c1 in
-      let t = refresh_universes j.uj_type in
-      let var = (name,Some j.uj_val,t) in
-        let tycon = option_app (lift 1) tycon in
-      let j' = pretype tycon (push_rel var env) isevars lvar c2 in
-      { uj_val = mkLetIn (name, j.uj_val, t, j'.uj_val) ;
-	uj_type = subst1 j.uj_val j'.uj_type }
-
-  | RLetTuple (loc,nal,(na,po),c,d) ->
-      let cj = pretype empty_tycon env isevars lvar c in
-      let (IndType (indf,realargs)) = 
-	try find_rectype env (evars_of !isevars) cj.uj_type
-	with Not_found ->
-	  let cloc = loc_of_rawconstr c in
-	  error_case_not_inductive_loc cloc env (evars_of !isevars) cj 
-      in
-      let cstrs = get_constructors env indf in
-      if Array.length cstrs <> 1 then
-        user_err_loc (loc,"",str "Destructing let is only for inductive types with one constructor");
-      let cs = cstrs.(0) in
-      if List.length nal <> cs.cs_nargs then
-        user_err_loc (loc,"", str "Destructing let on this type expects " ++ int cs.cs_nargs ++ str " variables");
-      let fsign = List.map2 (fun na (_,c,t) -> (na,c,t))
-        (List.rev nal) cs.cs_args in
-      let env_f = push_rels fsign env in
-      (* Make dependencies from arity signature impossible *)
-      let arsgn,_ = get_arity env indf in
-      let arsgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) arsgn in
-      let psign = (na,None,build_dependent_inductive env indf)::arsgn in
-      let nar = List.length arsgn in
-      (match po with
-	 | Some p ->
-             let env_p = push_rels psign env in
-             let pj = pretype_type empty_valcon env_p isevars lvar p in
-             let ccl = nf_evar (evars_of !isevars) pj.utj_val in
-	     let psign = make_arity_signature env true indf in (* with names *)
-	     let p = it_mkLambda_or_LetIn ccl psign in
-             let inst = 
-	       (Array.to_list cs.cs_concl_realargs)
-	       @[build_dependent_constructor cs] in
-	     let lp = lift cs.cs_nargs p in
-             let fty = hnf_lam_applist env (evars_of !isevars) lp inst in
-	     let fj = pretype (mk_tycon fty) env_f isevars lvar d in
-	     let f = it_mkLambda_or_LetIn fj.uj_val fsign in
-	     let v =
-	       let mis,_ = dest_ind_family indf in
-	       let ci = make_default_case_info env LetStyle mis in
-	       mkCase (ci, p, cj.uj_val,[|f|]) in 
-	     { uj_val = v; uj_type = substl (realargs@[cj.uj_val]) ccl }
-
-	 | None -> 
-             let tycon = option_app (lift cs.cs_nargs) tycon in
-	     let fj = pretype tycon env_f isevars lvar d in
-	     let f = it_mkLambda_or_LetIn fj.uj_val fsign in
-	     let ccl = nf_evar (evars_of !isevars) fj.uj_type in
-             let ccl =
-               if noccur_between 1 cs.cs_nargs ccl then
-                 lift (- cs.cs_nargs) ccl 
-               else
-                 error_cant_find_case_type_loc loc env (evars_of !isevars) 
-                   cj.uj_val in
-             let p = it_mkLambda_or_LetIn (lift (nar+1) ccl) psign in
-	     let v =
-	       let mis,_ = dest_ind_family indf in
-	       let ci = make_default_case_info env LetStyle mis in
-	       mkCase (ci, p, cj.uj_val,[|f|] ) 
-	     in
-	     { uj_val = v; uj_type = ccl })
-
-  | RIf (loc,c,(na,po),b1,b2) ->
-      let cj = pretype empty_tycon env isevars lvar c in
-      let (IndType (indf,realargs)) = 
-	try find_rectype env (evars_of !isevars) cj.uj_type
+  let mt_evd = Evd.empty
+    
+  let vect_lift_type = Array.mapi (fun i t -> type_app (lift i) t)
+      
+  (* Utilisé pour inférer le prédicat des Cases *)
+  (* Semble exagérement fort *)
+  (* Faudra préférer une unification entre les types de toutes les clauses *)
+  (* et autoriser des ? à rester dans le résultat de l'unification *)
+  
+  let evar_type_fixpoint loc env isevars lna lar vdefj =
+    let lt = Array.length vdefj in 
+      if Array.length lar = lt then 
+	for i = 0 to lt-1 do 
+          if not (e_cumul env isevars (vdefj.(i)).uj_type
+		    (lift lt lar.(i))) then
+            error_ill_typed_rec_body_loc loc env (evars_of !isevars)
+              i lna vdefj lar
+	done
+
+  let check_branches_message loc env isevars c (explft,lft) = 
+    for i = 0 to Array.length explft - 1 do
+      if not (e_cumul env isevars lft.(i) explft.(i)) then 
+	let sigma = evars_of !isevars in
+	  error_ill_formed_branch_loc loc env sigma c i lft.(i) explft.(i)
+    done
+
+  (* coerce to tycon if any *)
+  let inh_conv_coerce_to_tycon loc env isevars j = function
+    | None -> j
+    | Some typ -> evd_comb2 (Coercion.inh_conv_coerce_to loc env) isevars j typ
+
+  let push_rels vars env = List.fold_right push_rel vars env
+
+  (*
+    let evar_type_case isevars env ct pt lft p c =
+    let (mind,bty,rslty) = type_case_branches env (evars_of isevars) ct pt p c
+    in check_branches_message isevars env (c,ct) (bty,lft); (mind,rslty)
+  *)
+
+  let strip_meta id = (* For Grammar v7 compatibility *)
+    let s = string_of_id id in
+      if s.[0]='$' then id_of_string (String.sub s 1 (String.length s - 1))
+      else id
+
+  let pretype_id loc env (lvar,unbndltacvars) id =
+    let id = strip_meta id in (* May happen in tactics defined by Grammar *)
+      try
+	let (n,typ) = lookup_rel_id id (rel_context env) in
+	  { uj_val  = mkRel n; uj_type = type_app (lift n) typ }
+      with Not_found ->
+	try
+	  List.assoc id lvar
 	with Not_found ->
-	  let cloc = loc_of_rawconstr c in
-	  error_case_not_inductive_loc cloc env (evars_of !isevars) cj in
-      let cstrs = get_constructors env indf in 
-      if Array.length cstrs <> 2 then
-        user_err_loc (loc,"",
-	  str "If is only for inductive types with two constructors");
-
-      (* Make dependencies from arity signature impossible *)
-      let arsgn,_ = get_arity env indf in
-      let arsgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) arsgn in
-      let nar = List.length arsgn in
-      let psign = (na,None,build_dependent_inductive env indf)::arsgn in
-      let pred,p = match po with
-	| Some p ->
-	    let env_p = push_rels psign env in
-            let pj = pretype_type empty_valcon env_p isevars lvar p in
-            let ccl = nf_evar (evars_of !isevars) pj.utj_val in
-	    let pred = it_mkLambda_or_LetIn ccl psign in
-	    pred, lift (- nar) (beta_applist (pred,[cj.uj_val]))
-	| None -> 
-	    let p = match tycon with
-	    | Some ty -> ty
-	    | None ->
-                e_new_evar isevars env ~src:(loc,InternalHole) (new_Type ())
-	    in
-	    it_mkLambda_or_LetIn (lift (nar+1) p) psign, p in
-      let f cs b =
-	let n = rel_context_length cs.cs_args in
-	let pi = liftn n 2 pred in
-	let pi = beta_applist (pi, [build_dependent_constructor cs]) in
-	let csgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) cs.cs_args in
-	let env_c = push_rels csgn env in 
-	let bj = pretype (Some pi) env_c isevars lvar b in
-	it_mkLambda_or_LetIn bj.uj_val cs.cs_args in
-      let b1 = f cstrs.(0) b1 in
-      let b2 = f cstrs.(1) b2 in
-      let pred = nf_evar (evars_of !isevars) pred in
-      let p = nf_evar (evars_of !isevars) p in
-      let v =
-	let mis,_ = dest_ind_family indf in
-	let ci = make_default_case_info env IfStyle mis in
-	mkCase (ci, pred, cj.uj_val, [|b1;b2|])
-      in
-      { uj_val = v; uj_type = p }
-
-  | RCases (loc,po,tml,eqns) ->
-      Cases.compile_cases loc
-	((fun vtyc env -> pretype vtyc env isevars lvar),isevars)
-	tycon env (* loc *) (po,tml,eqns)
-
-  | RCast(loc,c,k,t) ->
-      let tj = pretype_type empty_tycon env isevars lvar t in
-      let cj = pretype (mk_tycon tj.utj_val) env isevars lvar c in
-      (* User Casts are for helping pretyping, experimentally not to be kept*)
-      (* ... except for Correctness *)
-      let v = mkCast (cj.uj_val, k, tj.utj_val) in
-      let cj = { uj_val = v; uj_type = tj.utj_val } in
-      inh_conv_coerce_to_tycon loc env isevars cj tycon
-
-  | RDynamic (loc,d) ->
-    if (tag d) = "constr" then
-      let c = constr_out d in
-      let j = (Retyping.get_judgment_of env (evars_of !isevars) c) in
+	  try
+	    let (_,_,typ) = lookup_named id env in
+	      { uj_val  = mkVar id; uj_type = typ }
+	  with Not_found ->
+	    try (* To build a nicer ltac error message *)
+	      match List.assoc id unbndltacvars with
+		| None -> user_err_loc (loc,"",
+					str "variable " ++ pr_id id ++ str " should be bound to a term")
+		| Some id0 -> Pretype_errors.error_var_not_found_loc loc id0
+	    with Not_found ->
+	      error_var_not_found_loc loc id
+
+  (* make a dependent predicate from an undependent one *)
+
+  let make_dep_of_undep env (IndType (indf,realargs)) pj =
+    let n = List.length realargs in
+    let rec decomp n p =
+      if n=0 then p else
+	match kind_of_term p with
+	  | Lambda (_,_,c) -> decomp (n-1) c
+	  | _ -> decomp (n-1) (applist (lift 1 p, [mkRel 1])) 
+    in
+    let sign,s = decompose_prod_n n pj.uj_type in
+    let ind = build_dependent_inductive env indf in
+    let s' = mkProd (Anonymous, ind, s) in
+    let ccl = lift 1 (decomp n pj.uj_val) in
+    let ccl' = mkLambda (Anonymous, ind, ccl) in
+      {uj_val=lam_it ccl' sign; uj_type=prod_it s' sign} 
+
+  (*************************************************************************)
+  (* Main pretyping function                                               *)
+
+  let pretype_ref isevars env ref = 
+    let c = constr_of_global ref in
+      make_judge c (Retyping.get_type_of env Evd.empty c)
+
+  let pretype_sort = function
+    | RProp c -> judge_of_prop_contents c
+    | RType _ -> judge_of_new_Type ()
+
+  (* [pretype tycon env isevars lvar lmeta cstr] attempts to type [cstr] *)
+  (* in environment [env], with existential variables [(evars_of isevars)] and *)
+  (* the type constraint tycon *)
+  let rec pretype tycon env isevars lvar = function
+
+    | RRef (loc,ref) ->
+	inh_conv_coerce_to_tycon loc env isevars
+	  (pretype_ref isevars env ref)
+	  tycon
+
+    | RVar (loc, id) ->
+	inh_conv_coerce_to_tycon loc env isevars
+	  (pretype_id loc env lvar id)
+	  tycon
+
+    | REvar (loc, ev, instopt) ->
+	(* Ne faudrait-il pas s'assurer que hyps est bien un
+	   sous-contexte du contexte courant, et qu'il n'y a pas de Rel "caché" *)
+	let hyps = evar_context (Evd.map (evars_of !isevars) ev) in
+	let args = match instopt with
+          | None -> instance_from_named_context hyps
+          | Some inst -> failwith "Evar subtitutions not implemented" in
+	let c = mkEvar (ev, args) in
+	let j = (Retyping.get_judgment_of env (evars_of !isevars) c) in
+	  inh_conv_coerce_to_tycon loc env isevars j tycon
+
+    | RPatVar (loc,(someta,n)) -> 
+	anomaly "Found a pattern variable in a rawterm to type"
+	  
+    | RHole (loc,k) ->
+	let ty =
+          match tycon with 
+            | Some ty -> ty
+            | None ->
+		e_new_evar isevars env ~src:(loc,InternalHole) (new_Type ()) in
+	  { uj_val = e_new_evar isevars env ~src:(loc,k) ty; uj_type = ty }
+
+    | RRec (loc,fixkind,names,bl,lar,vdef) ->
+	let rec type_bl env ctxt = function
+            [] -> ctxt
+          | (na,None,ty)::bl ->
+              let ty' = pretype_type empty_valcon env isevars lvar ty in
+              let dcl = (na,None,ty'.utj_val) in
+		type_bl (push_rel dcl env) (add_rel_decl dcl ctxt) bl
+          | (na,Some bd,ty)::bl ->
+              let ty' = pretype_type empty_valcon env isevars lvar ty in
+              let bd' = pretype (mk_tycon ty'.utj_val) env isevars lvar ty in
+              let dcl = (na,Some bd'.uj_val,ty'.utj_val) in
+		type_bl (push_rel dcl env) (add_rel_decl dcl ctxt) bl in
+	let ctxtv = Array.map (type_bl env empty_rel_context) bl in
+	let larj =
+          array_map2
+            (fun e ar ->
+               pretype_type empty_valcon (push_rel_context e env) isevars lvar ar)
+            ctxtv lar in
+	let lara = Array.map (fun a -> a.utj_val) larj in
+	let ftys = array_map2 (fun e a -> it_mkProd_or_LetIn a e) ctxtv lara in
+	let nbfix = Array.length lar in
+	let names = Array.map (fun id -> Name id) names in
+	  (* Note: bodies are not used by push_rec_types, so [||] is safe *)
+	let newenv = push_rec_types (names,ftys,[||]) env in
+	let vdefj =
+	  array_map2_i 
+	    (fun i ctxt def ->
+               (* we lift nbfix times the type in tycon, because of
+		* the nbfix variables pushed to newenv *)
+               let (ctxt,ty) =
+		 decompose_prod_n_assum (rel_context_length ctxt)
+                   (lift nbfix ftys.(i)) in
+               let nenv = push_rel_context ctxt newenv in
+               let j = pretype (mk_tycon ty) nenv isevars lvar def in
+		 { uj_val = it_mkLambda_or_LetIn j.uj_val ctxt;
+		   uj_type = it_mkProd_or_LetIn j.uj_type ctxt })
+            ctxtv vdef in
+	  evar_type_fixpoint loc env isevars names ftys vdefj;
+	  let fixj =
+	    match fixkind with
+	      | RFix (vn,i) ->
+		  let fix = ((Array.map fst vn, i),(names,ftys,Array.map j_val vdefj)) in
+		    (try check_fix env fix with e -> Stdpp.raise_with_loc loc e);
+		    make_judge (mkFix fix) ftys.(i)
+	      | RCoFix i -> 
+		  let cofix = (i,(names,ftys,Array.map j_val vdefj)) in
+		    (try check_cofix env cofix with e -> Stdpp.raise_with_loc loc e);
+		    make_judge (mkCoFix cofix) ftys.(i) in
+	    inh_conv_coerce_to_tycon loc env isevars fixj tycon
+
+    | RSort (loc,s) ->
+	inh_conv_coerce_to_tycon loc env isevars (pretype_sort s) tycon
+
+    | RApp (loc,f,args) -> 
+	let fj = pretype empty_tycon env isevars lvar f in
+	let floc = loc_of_rawconstr f in
+	let rec apply_rec env n resj = function
+	  | [] -> resj
+	  | c::rest ->
+	      let argloc = loc_of_rawconstr c in
+	      let resj = evd_comb1 (Coercion.inh_app_fun env) isevars resj in
+              let resty =
+		whd_betadeltaiota env (evars_of !isevars) resj.uj_type in
+      		match kind_of_term resty with
+		  | Prod (na,c1,c2) ->
+		      let hj = pretype (mk_tycon c1) env isevars lvar c in
+		      let newresj =
+      			{ uj_val = applist (j_val resj, [j_val hj]);
+			  uj_type = subst1 hj.uj_val c2 } in
+			apply_rec env (n+1) newresj rest
+
+		  | _ ->
+		      let hj = pretype empty_tycon env isevars lvar c in
+			error_cant_apply_not_functional_loc 
+			  (join_loc floc argloc) env (evars_of !isevars)
+	      		  resj [hj]
+
+	in let resj = apply_rec env 1 fj args in
+	  (*
+	    let apply_one_arg (floc,tycon,jl) c =
+	    let (dom,rng) = split_tycon floc env isevars tycon in
+	    let cj = pretype dom env isevars lvar c in
+	    let rng_tycon =
+	    option_app (subst1 cj.uj_val) rng in
+	    let argloc = loc_of_rawconstr c in
+	    (join_loc floc argloc,rng_tycon,(argloc,cj)::jl)  in
+	    let _,_,jl =
+	    List.fold_left apply_one_arg (floc,mk_tycon j.uj_type,[]) args in
+	    let jl = List.rev jl in
+	    let resj = inh_apply_rel_list loc env isevars jl (floc,j) tycon in
+	  *)
+	  inh_conv_coerce_to_tycon loc env isevars resj tycon
+
+    | RLambda(loc,name,c1,c2)      ->
+	let (name',dom,rng) = evd_comb1 (split_tycon loc env) isevars tycon in
+	let dom_valcon = valcon_of_tycon dom in
+	let j = pretype_type dom_valcon env isevars lvar c1 in
+	let var = (name,None,j.utj_val) in
+	let j' = pretype rng (push_rel var env) isevars lvar c2 in 
+	  judge_of_abstraction env name j j'
+
+    | RProd(loc,name,c1,c2)        ->
+	let j = pretype_type empty_valcon env isevars lvar c1 in
+	let var = (name,j.utj_val) in
+	let env' = push_rel_assum var env in
+	let j' = pretype_type empty_valcon env' isevars lvar c2 in
+	let resj =
+	  try judge_of_product env name j j'
+	  with TypeError _ as e -> Stdpp.raise_with_loc loc e in
+	  inh_conv_coerce_to_tycon loc env isevars resj tycon
+	    
+    | RLetIn(loc,name,c1,c2)      ->
+	let j = pretype empty_tycon env isevars lvar c1 in
+	let t = refresh_universes j.uj_type in
+	let var = (name,Some j.uj_val,t) in
+        let tycon = option_app (lift 1) tycon in
+	let j' = pretype tycon (push_rel var env) isevars lvar c2 in
+	  { uj_val = mkLetIn (name, j.uj_val, t, j'.uj_val) ;
+	    uj_type = subst1 j.uj_val j'.uj_type }
+
+    | RLetTuple (loc,nal,(na,po),c,d) ->
+	let cj = pretype empty_tycon env isevars lvar c in
+	let (IndType (indf,realargs)) = 
+	  try find_rectype env (evars_of !isevars) cj.uj_type
+	  with Not_found ->
+	    let cloc = loc_of_rawconstr c in
+	      error_case_not_inductive_loc cloc env (evars_of !isevars) cj 
+	in
+	let cstrs = get_constructors env indf in
+	  if Array.length cstrs <> 1 then
+            user_err_loc (loc,"",str "Destructing let is only for inductive types with one constructor");
+	  let cs = cstrs.(0) in
+	    if List.length nal <> cs.cs_nargs then
+              user_err_loc (loc,"", str "Destructing let on this type expects " ++ int cs.cs_nargs ++ str " variables");
+	    let fsign = List.map2 (fun na (_,c,t) -> (na,c,t))
+              (List.rev nal) cs.cs_args in
+	    let env_f = push_rels fsign env in
+	      (* Make dependencies from arity signature impossible *)
+	    let arsgn,_ = get_arity env indf in
+	    let arsgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) arsgn in
+	    let psign = (na,None,build_dependent_inductive env indf)::arsgn in
+	    let nar = List.length arsgn in
+	      (match po with
+		 | Some p ->
+		     let env_p = push_rels psign env in
+		     let pj = pretype_type empty_valcon env_p isevars lvar p in
+		     let ccl = nf_evar (evars_of !isevars) pj.utj_val in
+		     let psign = make_arity_signature env true indf in (* with names *)
+		     let p = it_mkLambda_or_LetIn ccl psign in
+		     let inst = 
+		       (Array.to_list cs.cs_concl_realargs)
+		       @[build_dependent_constructor cs] in
+		     let lp = lift cs.cs_nargs p in
+		     let fty = hnf_lam_applist env (evars_of !isevars) lp inst in
+		     let fj = pretype (mk_tycon fty) env_f isevars lvar d in
+		     let f = it_mkLambda_or_LetIn fj.uj_val fsign in
+		     let v =
+		       let mis,_ = dest_ind_family indf in
+		       let ci = make_default_case_info env LetStyle mis in
+			 mkCase (ci, p, cj.uj_val,[|f|]) in 
+		       { uj_val = v; uj_type = substl (realargs@[cj.uj_val]) ccl }
+
+		 | None -> 
+		     let tycon = option_app (lift cs.cs_nargs) tycon in
+		     let fj = pretype tycon env_f isevars lvar d in
+		     let f = it_mkLambda_or_LetIn fj.uj_val fsign in
+		     let ccl = nf_evar (evars_of !isevars) fj.uj_type in
+		     let ccl =
+		       if noccur_between 1 cs.cs_nargs ccl then
+			 lift (- cs.cs_nargs) ccl 
+		       else
+			 error_cant_find_case_type_loc loc env (evars_of !isevars) 
+			   cj.uj_val in
+		     let p = it_mkLambda_or_LetIn (lift (nar+1) ccl) psign in
+		     let v =
+		       let mis,_ = dest_ind_family indf in
+		       let ci = make_default_case_info env LetStyle mis in
+			 mkCase (ci, p, cj.uj_val,[|f|] ) 
+		     in
+		       { uj_val = v; uj_type = ccl })
+
+    | RIf (loc,c,(na,po),b1,b2) ->
+	let cj = pretype empty_tycon env isevars lvar c in
+	let (IndType (indf,realargs)) = 
+	  try find_rectype env (evars_of !isevars) cj.uj_type
+	  with Not_found ->
+	    let cloc = loc_of_rawconstr c in
+	      error_case_not_inductive_loc cloc env (evars_of !isevars) cj in
+	let cstrs = get_constructors env indf in 
+	  if Array.length cstrs <> 2 then
+            user_err_loc (loc,"",
+			  str "If is only for inductive types with two constructors");
+
+	  (* Make dependencies from arity signature impossible *)
+	  let arsgn,_ = get_arity env indf in
+	  let arsgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) arsgn in
+	  let nar = List.length arsgn in
+	  let psign = (na,None,build_dependent_inductive env indf)::arsgn in
+	  let pred,p = match po with
+	    | Some p ->
+		let env_p = push_rels psign env in
+		let pj = pretype_type empty_valcon env_p isevars lvar p in
+		let ccl = nf_evar (evars_of !isevars) pj.utj_val in
+		let pred = it_mkLambda_or_LetIn ccl psign in
+		  pred, lift (- nar) (beta_applist (pred,[cj.uj_val]))
+	    | None -> 
+		let p = match tycon with
+		  | Some ty -> ty
+		  | None ->
+                      e_new_evar isevars env ~src:(loc,InternalHole) (new_Type ())
+		in
+		  it_mkLambda_or_LetIn (lift (nar+1) p) psign, p in
+	  let f cs b =
+	    let n = rel_context_length cs.cs_args in
+	    let pi = liftn n 2 pred in
+	    let pi = beta_applist (pi, [build_dependent_constructor cs]) in
+	    let csgn = List.map (fun (_,b,t) -> (Anonymous,b,t)) cs.cs_args in
+	    let env_c = push_rels csgn env in 
+	    let bj = pretype (Some pi) env_c isevars lvar b in
+	      it_mkLambda_or_LetIn bj.uj_val cs.cs_args in
+	  let b1 = f cstrs.(0) b1 in
+	  let b2 = f cstrs.(1) b2 in
+	  let pred = nf_evar (evars_of !isevars) pred in
+	  let p = nf_evar (evars_of !isevars) p in
+	  let v =
+	    let mis,_ = dest_ind_family indf in
+	    let ci = make_default_case_info env IfStyle mis in
+	      mkCase (ci, pred, cj.uj_val, [|b1;b2|])
+	  in
+	    { uj_val = v; uj_type = p }
+
+    | RCases (loc,po,tml,eqns) ->
+	Cases.compile_cases loc
+	  ((fun vtyc env -> pretype vtyc env isevars lvar),isevars)
+	  tycon env (* loc *) (po,tml,eqns)
+
+    | RCast(loc,c,k,t) ->
+	let tj = pretype_type empty_tycon env isevars lvar t in
+	let cj = pretype (mk_tycon tj.utj_val) env isevars lvar c in
+	  (* User Casts are for helping pretyping, experimentally not to be kept*)
+	  (* ... except for Correctness *)
+	let v = mkCast (cj.uj_val, k, tj.utj_val) in
+	let cj = { uj_val = v; uj_type = tj.utj_val } in
+	  inh_conv_coerce_to_tycon loc env isevars cj tycon
+
+    | RDynamic (loc,d) ->
+	if (tag d) = "constr" then
+	  let c = constr_out d in
+	  let j = (Retyping.get_judgment_of env (evars_of !isevars) c) in
+	    j
+	      (*inh_conv_coerce_to_tycon loc env isevars j tycon*)
+	else
+	  user_err_loc (loc,"pretype",(str "Not a constr tagged Dynamic"))
+
+  (* [pretype_type valcon env isevars lvar c] coerces [c] into a type *)
+  and pretype_type valcon env isevars lvar = function
+    | RHole loc ->
+	(match valcon with
+	   | Some v ->
+               let s =
+		 let sigma = evars_of !isevars in
+		 let t = Retyping.get_type_of env sigma v in
+		   match kind_of_term (whd_betadeltaiota env sigma t) with
+                     | Sort s -> s
+                     | Evar v when is_Type (existential_type sigma v) -> 
+			 evd_comb1 (define_evar_as_sort) isevars v
+                     | _ -> anomaly "Found a type constraint which is not a type"
+               in
+		 { utj_val = v;
+		   utj_type = s }
+	   | None ->
+	       let s = new_Type_sort () in
+		 { utj_val = e_new_evar isevars env ~src:loc (mkSort s);
+		   utj_type = s})
+    | c ->
+	let j = pretype empty_tycon env isevars lvar c in
+	let loc = loc_of_rawconstr c in
+	let tj = evd_comb1 (Coercion.inh_coerce_to_sort loc env) isevars j in
+	  match valcon with
+	    | None -> tj
+	    | Some v ->
+		if e_cumul env isevars v tj.utj_val then tj
+		else
+		  error_unexpected_type_loc
+                    (loc_of_rawconstr c) env (evars_of !isevars) tj.utj_val v
+
+  let pretype_gen isevars env lvar kind c =
+    let c' = match kind with
+      | OfType exptyp ->
+	  let tycon = match exptyp with None -> empty_tycon | Some t -> mk_tycon t in
+	    (pretype tycon env isevars lvar c).uj_val
+      | IsType ->
+	  (pretype_type empty_valcon env isevars lvar c).utj_val in
+      nf_evar (evars_of !isevars) c'
+
+  (* [check_evars] fails if some unresolved evar remains *)
+  (* it assumes that the defined existentials have already been substituted
+     (should be done in unsafe_infer and unsafe_infer_type) *)
+
+  let check_evars env initial_sigma isevars c =
+    let sigma = evars_of !isevars in
+    let rec proc_rec c =
+      match kind_of_term c with
+	| Evar (ev,args) ->
+            assert (Evd.in_dom sigma ev);
+	    if not (Evd.in_dom initial_sigma ev) then
+              let (loc,k) = evar_source ev !isevars in
+		error_unsolvable_implicit loc env sigma k
+	| _ -> iter_constr proc_rec c
+    in
+      proc_rec c(*;
+		  let (_,pbs) = get_conv_pbs !isevars (fun _ -> true) in
+		  if pbs <> [] then begin
+		  pperrnl
+		  (str"TYPING OF "++Termops.print_constr_env env c++fnl()++
+		  prlist_with_sep fnl
+		  (fun  (pb,c1,c2) ->
+		  Termops.print_constr c1 ++
+		  (if pb=Reduction.CUMUL then str " <="++ spc()
+		  else str" =="++spc()) ++
+		  Termops.print_constr c2)
+		  pbs ++ fnl())
+		  end*)
+
+  (* TODO: comment faire remonter l'information si le typage a resolu des
+     variables du sigma original. il faudrait que la fonction de typage
+     retourne aussi le nouveau sigma...
+  *)
+
+  let understand_judgment sigma env c =
+    let isevars = ref (create_evar_defs sigma) in
+    let j = pretype empty_tycon env isevars ([],[]) c in
+    let j = j_nf_evar (evars_of !isevars) j in
+      check_evars env sigma isevars (mkCast(j.uj_val,DEFAULTcast, j.uj_type));
       j
-      (*inh_conv_coerce_to_tycon loc env isevars j tycon*)
-    else
-      user_err_loc (loc,"pretype",(str "Not a constr tagged Dynamic"))
-
-(* [pretype_type valcon env isevars lvar c] coerces [c] into a type *)
-and pretype_type valcon env isevars lvar = function
-  | RHole loc ->
-      (match valcon with
-	 | Some v ->
-             let s =
-               let sigma = evars_of !isevars in
-               let t = Retyping.get_type_of env sigma v in
-               match kind_of_term (whd_betadeltaiota env sigma t) with
-                 | Sort s -> s
-                 | Evar v when is_Type (existential_type sigma v) -> 
-                     evd_comb1 (define_evar_as_sort) isevars v
-                 | _ -> anomaly "Found a type constraint which is not a type"
-             in
-	     { utj_val = v;
-	       utj_type = s }
-	 | None ->
-	     let s = new_Type_sort () in
-	     { utj_val = e_new_evar isevars env ~src:loc (mkSort s);
-	       utj_type = s})
-  | c ->
-      let j = pretype empty_tycon env isevars lvar c in
-      let loc = loc_of_rawconstr c in
-      let tj = evd_comb1 (inh_coerce_to_sort loc env) isevars j in
-      match valcon with
-	| None -> tj
-	| Some v ->
-	    if e_cumul env isevars v tj.utj_val then tj
-	    else
-	      error_unexpected_type_loc
-                (loc_of_rawconstr c) env (evars_of !isevars) tj.utj_val v
 
+  let understand_judgment_tcc sigma env c =
+    let isevars = ref (create_evar_defs sigma) in
+    let j = pretype empty_tycon env isevars ([],[]) c in
+    let sigma = evars_of !isevars in
+    let j = j_nf_evar sigma j in
+      sigma, j
 
-type typing_constraint = OfType of types option | IsType
-
-let pretype_gen isevars env lvar kind c =
-  let c' = match kind with
-  | OfType exptyp ->
-    let tycon = match exptyp with None -> empty_tycon | Some t -> mk_tycon t in
-    (pretype tycon env isevars lvar c).uj_val
-  | IsType ->
-    (pretype_type empty_valcon env isevars lvar c).utj_val in
-  nf_evar (evars_of !isevars) c'
-
-(* [check_evars] fails if some unresolved evar remains *)
-(* it assumes that the defined existentials have already been substituted
-   (should be done in unsafe_infer and unsafe_infer_type) *)
-
-let check_evars env initial_sigma isevars c =
-  let sigma = evars_of !isevars in
-  let rec proc_rec c =
-    match kind_of_term c with
-      | Evar (ev,args) ->
-          assert (Evd.in_dom sigma ev);
-	  if not (Evd.in_dom initial_sigma ev) then
-            let (loc,k) = evar_source ev !isevars in
-	    error_unsolvable_implicit loc env sigma k
-      | _ -> iter_constr proc_rec c
-  in
-  proc_rec c(*;
-  let (_,pbs) = get_conv_pbs !isevars (fun _ -> true) in
-  if pbs <> [] then begin
-    pperrnl
-      (str"TYPING OF "++Termops.print_constr_env env c++fnl()++
-      prlist_with_sep fnl
-        (fun  (pb,c1,c2) ->
-          Termops.print_constr c1 ++
-          (if pb=Reduction.CUMUL then str " <="++ spc()
-           else str" =="++spc()) ++
-          Termops.print_constr c2)
-        pbs ++ fnl())
-  end*)
-
-(* TODO: comment faire remonter l'information si le typage a resolu des
-       variables du sigma original. il faudrait que la fonction de typage
-       retourne aussi le nouveau sigma...
-*)
-
-let understand_judgment sigma env c =
-  let isevars = ref (create_evar_defs sigma) in
-  let j = pretype empty_tycon env isevars ([],[]) c in
-  let j = j_nf_evar (evars_of !isevars) j in
-  check_evars env sigma isevars (mkCast(j.uj_val,DEFAULTcast, j.uj_type));
-  j
-
-(* Raw calls to the unsafe inference machine: boolean says if we must
-   fail on unresolved evars; the unsafe_judgment list allows us to
-   extend env with some bindings *)
-
-let ise_pretype_gen fail_evar sigma env lvar kind c =
-  let isevars = ref (create_evar_defs sigma) in
-  let c = pretype_gen isevars env lvar kind c in
-  if fail_evar then check_evars env sigma isevars c;
-  (!isevars, c)
-
-(** Entry points of the high-level type synthesis algorithm *)
+  (* Raw calls to the unsafe inference machine: boolean says if we must
+     fail on unresolved evars; the unsafe_judgment list allows us to
+     extend env with some bindings *)
 
-type var_map = (identifier * unsafe_judgment) list
-type unbound_ltac_var_map = (identifier * identifier option) list
+  let ise_pretype_gen fail_evar sigma env lvar kind c =
+    let isevars = ref (create_evar_defs sigma) in
+    let c = pretype_gen isevars env lvar kind c in
+      if fail_evar then check_evars env sigma isevars c;
+      (!isevars, c)
 
-let understand_gen kind sigma env c =
-  snd (ise_pretype_gen true sigma env ([],[]) kind c)
+  (** Entry points of the high-level type synthesis algorithm *)
 
-let understand sigma env ?expected_type:exptyp c =
-  snd (ise_pretype_gen true sigma env ([],[]) (OfType exptyp) c)
+  let understand_gen kind sigma env c =
+    snd (ise_pretype_gen true sigma env ([],[]) kind c)
 
-let understand_type sigma env c =
-  snd (ise_pretype_gen true sigma env ([],[]) IsType c)
+  let understand sigma env ?expected_type:exptyp c =
+    snd (ise_pretype_gen true sigma env ([],[]) (OfType exptyp) c)
 
-let understand_ltac sigma env lvar kind c =
-  ise_pretype_gen false sigma env lvar kind c
+  let understand_type sigma env c =
+    snd (ise_pretype_gen true sigma env ([],[]) IsType c)
 
-let understand_tcc sigma env ?expected_type:exptyp c =
-  let evars,c = ise_pretype_gen false sigma env ([],[]) (OfType exptyp) c in
-  evars_of evars,c
+  let understand_ltac sigma env lvar kind c =
+    ise_pretype_gen false sigma env lvar kind c
 
-(** Miscellaneous interpretation functions *)
+  let understand_tcc sigma env ?expected_type:exptyp c =
+    let evars,c = ise_pretype_gen false sigma env ([],[]) (OfType exptyp) c in
+      evars_of evars,c
+end
 
-let interp_sort = function
-  | RProp c -> Prop c
-  | RType _ -> new_Type_sort ()
-
-let interp_elimination_sort = function
-  | RProp Null -> InProp
-  | RProp Pos  -> InSet
-  | RType _ -> InType
+module Default : S = Pretyping_F(Coercion.Default)
diff --git a/pretyping/pretyping.mli b/pretyping/pretyping.mli
index 8a7946cd72..f93e461298 100644
--- a/pretyping/pretyping.mli
+++ b/pretyping/pretyping.mli
@@ -20,70 +20,89 @@ open Evarutil
 
 type typing_constraint = OfType of types option | IsType
 
-(* Generic call to the interpreter from rawconstr to open_constr, leaving
-   unresolved holes as evars and returning the typing contexts of
-   these evars. Work as [understand_gen] for the rest. *)
-
-val understand_tcc :
-  evar_map -> env -> ?expected_type:types -> rawconstr -> open_constr
-
-(* More general entry point with evars from ltac *)
-
 type var_map = (identifier * unsafe_judgment) list
 type unbound_ltac_var_map = (identifier * identifier option) list
 
-(* Generic call to the interpreter from rawconstr to constr, failing
-   unresolved holes in the rawterm cannot be instantiated.
-
-   In [understand_ltac sigma env ltac_env constraint c],
-
-   sigma : initial set of existential variables (typically dependent subgoals)
-   ltac_env : partial substitution of variables (used for the tactic language)
-   constraint : tell if interpreted as a possibly constrained term or a type 
-*)
-
-val understand_ltac :
-  evar_map -> env -> var_map * unbound_ltac_var_map ->
+module type S = 
+sig
+
+  module Cases : Cases.S
+  
+  (* Generic call to the interpreter from rawconstr to open_constr, leaving
+     unresolved holes as evars and returning the typing contexts of
+     these evars. Work as [understand_gen] for the rest. *)
+  
+  val understand_tcc :
+    evar_map -> env -> ?expected_type:types -> rawconstr -> open_constr
+    
+  (* More general entry point with evars from ltac *)
+    
+  (* Generic call to the interpreter from rawconstr to constr, failing
+     unresolved holes in the rawterm cannot be instantiated.
+     
+     In [understand_ltac sigma env ltac_env constraint c],
+     
+     sigma : initial set of existential variables (typically dependent subgoals)
+     ltac_env : partial substitution of variables (used for the tactic language)
+     constraint : tell if interpreted as a possibly constrained term or a type 
+  *)
+    
+  val understand_ltac :
+    evar_map -> env -> var_map * unbound_ltac_var_map ->
     typing_constraint -> rawconstr -> evar_defs * constr
+    
+  (* Standard call to get a constr from a rawconstr, resolving implicit args *)
+    
+  val understand : evar_map -> env -> ?expected_type:Term.types ->
+    rawconstr -> constr
+    
+  (* Idem but the rawconstr is intended to be a type *)
+    
+  val understand_type : evar_map -> env -> rawconstr -> constr
+    
+  (* A generalization of the two previous case *)
+    
+  val understand_gen : typing_constraint -> evar_map -> env -> 
+    rawconstr -> constr
+    
+  (* Idem but returns the judgment of the understood term *)
+    
+  val understand_judgment : evar_map -> env -> rawconstr -> unsafe_judgment
+
+  (* Idem but do not fail on unresolved evars *)
+  val understand_judgment_tcc : evar_map -> env -> rawconstr -> evar_map * unsafe_judgment
+
+       
+  (*i*)
+  (* Internal of Pretyping...
+   *)
+  val pretype : 
+    type_constraint -> env -> evar_defs ref -> 
+    var_map * (identifier * identifier option) list ->
+    rawconstr -> unsafe_judgment
+    
+  val pretype_type : 
+    val_constraint -> env -> evar_defs ref ->
+    var_map * (identifier * identifier option) list ->
+    rawconstr -> unsafe_type_judgment
 
-(* Standard call to get a constr from a rawconstr, resolving implicit args *)
-
-val understand : evar_map -> env -> ?expected_type:Term.types ->
-  rawconstr -> constr
-
-(* Idem but the rawconstr is intended to be a type *)
-
-val understand_type : evar_map -> env -> rawconstr -> constr
-
-(* A generalization of the two previous case *)
-
-val understand_gen : typing_constraint -> evar_map -> env -> 
-  rawconstr -> constr
+  val pretype_gen :
+    evar_defs ref -> env -> 
+    var_map * (identifier * identifier option) list ->
+    typing_constraint -> rawconstr -> constr
 
-(* Idem but returns the judgment of the understood term *)
+  (*i*)
+    
+end
 
-val understand_judgment : evar_map -> env -> rawconstr -> unsafe_judgment
+module Pretyping_F (C : Coercion.S) : S
+module Default : S
 
 (* To embed constr in rawconstr *)
-
+  
 val constr_in : constr -> Dyn.t
 val constr_out : Dyn.t -> constr
 
-(*i*)
-(* Internal of Pretyping...
- * Unused outside, but useful for debugging
- *)
-val pretype : 
-  type_constraint -> env -> evar_defs ref -> 
-  var_map * (identifier * identifier option) list ->
-  rawconstr -> unsafe_judgment
-
-val pretype_type : 
-  val_constraint -> env -> evar_defs ref ->
-    var_map * (identifier * identifier option) list ->
-    rawconstr -> unsafe_type_judgment
-(*i*)
-
-val interp_sort : rawsort -> sorts
-
+val interp_sort : rawsort -> sorts  
 val interp_elimination_sort : rawsort -> sorts_family
+
diff --git a/proofs/evar_refiner.ml b/proofs/evar_refiner.ml
index 1591d43c92..0f3fa75843 100644
--- a/proofs/evar_refiner.ml
+++ b/proofs/evar_refiner.ml
@@ -28,7 +28,7 @@ let w_refine env ev rawc evd =
   let e_info = Evd.map (evars_of evd) ev in
   let env = Evd.evar_env e_info in
   let sigma,typed_c = 
-    Pretyping.understand_tcc (evars_of evd) env 
+    Pretyping.Default.understand_tcc (evars_of evd) env 
       ~expected_type:e_info.evar_concl rawc in
   evar_define ev typed_c (evars_reset_evd sigma evd)
 
diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml
index ee4e61179b..f24297cf05 100644
--- a/tactics/tacinterp.ml
+++ b/tactics/tacinterp.ml
@@ -45,6 +45,7 @@ open Printer
 open Inductiveops
 open Syntax_def
 open Pretyping
+open Pretyping.Default
 
 let error_syntactic_metavariables_not_allowed loc =
   user_err_loc