HUGE COMMIT

1. when applying a functor F(X) := B to a module M, the obtained module
   is no longer B{X.t := M.t for all t}, but B{X.t := b where b is the
   body of t in M}. In principle it is now easy to fine tune the behaviour
   to choose whether b or M.t must be used. This change implies modifications
   both inside and outside the kernel.
2. for each object in the library it is now necessary to define the behaviour
   w.r.t. the substitution {X.t := b}. Notice that in many many cases the
   pre-existing behaviour w.r.t. the substitution {X.t := M.t} was broken
   (in the sense that it used to break several invariants). This commit
   fixes the behaviours for most of the objects, excluded
     a) coercions: a future commit should allow any term to be declared
        as a coercion; moreover the invariant that just a coercion path
        exists between two classes will be broken by the instantiation.
     b) global references when used as arguments of a few tactics/commands
   In all the other cases the behaviour implemented is the one that looks
   to me as the one expected by the user (if possible):
   [ terminology: not expanded (X.t := M.t) vs expanded (X.t := b) ]
     a) argument scopes: not expanded
     b) SYNTAXCONSTANT: expanded
     c) implicit arguments: not expanded
     d) coercions: expansion to be done (for now not expanded)
     e) concrete syntax tree for patterns: expanded
     f) concrete syntax tree for raw terms: expanded
     g) evaluable references (used by unfold, delta expansion, etc.): not
        expanded
     h) auto's hints: expanded when possible (i.e. when the expansion of the
        head of the pattern is rigid)
     i) realizers (for program extraction): nothing is done since the actual
        code does not look for the realizer of definitions with a body;
        however this solution is fragile.
     l) syntax and notation: expanded
     m) structures and canonical structures: an invariant says that no
        parameter can happear in them ==> the substitution always yelds the
        original term
     n) stuff related to V7 syntax: since this part of the code is doomed
        to disappear, I have made no effort to fix a reasonable semantics;
        not expanded is the default one applied
     o) RefArgTypes: to be understood. For now a warning is issued whether
        expanded != not expanded, and the not expanded solution is chosen.


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

37 files changed, 4031 insertions, 3780 deletions

diff --git a/.depend b/.depend
index b8f34633e..5e83398d8 100644
--- a/.depend
+++ b/.depend
@@ -1,854 +1,842 @@
 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 \
-    library/impargs.cmi kernel/environ.cmi 
-interp/constrintern.cmi: interp/topconstr.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/sign.cmi pretyping/rawterm.cmi \
-    pretyping/pattern.cmi kernel/names.cmi library/libnames.cmi \
-    library/impargs.cmi pretyping/evd.cmi kernel/environ.cmi \
-    parsing/coqast.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/symbols.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/syntax_def.cmi: lib/util.cmi interp/topconstr.cmi \
-    pretyping/rawterm.cmi kernel/names.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/names.cmi kernel/environ.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/names.cmi \
-    kernel/environ.cmi kernel/declarations.cmi 
-kernel/csymtable.cmi: kernel/term.cmi kernel/names.cmi kernel/environ.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/impargs.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: parsing/coqast.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/impargs.cmi library/libnames.cmi \
+    kernel/names.cmi pretyping/pattern.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: 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/environ.cmi kernel/names.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/names.cmi kernel/declarations.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/term.cmi kernel/univ.cmi 
+kernel/csymtable.cmi: kernel/environ.cmi kernel/names.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/declarations.cmi kernel/names.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/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/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/names.cmi: lib/predicate.cmi lib/pp.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/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/cooking.cmi library/decl_kinds.cmo \
+    kernel/declarations.cmi library/dischargedhypsmap.cmi kernel/entries.cmi \
+    kernel/indtypes.cmi library/libnames.cmi library/libobject.cmi \
+    kernel/names.cmi library/nametab.cmi kernel/safe_typing.cmi \
+    kernel/sign.cmi kernel/term.cmi kernel/univ.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 library/summary.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 
-library/declare.cmi: kernel/univ.cmi kernel/term.cmi kernel/sign.cmi \
-    kernel/safe_typing.cmi library/nametab.cmi kernel/names.cmi \
-    library/libobject.cmi library/libnames.cmi kernel/indtypes.cmi \
-    kernel/entries.cmi library/dischargedhypsmap.cmi kernel/declarations.cmi \
-    library/decl_kinds.cmo kernel/cooking.cmi 
-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 library/summary.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 
-parsing/ast.cmi: lib/util.cmi interp/topconstr.cmi lib/pp.cmi \
-    kernel/names.cmi kernel/mod_subst.cmi library/libnames.cmi \
-    interp/genarg.cmi lib/dyn.cmi parsing/coqast.cmi 
-parsing/coqast.cmi: lib/util.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi lib/dyn.cmi 
-parsing/egrammar.cmi: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo pretyping/rawterm.cmi \
-    interp/ppextend.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    interp/genarg.cmi parsing/extend.cmi parsing/coqast.cmi parsing/ast.cmi 
-parsing/esyntax.cmi: interp/topconstr.cmi interp/ppextend.cmi lib/pp.cmi \
-    interp/notation.cmi parsing/extend.cmi parsing/coqast.cmi parsing/ast.cmi 
-parsing/extend.cmi: lib/util.cmi interp/topconstr.cmi interp/ppextend.cmi \
-    lib/pp.cmi kernel/names.cmi kernel/mod_subst.cmi interp/genarg.cmi \
-    parsing/coqast.cmi parsing/ast.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 parsing/coqast.cmi lib/bigint.cmi parsing/ast.cmi 
-parsing/ppconstr.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tacexpr.cmo pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi \
-    kernel/names.cmi library/libnames.cmi parsing/extend.cmi \
-    kernel/environ.cmi parsing/coqast.cmi 
-parsing/pptactic.cmi: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tacexpr.cmo pretyping/rawterm.cmi proofs/proof_type.cmi \
-    pretyping/pretyping.cmi lib/pp.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/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 
-parsing/termast.cmi: pretyping/termops.cmi kernel/term.cmi kernel/sign.cmi \
-    pretyping/rawterm.cmi pretyping/pattern.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi kernel/environ.cmi \
-    parsing/coqast.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/libobject.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/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 pretyping/termops.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 \
-    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 kernel/mod_subst.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/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 
-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: kernel/term.cmi proofs/tacexpr.cmo proofs/proof_type.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: 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 interp/genarg.cmi pretyping/evd.cmi \
-    kernel/environ.cmi lib/dyn.cmi parsing/coqast.cmi 
-tactics/tacticals.cmi: kernel/term.cmi proofs/tacmach.cmi proofs/tacexpr.cmo \
-    kernel/sign.cmi kernel/reduction.cmi proofs/proof_type.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 
+lib/util.cmi: lib/compat.cmo lib/pp.cmi 
+parsing/ast.cmi: parsing/coqast.cmi lib/dyn.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/mod_subst.cmi kernel/names.cmi lib/pp.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/coqast.cmi: lib/dyn.cmi library/libnames.cmi kernel/names.cmi \
+    lib/util.cmi 
+parsing/egrammar.cmi: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
+    interp/genarg.cmi kernel/mod_subst.cmi kernel/names.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo \
+    interp/topconstr.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/esyntax.cmi: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
+    interp/notation.cmi lib/pp.cmi interp/ppextend.cmi interp/topconstr.cmi 
+parsing/extend.cmi: parsing/ast.cmi parsing/coqast.cmi interp/genarg.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi lib/pp.cmi interp/ppextend.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+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: parsing/ast.cmi lib/bigint.cmi parsing/coqast.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: parsing/coqast.cmi kernel/environ.cmi \
+    parsing/extend.cmi library/libnames.cmi kernel/names.cmi parsing/pcoq.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi proofs/tacexpr.cmo kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/pptactic.cmi: interp/genarg.cmi library/libnames.cmi lib/pp.cmi \
+    pretyping/pretyping.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi interp/topconstr.cmi lib/util.cmi 
+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/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 
+parsing/termast.cmi: parsing/ast.cmi parsing/coqast.cmi kernel/environ.cmi \
+    library/libnames.cmi kernel/mod_subst.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/pattern.cmi pretyping/rawterm.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi 
+pretyping/cases.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 library/libobject.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 pretyping/termops.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/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: 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 
+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: 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: proofs/proof_type.cmi proofs/tacexpr.cmo kernel/term.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 \
+    proofs/proof_type.cmi pretyping/rawterm.cmi kernel/term.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 
+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: parsing/coqast.cmi lib/dyn.cmi kernel/environ.cmi \
+    pretyping/evd.cmi interp/genarg.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 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/names.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/pretype_errors.cmi \
-    lib/pp.cmi kernel/names.cmi proofs/logic.cmi kernel/indtypes.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/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 \
+    kernel/indtypes.cmi proofs/logic.cmi kernel/names.cmi lib/pp.cmi \
+    pretyping/pretype_errors.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/recordobj.cmi: proofs/tacexpr.cmo library/libnames.cmi 
-toplevel/searchisos.cmi: kernel/term.cmi kernel/names.cmi \
-    library/libobject.cmi 
-toplevel/toplevel.cmi: lib/pp.cmi parsing/pcoq.cmi 
-toplevel/vernac.cmi: toplevel/vernacexpr.cmo lib/util.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/recordobj.cmi: library/libnames.cmi proofs/tacexpr.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 
-translate/ppconstrnew.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 pretyping/pattern.cmi kernel/names.cmi \
-    library/libnames.cmi interp/genarg.cmi parsing/extend.cmi \
-    kernel/environ.cmi parsing/coqast.cmi 
-translate/pptacticnew.cmi: interp/topconstr.cmi proofs/tacexpr.cmo \
-    proofs/proof_type.cmi lib/pp.cmi kernel/names.cmi interp/genarg.cmi \
-    kernel/environ.cmi 
-translate/ppvernacnew.cmi: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo 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/extend.cmi \
-    kernel/environ.cmi parsing/coqast.cmi parsing/ast.cmi 
-contrib/cc/ccalgo.cmi: kernel/term.cmi kernel/names.cmi 
-contrib/cc/ccproof.cmi: kernel/names.cmi contrib/cc/ccalgo.cmi 
-contrib/correctness/past.cmi: lib/util.cmi interp/topconstr.cmi \
-    kernel/term.cmi kernel/names.cmi 
+toplevel/vernac.cmi: parsing/pcoq.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+translate/ppconstrnew.cmi: parsing/coqast.cmi kernel/environ.cmi \
+    parsing/extend.cmi interp/genarg.cmi library/libnames.cmi \
+    kernel/names.cmi pretyping/pattern.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 
+translate/pptacticnew.cmi: kernel/environ.cmi interp/genarg.cmi \
+    kernel/names.cmi lib/pp.cmi proofs/proof_type.cmi proofs/tacexpr.cmo \
+    interp/topconstr.cmi 
+translate/ppvernacnew.cmi: parsing/ast.cmi parsing/coqast.cmi \
+    kernel/environ.cmi parsing/extend.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 \
+    proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+contrib/cc/ccalgo.cmi: kernel/names.cmi kernel/term.cmi 
+contrib/cc/ccproof.cmi: contrib/cc/ccalgo.cmi kernel/names.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/pcicenv.cmi: kernel/term.cmi kernel/sign.cmi \
-    kernel/names.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/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/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 parsing/coqast.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 contrib/interface/translate.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 \
-    parsing/coqast.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/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: parsing/coqast.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 parsing/coqast.cmi kernel/declarations.cmi \
+    kernel/environ.cmi pretyping/evd.cmi kernel/inductive.cmi \
+    kernel/names.cmi proofs/pfedit.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi kernel/reduction.cmi \
+    contrib/interface/showproof_ct.cmo kernel/sign.cmi kernel/term.cmi \
+    contrib/interface/translate.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/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/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/uoptions.cmi 
 tools/coqdoc/output.cmi: tools/coqdoc/index.cmi 
 tools/coqdoc/pretty.cmi: 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: 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 kernel/names.cmi library/nameops.cmi \
-    library/libobject.cmi library/libnames.cmi pretyping/evd.cmi \
-    kernel/environ.cmi kernel/declarations.cmi interp/constrextern.cmi \
-    kernel/closure.cmi pretyping/clenv.cmi toplevel/cerrors.cmi \
-    lib/bigint.cmi parsing/ast.cmi 
-dev/top_printers.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 kernel/names.cmx library/nameops.cmx \
-    library/libobject.cmx library/libnames.cmx pretyping/evd.cmx \
-    kernel/environ.cmx kernel/declarations.cmx interp/constrextern.cmx \
-    kernel/closure.cmx pretyping/clenv.cmx toplevel/cerrors.cmx \
-    lib/bigint.cmx parsing/ast.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 
+dev/db_printers.cmo: kernel/names.cmi lib/pp.cmi 
+dev/db_printers.cmx: kernel/names.cmx lib/pp.cmx 
+dev/top_printers.cmo: parsing/ast.cmi lib/bigint.cmi toplevel/cerrors.cmi \
+    pretyping/clenv.cmi kernel/closure.cmi interp/constrextern.cmi \
+    kernel/declarations.cmi kernel/environ.cmi pretyping/evd.cmi \
+    library/libnames.cmi library/libobject.cmi library/nameops.cmi \
+    kernel/names.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/refiner.cmi kernel/sign.cmi lib/system.cmi \
+    parsing/tactic_printer.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/univ.cmi lib/util.cmi 
+dev/top_printers.cmx: parsing/ast.cmx lib/bigint.cmx toplevel/cerrors.cmx \
+    pretyping/clenv.cmx kernel/closure.cmx interp/constrextern.cmx \
+    kernel/declarations.cmx kernel/environ.cmx pretyping/evd.cmx \
+    library/libnames.cmx library/libobject.cmx library/nameops.cmx \
+    kernel/names.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/refiner.cmx kernel/sign.cmx lib/system.cmx \
+    parsing/tactic_printer.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/univ.cmx lib/util.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 
 doc/parse.cmo: parsing/ast.cmi 
 doc/parse.cmx: parsing/ast.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 \
+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/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/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/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 ide/preferences.cmi lib/pp_control.cmi \
-    lib/options.cmi config/coq_config.cmi ide/ideutils.cmi 
-ide/ideutils.cmx: ide/utf8_convert.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 ide/utils/configwin.cmi \
-    ide/config_lexer.cmo ide/preferences.cmi 
-ide/preferences.cmx: lib/util.cmx lib/system.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 ide/utf8_convert.cmo ide/ideutils.cmi 
+ide/ideutils.cmx: config/coq_config.cmx lib/options.cmx lib/pp_control.cmx \
+    ide/preferences.cmx ide/utf8_convert.cmx ide/ideutils.cmi 
+ide/preferences.cmo: ide/config_lexer.cmo ide/utils/configwin.cmi \
+    lib/system.cmi lib/util.cmi ide/preferences.cmi 
+ide/preferences.cmx: ide/config_lexer.cmx ide/utils/configwin.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 library/lib.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 library/lib.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 pretyping/retyping.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 kernel/inductive.cmi library/impargs.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/declarations.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 pretyping/retyping.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 kernel/inductive.cmx library/impargs.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    kernel/declarations.cmx lib/bigint.cmx interp/constrintern.cmi 
-interp/coqlib.cmo: lib/util.cmi kernel/term.cmi lib/pp.cmi \
-    pretyping/pattern.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi interp/constrextern.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/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/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/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/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 kernel/declarations.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    library/impargs.cmi kernel/inductive.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 pretyping/retyping.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 kernel/declarations.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    library/impargs.cmx kernel/inductive.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 pretyping/retyping.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: interp/constrextern.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi lib/pp.cmi kernel/term.cmi lib/util.cmi \
     interp/coqlib.cmi 
-interp/coqlib.cmx: lib/util.cmx kernel/term.cmx lib/pp.cmx \
-    pretyping/pattern.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx interp/constrextern.cmx \
+interp/coqlib.cmx: interp/constrextern.cmx library/libnames.cmx \
+    kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx lib/pp.cmx kernel/term.cmx lib/util.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/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 lib/options.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 lib/options.cmx kernel/names.cmx library/nameops.cmx \
-    library/libobject.cmx library/lib.cmx pretyping/evd.cmx \
-    interp/reserve.cmi 
-interp/symbols.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/symbols.cmi 
-interp/symbols.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/symbols.cmi 
-interp/syntax_def.cmo: lib/util.cmi interp/topconstr.cmi library/summary.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 \
-    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 lib/options.cmi kernel/names.cmi library/nameops.cmi \
-    kernel/mod_subst.cmi library/libnames.cmi pretyping/evd.cmi lib/dyn.cmi \
-    lib/bigint.cmi interp/topconstr.cmi 
-interp/topconstr.cmx: lib/util.cmx kernel/term.cmx pretyping/rawterm.cmx \
-    lib/pp.cmx lib/options.cmx kernel/names.cmx library/nameops.cmx \
-    kernel/mod_subst.cmx library/libnames.cmx pretyping/evd.cmx lib/dyn.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/names.cmi \
-    kernel/environ.cmi kernel/declarations.cmi kernel/cemitcodes.cmi \
-    kernel/cbytecodes.cmi kernel/cbytegen.cmi 
-kernel/cbytegen.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
-    kernel/environ.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 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 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/options.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/options.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 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 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/global.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi lib/options.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/global.cmx library/libnames.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx lib/options.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/environ.cmi kernel/names.cmi \
+    kernel/term.cmi lib/util.cmi kernel/cbytegen.cmi 
+kernel/cbytegen.cmx: kernel/cbytecodes.cmx kernel/cemitcodes.cmx \
+    kernel/declarations.cmx kernel/environ.cmx kernel/names.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/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/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/names.cmi \
-    kernel/environ.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/names.cmx \
-    kernel/environ.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/names.cmi kernel/declarations.cmi \
-    kernel/environ.cmi 
-kernel/environ.cmx: lib/util.cmx kernel/univ.cmx kernel/term.cmx \
-    kernel/sign.cmx kernel/names.cmx kernel/declarations.cmx \
-    kernel/environ.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/environ.cmi \
+    kernel/names.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/environ.cmx \
+    kernel/names.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/declarations.cmi kernel/names.cmi kernel/sign.cmi \
+    kernel/term.cmi kernel/univ.cmi lib/util.cmi kernel/environ.cmi 
+kernel/environ.cmx: kernel/declarations.cmx kernel/names.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/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/cbytegen.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/cbytegen.cmx kernel/mod_typing.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/cbytegen.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/cbytegen.cmx kernel/modops.cmi 
-kernel/names.cmo: lib/util.cmi lib/predicate.cmi lib/pp.cmi lib/options.cmi \
-    lib/hashcons.cmi kernel/names.cmi 
-kernel/names.cmx: lib/util.cmx lib/predicate.cmx lib/pp.cmx lib/options.cmx \
-    lib/hashcons.cmx kernel/names.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/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/cbytegen.cmi 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: kernel/cbytegen.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: 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/cbytegen.cmi 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/cbytegen.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/options.cmi lib/pp.cmi \
+    lib/predicate.cmi lib/util.cmi kernel/names.cmi 
+kernel/names.cmx: lib/hashcons.cmx lib/options.cmx lib/pp.cmx \
+    lib/predicate.cmx lib/util.cmx kernel/names.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/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/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/cbytegen.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/cbytegen.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/subtyping.cmo: kernel/declarations.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/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/cbytegen.cmi 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: kernel/cbytegen.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/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/cbytecodes.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/cbytecodes.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/cbytecodes.cmi 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/cbytecodes.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/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/gmapl.cmo: lib/util.cmi lib/gmap.cmi lib/gmapl.cmi 
-lib/gmapl.cmx: lib/util.cmx lib/gmap.cmx lib/gmapl.cmi 
 lib/gset.cmo: lib/gset.cmi 
 lib/gset.cmx: lib/gset.cmi 
 lib/hashcons.cmo: lib/hashcons.cmi 
@@ -857,2205 +845,2221 @@ lib/heap.cmo: lib/heap.cmi
 lib/heap.cmx: lib/heap.cmi 
 lib/options.cmo: lib/util.cmi lib/options.cmi 
 lib/options.cmx: lib/util.cmx lib/options.cmi 
-lib/pp.cmo: lib/pp_control.cmi lib/pp.cmi 
-lib/pp.cmx: lib/pp_control.cmx lib/pp.cmi 
 lib/pp_control.cmo: lib/pp_control.cmi 
 lib/pp_control.cmx: lib/pp_control.cmi 
+lib/pp.cmo: lib/pp_control.cmi lib/pp.cmi 
+lib/pp.cmx: lib/pp_control.cmx lib/pp.cmi 
 lib/predicate.cmo: lib/predicate.cmi 
 lib/predicate.cmx: lib/predicate.cmi 
 lib/profile.cmo: lib/profile.cmi 
 lib/profile.cmx: lib/profile.cmi 
-lib/rtree.cmo: lib/util.cmi lib/pp.cmi lib/rtree.cmi 
-lib/rtree.cmx: lib/util.cmx lib/pp.cmx lib/rtree.cmi 
-lib/stamps.cmo: lib/stamps.cmi 
-lib/stamps.cmx: lib/stamps.cmi 
-lib/system.cmo: lib/util.cmi lib/pp.cmi config/coq_config.cmi lib/system.cmi 
-lib/system.cmx: lib/util.cmx lib/pp.cmx config/coq_config.cmx lib/system.cmi 
-lib/tlm.cmo: lib/gset.cmi lib/gmap.cmi lib/tlm.cmi 
-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 
-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 kernel/declarations.cmi \
-    library/decl_kinds.cmo 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 kernel/declarations.cmx \
-    library/decl_kinds.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/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/declare.cmo: library/decl_kinds.cmo kernel/declarations.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: library/decl_kinds.cmx kernel/declarations.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/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 \
-    lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.cmi \
-    kernel/inductive.cmi library/global.cmi kernel/environ.cmi \
-    kernel/declarations.cmi library/impargs.cmi 
-library/impargs.cmx: lib/util.cmx interp/topconstr.cmx pretyping/termops.cmx \
-    kernel/term.cmx library/summary.cmx kernel/reduction.cmx lib/pp.cmx \
-    lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.cmx \
-    kernel/inductive.cmx library/global.cmx kernel/environ.cmx \
-    kernel/declarations.cmx library/impargs.cmi 
-library/lib.cmo: lib/util.cmi library/summary.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/lib.cmx: lib/util.cmx library/summary.cmx lib/pp.cmx lib/options.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libobject.cmx library/libnames.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/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/options.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: 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/options.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: library/libnames.cmi library/libobject.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi library/summary.cmi lib/util.cmi library/lib.cmi 
+library/lib.cmx: library/libnames.cmx library/libobject.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx library/summary.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 
-parsing/argextend.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    parsing/q_util.cmi parsing/q_coqast.cmo parsing/pcoq.cmi \
-    interp/genarg.cmi parsing/ast.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/ast.cmx 
-parsing/ast.cmo: lib/util.cmi interp/topconstr.cmi lib/pp.cmi \
-    kernel/names.cmi library/libnames.cmi interp/genarg.cmi lib/dyn.cmi \
-    parsing/coqast.cmi parsing/ast.cmi 
-parsing/ast.cmx: lib/util.cmx interp/topconstr.cmx lib/pp.cmx \
-    kernel/names.cmx library/libnames.cmx interp/genarg.cmx lib/dyn.cmx \
-    parsing/coqast.cmx parsing/ast.cmi 
-parsing/coqast.cmo: lib/util.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/libnames.cmi lib/hashcons.cmi lib/dyn.cmi parsing/coqast.cmi 
-parsing/coqast.cmx: lib/util.cmx kernel/names.cmx kernel/mod_subst.cmx \
-    library/libnames.cmx lib/hashcons.cmx lib/dyn.cmx parsing/coqast.cmi 
-parsing/egrammar.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo library/summary.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.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/ast.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: 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: parsing/ast.cmi interp/genarg.cmi parsing/pcoq.cmi \
+    parsing/q_coqast.cmo parsing/q_util.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/argextend.cmx: parsing/ast.cmx interp/genarg.cmx parsing/pcoq.cmx \
+    parsing/q_coqast.cmx parsing/q_util.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx 
+parsing/ast.cmo: parsing/coqast.cmi lib/dyn.cmi interp/genarg.cmi \
+    library/libnames.cmi kernel/names.cmi lib/pp.cmi interp/topconstr.cmi \
+    lib/util.cmi parsing/ast.cmi 
+parsing/ast.cmx: parsing/coqast.cmx lib/dyn.cmx interp/genarg.cmx \
+    library/libnames.cmx kernel/names.cmx lib/pp.cmx interp/topconstr.cmx \
+    lib/util.cmx parsing/ast.cmi 
+parsing/coqast.cmo: lib/dyn.cmi lib/hashcons.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi lib/util.cmi parsing/coqast.cmi 
+parsing/coqast.cmx: lib/dyn.cmx lib/hashcons.cmx library/libnames.cmx \
+    kernel/mod_subst.cmx kernel/names.cmx lib/util.cmx parsing/coqast.cmi 
+parsing/egrammar.cmo: parsing/ast.cmi lib/bigint.cmi parsing/extend.cmi \
+    interp/genarg.cmi parsing/lexer.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi interp/notation.cmi lib/options.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: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx proofs/tacexpr.cmx library/summary.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.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/ast.cmx \
+parsing/egrammar.cmx: parsing/ast.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 lib/options.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/esyntax.cmo: lib/util.cmi interp/topconstr.cmi interp/ppextend.cmi \
-    lib/pp.cmi lib/options.cmi interp/notation.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi lib/gmapl.cmi lib/gmap.cmi \
-    parsing/extend.cmi parsing/coqast.cmi parsing/ast.cmi parsing/esyntax.cmi 
-parsing/esyntax.cmx: lib/util.cmx interp/topconstr.cmx interp/ppextend.cmx \
-    lib/pp.cmx lib/options.cmx interp/notation.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx lib/gmapl.cmx lib/gmap.cmx \
-    parsing/extend.cmx parsing/coqast.cmx parsing/ast.cmx parsing/esyntax.cmi 
-parsing/extend.cmo: lib/util.cmi interp/topconstr.cmi 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/coqast.cmi parsing/ast.cmi parsing/extend.cmi 
-parsing/extend.cmx: lib/util.cmx interp/topconstr.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/coqast.cmx parsing/ast.cmx parsing/extend.cmi 
-parsing/g_basevernac.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    parsing/termast.cmi interp/ppextend.cmi lib/pp.cmi parsing/pcoq.cmi \
-    lib/options.cmi kernel/names.cmi toplevel/metasyntax.cmi \
-    parsing/lexer.cmi library/goptions.cmi library/global.cmi \
-    parsing/extend.cmi pretyping/evd.cmi parsing/coqast.cmi \
-    interp/constrintern.cmi parsing/ast.cmi 
-parsing/g_basevernac.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    parsing/termast.cmx interp/ppextend.cmx lib/pp.cmx parsing/pcoq.cmx \
-    lib/options.cmx kernel/names.cmx toplevel/metasyntax.cmx \
-    parsing/lexer.cmx library/goptions.cmx library/global.cmx \
-    parsing/extend.cmx pretyping/evd.cmx parsing/coqast.cmx \
-    interp/constrintern.cmx parsing/ast.cmx 
-parsing/g_cases.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    lib/pp.cmi parsing/pcoq.cmi lib/options.cmi library/libnames.cmi \
-    parsing/g_constr.cmo lib/bigint.cmi 
-parsing/g_cases.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
-    lib/pp.cmx parsing/pcoq.cmx lib/options.cmx library/libnames.cmx \
-    parsing/g_constr.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 pretyping/pattern.cmi \
-    lib/options.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 pretyping/pattern.cmx \
-    lib/options.cmx kernel/names.cmx library/libnames.cmx parsing/lexer.cmx \
-    lib/bigint.cmx 
-parsing/g_constrnew.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    kernel/names.cmi library/libnames.cmi parsing/lexer.cmi \
-    parsing/coqast.cmi lib/bigint.cmi 
-parsing/g_constrnew.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    kernel/names.cmx library/libnames.cmx parsing/lexer.cmx \
-    parsing/coqast.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 \
-    pretyping/pattern.cmi lib/options.cmi kernel/names.cmi \
-    library/libnames.cmi interp/genarg.cmi parsing/ast.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 \
-    pretyping/pattern.cmx lib/options.cmx kernel/names.cmx \
-    library/libnames.cmx interp/genarg.cmx parsing/ast.cmx 
-parsing/g_ltacnew.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo pretyping/rawterm.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.cmi kernel/names.cmi interp/genarg.cmi \
-    parsing/ast.cmi 
-parsing/g_ltacnew.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx proofs/tacexpr.cmx pretyping/rawterm.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.cmx kernel/names.cmx interp/genarg.cmx \
-    parsing/ast.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 \
+parsing/esyntax.cmo: parsing/ast.cmi parsing/coqast.cmi parsing/extend.cmi \
+    lib/gmap.cmi lib/gmapl.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi interp/notation.cmi lib/options.cmi lib/pp.cmi \
+    interp/ppextend.cmi interp/topconstr.cmi lib/util.cmi parsing/esyntax.cmi 
+parsing/esyntax.cmx: parsing/ast.cmx parsing/coqast.cmx parsing/extend.cmx \
+    lib/gmap.cmx lib/gmapl.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx interp/notation.cmx lib/options.cmx lib/pp.cmx \
+    interp/ppextend.cmx interp/topconstr.cmx lib/util.cmx parsing/esyntax.cmi 
+parsing/extend.cmo: parsing/ast.cmi parsing/coqast.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 interp/topconstr.cmi \
+    lib/util.cmi parsing/extend.cmi 
+parsing/extend.cmx: parsing/ast.cmx parsing/coqast.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 interp/topconstr.cmx \
+    lib/util.cmx parsing/extend.cmi 
+parsing/g_basevernac.cmo: parsing/ast.cmi interp/constrintern.cmi \
+    parsing/coqast.cmi pretyping/evd.cmi parsing/extend.cmi \
+    library/global.cmi library/goptions.cmi parsing/lexer.cmi \
+    toplevel/metasyntax.cmi kernel/names.cmi lib/options.cmi parsing/pcoq.cmi \
+    lib/pp.cmi interp/ppextend.cmi parsing/termast.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/g_basevernac.cmx: parsing/ast.cmx interp/constrintern.cmx \
+    parsing/coqast.cmx pretyping/evd.cmx parsing/extend.cmx \
+    library/global.cmx library/goptions.cmx parsing/lexer.cmx \
+    toplevel/metasyntax.cmx kernel/names.cmx lib/options.cmx parsing/pcoq.cmx \
+    lib/pp.cmx interp/ppextend.cmx parsing/termast.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx 
+parsing/g_cases.cmo: lib/bigint.cmi parsing/g_constr.cmo library/libnames.cmi \
+    lib/options.cmi parsing/pcoq.cmi lib/pp.cmi kernel/term.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/g_cases.cmx: lib/bigint.cmx parsing/g_constr.cmx library/libnames.cmx \
+    lib/options.cmx parsing/pcoq.cmx lib/pp.cmx kernel/term.cmx \
+    interp/topconstr.cmx lib/util.cmx 
+parsing/g_constr.cmo: lib/bigint.cmi parsing/lexer.cmi library/libnames.cmi \
+    kernel/names.cmi lib/options.cmi pretyping/pattern.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 lib/options.cmx pretyping/pattern.cmx parsing/pcoq.cmx \
+    lib/pp.cmx pretyping/rawterm.cmx kernel/term.cmx interp/topconstr.cmx \
+    lib/util.cmx 
+parsing/g_constrnew.cmo: lib/bigint.cmi parsing/coqast.cmi parsing/lexer.cmi \
+    library/libnames.cmi kernel/names.cmi lib/options.cmi parsing/pcoq.cmi \
+    lib/pp.cmi pretyping/rawterm.cmi kernel/term.cmi interp/topconstr.cmi \
+    lib/util.cmi 
+parsing/g_constrnew.cmx: lib/bigint.cmx parsing/coqast.cmx parsing/lexer.cmx \
+    library/libnames.cmx kernel/names.cmx lib/options.cmx parsing/pcoq.cmx \
+    lib/pp.cmx pretyping/rawterm.cmx kernel/term.cmx interp/topconstr.cmx \
+    lib/util.cmx 
+parsing/g_ltac.cmo: parsing/ast.cmi interp/genarg.cmi library/libnames.cmi \
+    kernel/names.cmi lib/options.cmi pretyping/pattern.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: parsing/ast.cmx interp/genarg.cmx library/libnames.cmx \
+    kernel/names.cmx lib/options.cmx pretyping/pattern.cmx parsing/pcoq.cmx \
+    lib/pp.cmx pretyping/rawterm.cmx proofs/tacexpr.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_ltacnew.cmo: parsing/ast.cmi interp/genarg.cmi kernel/names.cmi \
+    lib/options.cmi parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/g_ltacnew.cmx: parsing/ast.cmx interp/genarg.cmx kernel/names.cmx \
+    lib/options.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_module.cmo: lib/util.cmi interp/topconstr.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.cmi parsing/ast.cmi 
-parsing/g_module.cmx: lib/util.cmx interp/topconstr.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.cmx parsing/ast.cmx 
-parsing/g_natsyntax.cmo: lib/util.cmi parsing/termast.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    interp/notation.cmi kernel/names.cmi library/libnames.cmi \
-    parsing/extend.cmi parsing/esyntax.cmi interp/coqlib.cmi \
-    parsing/coqast.cmi lib/bigint.cmi parsing/ast.cmi parsing/g_natsyntax.cmi 
-parsing/g_natsyntax.cmx: lib/util.cmx parsing/termast.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    interp/notation.cmx kernel/names.cmx library/libnames.cmx \
-    parsing/extend.cmx parsing/esyntax.cmx interp/coqlib.cmx \
-    parsing/coqast.cmx lib/bigint.cmx parsing/ast.cmx parsing/g_natsyntax.cmi 
-parsing/g_prim.cmo: interp/topconstr.cmi parsing/pcoq.cmi library/nametab.cmi \
-    kernel/names.cmi library/libnames.cmi parsing/coqast.cmi lib/bigint.cmi 
-parsing/g_prim.cmx: interp/topconstr.cmx parsing/pcoq.cmx library/nametab.cmx \
-    kernel/names.cmx library/libnames.cmx parsing/coqast.cmx lib/bigint.cmx 
-parsing/g_primnew.cmo: lib/util.cmi interp/topconstr.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/libnames.cmi parsing/lexer.cmi parsing/coqast.cmi lib/bigint.cmi 
-parsing/g_primnew.cmx: lib/util.cmx interp/topconstr.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/libnames.cmx parsing/lexer.cmx parsing/coqast.cmx lib/bigint.cmx 
-parsing/g_proofs.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo lib/pp.cmi parsing/pcoq.cmi \
-    lib/options.cmi interp/genarg.cmi 
-parsing/g_proofs.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx proofs/tacexpr.cmx lib/pp.cmx parsing/pcoq.cmx \
-    lib/options.cmx interp/genarg.cmx 
-parsing/g_proofsnew.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi proofs/tacexpr.cmo lib/pp.cmi parsing/pcoq.cmi \
-    lib/options.cmi interp/genarg.cmi parsing/g_vernacnew.cmo 
-parsing/g_proofsnew.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx proofs/tacexpr.cmx lib/pp.cmx parsing/pcoq.cmx \
-    lib/options.cmx interp/genarg.cmx parsing/g_vernacnew.cmx 
-parsing/g_rsyntax.cmo: lib/util.cmi interp/topconstr.cmi parsing/termast.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    interp/notation.cmi library/nametab.cmi kernel/names.cmi \
-    library/libnames.cmi parsing/extend.cmi parsing/esyntax.cmi \
-    parsing/coqast.cmi lib/bigint.cmi parsing/ast.cmi 
-parsing/g_rsyntax.cmx: lib/util.cmx interp/topconstr.cmx parsing/termast.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    interp/notation.cmx library/nametab.cmx kernel/names.cmx \
-    library/libnames.cmx parsing/extend.cmx parsing/esyntax.cmx \
-    parsing/coqast.cmx lib/bigint.cmx parsing/ast.cmx 
-parsing/g_tactic.cmo: lib/util.cmi interp/topconstr.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi pretyping/pattern.cmi \
-    lib/options.cmi kernel/names.cmi library/libnames.cmi parsing/lexer.cmi \
-    interp/genarg.cmi parsing/ast.cmi 
-parsing/g_tactic.cmx: lib/util.cmx interp/topconstr.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx pretyping/pattern.cmx \
-    lib/options.cmx kernel/names.cmx library/libnames.cmx parsing/lexer.cmx \
-    interp/genarg.cmx parsing/ast.cmx 
-parsing/g_tacticnew.cmo: lib/util.cmi interp/topconstr.cmi proofs/tacexpr.cmo \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    kernel/names.cmi parsing/lexer.cmi interp/genarg.cmi parsing/ast.cmi 
-parsing/g_tacticnew.cmx: lib/util.cmx interp/topconstr.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    kernel/names.cmx parsing/lexer.cmx interp/genarg.cmx parsing/ast.cmx 
-parsing/g_vernac.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi toplevel/recordobj.cmi lib/pp.cmi parsing/pcoq.cmi \
-    lib/options.cmi kernel/names.cmi library/goptions.cmi interp/genarg.cmi \
-    parsing/g_proofs.cmo parsing/g_basevernac.cmo library/decl_kinds.cmo \
-    toplevel/class.cmi parsing/ast.cmi 
-parsing/g_vernac.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx toplevel/recordobj.cmx lib/pp.cmx parsing/pcoq.cmx \
-    lib/options.cmx kernel/names.cmx library/goptions.cmx interp/genarg.cmx \
-    parsing/g_proofs.cmx parsing/g_basevernac.cmx library/decl_kinds.cmx \
-    toplevel/class.cmx parsing/ast.cmx 
-parsing/g_vernacnew.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi toplevel/recordobj.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_constrnew.cmo parsing/extend.cmi \
-    parsing/egrammar.cmi library/decl_kinds.cmo parsing/coqast.cmi \
-    toplevel/class.cmi parsing/ast.cmi 
-parsing/g_vernacnew.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx toplevel/recordobj.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_constrnew.cmx parsing/extend.cmx \
-    parsing/egrammar.cmx library/decl_kinds.cmx parsing/coqast.cmx \
-    toplevel/class.cmx parsing/ast.cmx 
-parsing/g_zsyntax.cmo: lib/util.cmi interp/topconstr.cmi parsing/termast.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    interp/notation.cmi kernel/names.cmi library/libnames.cmi \
-    parsing/extend.cmi parsing/esyntax.cmi interp/coqlib.cmi \
-    parsing/coqast.cmi lib/bigint.cmi parsing/ast.cmi parsing/g_zsyntax.cmi 
-parsing/g_zsyntax.cmx: lib/util.cmx interp/topconstr.cmx parsing/termast.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    interp/notation.cmx kernel/names.cmx library/libnames.cmx \
-    parsing/extend.cmx parsing/esyntax.cmx interp/coqlib.cmx \
-    parsing/coqast.cmx lib/bigint.cmx parsing/ast.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/coqast.cmi \
-    parsing/ast.cmi 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/coqast.cmx \
-    parsing/ast.cmx parsing/pcoq.cmi 
-parsing/ppconstr.cmo: lib/util.cmi kernel/univ.cmi interp/topconstr.cmi \
-    kernel/term.cmi pretyping/rawterm.cmi interp/ppextend.cmi lib/pp.cmi \
-    pretyping/pattern.cmi interp/notation.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    interp/genarg.cmi pretyping/evd.cmi parsing/coqast.cmi \
-    interp/constrextern.cmi lib/bigint.cmi parsing/ast.cmi \
-    parsing/ppconstr.cmi 
-parsing/ppconstr.cmx: lib/util.cmx kernel/univ.cmx interp/topconstr.cmx \
-    kernel/term.cmx pretyping/rawterm.cmx interp/ppextend.cmx lib/pp.cmx \
-    pretyping/pattern.cmx interp/notation.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    interp/genarg.cmx pretyping/evd.cmx parsing/coqast.cmx \
-    interp/constrextern.cmx lib/bigint.cmx parsing/ast.cmx \
-    parsing/ppconstr.cmi 
-parsing/pptactic.cmo: lib/util.cmi interp/topconstr.cmi kernel/term.cmi \
-    proofs/tacexpr.cmo pretyping/rawterm.cmi parsing/printer.cmi \
-    translate/ppconstrnew.cmi parsing/ppconstr.cmi lib/pp.cmi \
-    pretyping/pattern.cmi lib/options.cmi library/nametab.cmi \
-    kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    interp/genarg.cmi parsing/extend.cmi lib/dyn.cmi interp/constrextern.cmi \
-    kernel/closure.cmi parsing/pptactic.cmi 
-parsing/pptactic.cmx: lib/util.cmx interp/topconstr.cmx kernel/term.cmx \
-    proofs/tacexpr.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    translate/ppconstrnew.cmx parsing/ppconstr.cmx lib/pp.cmx \
-    pretyping/pattern.cmx lib/options.cmx library/nametab.cmx \
-    kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    interp/genarg.cmx parsing/extend.cmx lib/dyn.cmx interp/constrextern.cmx \
-    kernel/closure.cmx parsing/pptactic.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 parsing/printmod.cmi \
-    parsing/printer.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 \
-    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 parsing/printmod.cmx \
-    parsing/printer.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 \
-    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 parsing/termast.cmi \
-    kernel/term.cmi kernel/sign.cmi proofs/refiner.cmi proofs/proof_type.cmi \
-    interp/ppextend.cmi translate/ppconstrnew.cmi parsing/ppconstr.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 parsing/extend.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi parsing/esyntax.cmi \
-    kernel/environ.cmi lib/dyn.cmi library/declare.cmi parsing/coqast.cmi \
-    interp/constrextern.cmi parsing/ast.cmi parsing/printer.cmi 
-parsing/printer.cmx: lib/util.cmx pretyping/termops.cmx parsing/termast.cmx \
-    kernel/term.cmx kernel/sign.cmx proofs/refiner.cmx proofs/proof_type.cmx \
-    interp/ppextend.cmx translate/ppconstrnew.cmx parsing/ppconstr.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 parsing/extend.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx parsing/esyntax.cmx \
-    kernel/environ.cmx lib/dyn.cmx library/declare.cmx parsing/coqast.cmx \
-    interp/constrextern.cmx parsing/ast.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_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/coqast.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/coqast.cmx 
+parsing/g_module.cmo: parsing/ast.cmi lib/options.cmi parsing/pcoq.cmi \
+    lib/pp.cmi interp/topconstr.cmi lib/util.cmi 
+parsing/g_module.cmx: parsing/ast.cmx lib/options.cmx parsing/pcoq.cmx \
+    lib/pp.cmx interp/topconstr.cmx lib/util.cmx 
+parsing/g_natsyntax.cmo: parsing/ast.cmi lib/bigint.cmi parsing/coqast.cmi \
+    interp/coqlib.cmi parsing/esyntax.cmi parsing/extend.cmi \
+    library/libnames.cmi kernel/names.cmi interp/notation.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi parsing/termast.cmi \
+    lib/util.cmi parsing/g_natsyntax.cmi 
+parsing/g_natsyntax.cmx: parsing/ast.cmx lib/bigint.cmx parsing/coqast.cmx \
+    interp/coqlib.cmx parsing/esyntax.cmx parsing/extend.cmx \
+    library/libnames.cmx kernel/names.cmx interp/notation.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx parsing/termast.cmx \
+    lib/util.cmx parsing/g_natsyntax.cmi 
+parsing/g_prim.cmo: lib/bigint.cmi parsing/coqast.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi parsing/pcoq.cmi \
+    interp/topconstr.cmi 
+parsing/g_prim.cmx: lib/bigint.cmx parsing/coqast.cmx library/libnames.cmx \
+    kernel/names.cmx library/nametab.cmx parsing/pcoq.cmx \
+    interp/topconstr.cmx 
+parsing/g_primnew.cmo: lib/bigint.cmi parsing/coqast.cmi parsing/lexer.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi interp/topconstr.cmi lib/util.cmi 
+parsing/g_primnew.cmx: lib/bigint.cmx parsing/coqast.cmx parsing/lexer.cmx \
+    library/libnames.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx interp/topconstr.cmx lib/util.cmx 
+parsing/g_proofs.cmo: interp/genarg.cmi lib/options.cmi parsing/pcoq.cmi \
+    lib/pp.cmi proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/g_proofs.cmx: interp/genarg.cmx lib/options.cmx parsing/pcoq.cmx \
+    lib/pp.cmx proofs/tacexpr.cmx interp/topconstr.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx 
+parsing/g_proofsnew.cmo: parsing/g_vernacnew.cmo interp/genarg.cmi \
+    lib/options.cmi parsing/pcoq.cmi lib/pp.cmi proofs/tacexpr.cmo \
+    interp/topconstr.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/g_proofsnew.cmx: parsing/g_vernacnew.cmx interp/genarg.cmx \
+    lib/options.cmx parsing/pcoq.cmx lib/pp.cmx proofs/tacexpr.cmx \
+    interp/topconstr.cmx lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_rsyntax.cmo: parsing/ast.cmi lib/bigint.cmi parsing/coqast.cmi \
+    parsing/esyntax.cmi parsing/extend.cmi library/libnames.cmi \
+    kernel/names.cmi library/nametab.cmi interp/notation.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi parsing/termast.cmi \
+    interp/topconstr.cmi lib/util.cmi 
+parsing/g_rsyntax.cmx: parsing/ast.cmx lib/bigint.cmx parsing/coqast.cmx \
+    parsing/esyntax.cmx parsing/extend.cmx library/libnames.cmx \
+    kernel/names.cmx library/nametab.cmx interp/notation.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx parsing/termast.cmx \
+    interp/topconstr.cmx lib/util.cmx 
+parsing/g_tactic.cmo: parsing/ast.cmi interp/genarg.cmi parsing/lexer.cmi \
+    library/libnames.cmi kernel/names.cmi lib/options.cmi \
+    pretyping/pattern.cmi parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo interp/topconstr.cmi lib/util.cmi 
+parsing/g_tactic.cmx: parsing/ast.cmx interp/genarg.cmx parsing/lexer.cmx \
+    library/libnames.cmx kernel/names.cmx lib/options.cmx \
+    pretyping/pattern.cmx parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx interp/topconstr.cmx lib/util.cmx 
+parsing/g_tacticnew.cmo: parsing/ast.cmi interp/genarg.cmi parsing/lexer.cmi \
+    kernel/names.cmi lib/options.cmi parsing/pcoq.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi proofs/tacexpr.cmo interp/topconstr.cmi \
+    lib/util.cmi 
+parsing/g_tacticnew.cmx: parsing/ast.cmx interp/genarg.cmx parsing/lexer.cmx \
+    kernel/names.cmx lib/options.cmx parsing/pcoq.cmx lib/pp.cmx \
+    pretyping/rawterm.cmx proofs/tacexpr.cmx interp/topconstr.cmx \
+    lib/util.cmx 
+parsing/g_vernac.cmo: parsing/ast.cmi toplevel/class.cmi \
+    library/decl_kinds.cmo parsing/g_basevernac.cmo parsing/g_proofs.cmo \
+    interp/genarg.cmi library/goptions.cmi kernel/names.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi toplevel/recordobj.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/g_vernac.cmx: parsing/ast.cmx toplevel/class.cmx \
+    library/decl_kinds.cmx parsing/g_basevernac.cmx parsing/g_proofs.cmx \
+    interp/genarg.cmx library/goptions.cmx kernel/names.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx toplevel/recordobj.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_vernacnew.cmo: parsing/ast.cmi toplevel/class.cmi \
+    parsing/coqast.cmi library/decl_kinds.cmo parsing/egrammar.cmi \
+    parsing/extend.cmi parsing/g_constrnew.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 toplevel/recordobj.cmi interp/topconstr.cmi \
+    lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/g_vernacnew.cmx: parsing/ast.cmx toplevel/class.cmx \
+    parsing/coqast.cmx library/decl_kinds.cmx parsing/egrammar.cmx \
+    parsing/extend.cmx parsing/g_constrnew.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 toplevel/recordobj.cmx interp/topconstr.cmx \
+    lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/g_zsyntax.cmo: parsing/ast.cmi lib/bigint.cmi parsing/coqast.cmi \
+    interp/coqlib.cmi parsing/esyntax.cmi parsing/extend.cmi \
+    library/libnames.cmi kernel/names.cmi interp/notation.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi pretyping/rawterm.cmi parsing/termast.cmi \
+    interp/topconstr.cmi lib/util.cmi parsing/g_zsyntax.cmi 
+parsing/g_zsyntax.cmx: parsing/ast.cmx lib/bigint.cmx parsing/coqast.cmx \
+    interp/coqlib.cmx parsing/esyntax.cmx parsing/extend.cmx \
+    library/libnames.cmx kernel/names.cmx interp/notation.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx pretyping/rawterm.cmx parsing/termast.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: parsing/ast.cmi parsing/coqast.cmi 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: parsing/ast.cmx parsing/coqast.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: parsing/ast.cmi lib/bigint.cmi interp/constrextern.cmi \
+    parsing/coqast.cmi pretyping/evd.cmi interp/genarg.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi interp/notation.cmi pretyping/pattern.cmi lib/pp.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi kernel/term.cmi \
+    interp/topconstr.cmi kernel/univ.cmi lib/util.cmi parsing/ppconstr.cmi 
+parsing/ppconstr.cmx: parsing/ast.cmx lib/bigint.cmx interp/constrextern.cmx \
+    parsing/coqast.cmx pretyping/evd.cmx interp/genarg.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx interp/notation.cmx pretyping/pattern.cmx lib/pp.cmx \
+    interp/ppextend.cmx pretyping/rawterm.cmx kernel/term.cmx \
+    interp/topconstr.cmx kernel/univ.cmx lib/util.cmx parsing/ppconstr.cmi 
+parsing/pptactic.cmo: kernel/closure.cmi interp/constrextern.cmi lib/dyn.cmi \
+    parsing/extend.cmi interp/genarg.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi lib/pp.cmi parsing/ppconstr.cmi \
+    translate/ppconstrnew.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
+    parsing/pptactic.cmi 
+parsing/pptactic.cmx: kernel/closure.cmx interp/constrextern.cmx lib/dyn.cmx \
+    parsing/extend.cmx interp/genarg.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx lib/pp.cmx parsing/ppconstr.cmx \
+    translate/ppconstrnew.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx kernel/term.cmx interp/topconstr.cmx lib/util.cmx \
+    parsing/pptactic.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/options.cmi lib/pp.cmi parsing/printer.cmi \
+    parsing/printmod.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/options.cmx lib/pp.cmx parsing/printer.cmx \
+    parsing/printmod.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: parsing/ast.cmi interp/constrextern.cmi \
+    parsing/coqast.cmi library/declare.cmi lib/dyn.cmi kernel/environ.cmi \
+    parsing/esyntax.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
+    parsing/extend.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 parsing/ppconstr.cmi \
+    translate/ppconstrnew.cmi interp/ppextend.cmi proofs/proof_type.cmi \
+    proofs/refiner.cmi kernel/sign.cmi kernel/term.cmi parsing/termast.cmi \
+    pretyping/termops.cmi lib/util.cmi parsing/printer.cmi 
+parsing/printer.cmx: parsing/ast.cmx interp/constrextern.cmx \
+    parsing/coqast.cmx library/declare.cmx lib/dyn.cmx kernel/environ.cmx \
+    parsing/esyntax.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
+    parsing/extend.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 parsing/ppconstr.cmx \
+    translate/ppconstrnew.cmx interp/ppextend.cmx proofs/proof_type.cmx \
+    proofs/refiner.cmx kernel/sign.cmx kernel/term.cmx parsing/termast.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_coqast.cmo: parsing/coqast.cmi 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: parsing/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: lib/util.cmi parsing/q_util.cmi 
 parsing/q_util.cmx: lib/util.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/library.cmi \
-    library/libobject.cmi library/libnames.cmi kernel/inductive.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    library/declaremods.cmi library/declare.cmi kernel/declarations.cmi \
-    interp/coqlib.cmi parsing/coqast.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/library.cmx \
-    library/libobject.cmx library/libnames.cmx kernel/inductive.cmx \
-    library/global.cmx pretyping/evd.cmx kernel/environ.cmx \
-    library/declaremods.cmx library/declare.cmx kernel/declarations.cmx \
-    interp/coqlib.cmx parsing/coqast.cmx parsing/search.cmi 
-parsing/tacextend.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    parsing/q_util.cmi parsing/q_coqast.cmo lib/pp_control.cmi lib/pp.cmi \
-    parsing/pcoq.cmi interp/genarg.cmi parsing/argextend.cmo 
-parsing/tacextend.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    parsing/q_util.cmx parsing/q_coqast.cmx lib/pp_control.cmx lib/pp.cmx \
-    parsing/pcoq.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 translate/pptacticnew.cmi parsing/pptactic.cmi \
-    lib/pp.cmi lib/options.cmi proofs/logic.cmi library/global.cmi \
-    pretyping/evd.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 translate/pptacticnew.cmx parsing/pptactic.cmx \
-    lib/pp.cmx lib/options.cmx proofs/logic.cmx library/global.cmx \
-    pretyping/evd.cmx parsing/tactic_printer.cmi 
-parsing/termast.cmo: lib/util.cmi kernel/univ.cmi pretyping/termops.cmi \
-    kernel/term.cmi kernel/sign.cmi pretyping/reductionops.cmi \
-    pretyping/rawterm.cmi lib/pp.cmi pretyping/pattern.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/libnames.cmi kernel/inductive.cmi library/impargs.cmi \
-    kernel/environ.cmi pretyping/detyping.cmi library/declare.cmi \
-    parsing/coqast.cmi interp/constrextern.cmi pretyping/classops.cmi \
-    parsing/ast.cmi parsing/termast.cmi 
-parsing/termast.cmx: lib/util.cmx kernel/univ.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/sign.cmx pretyping/reductionops.cmx \
-    pretyping/rawterm.cmx lib/pp.cmx pretyping/pattern.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/libnames.cmx kernel/inductive.cmx library/impargs.cmx \
-    kernel/environ.cmx pretyping/detyping.cmx library/declare.cmx \
-    parsing/coqast.cmx interp/constrextern.cmx pretyping/classops.cmx \
-    parsing/ast.cmx parsing/termast.cmi 
-parsing/vernacextend.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    parsing/q_util.cmi parsing/q_coqast.cmo lib/pp_control.cmi lib/pp.cmi \
-    parsing/pcoq.cmi interp/genarg.cmi parsing/ast.cmi parsing/argextend.cmo 
-parsing/vernacextend.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    parsing/q_util.cmx parsing/q_coqast.cmx lib/pp_control.cmx lib/pp.cmx \
-    parsing/pcoq.cmx interp/genarg.cmx parsing/ast.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/search.cmo: parsing/coqast.cmi interp/coqlib.cmi \
+    kernel/declarations.cmi library/declare.cmi library/declaremods.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    kernel/inductive.cmi library/libnames.cmi library/libobject.cmi \
+    library/library.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: parsing/coqast.cmx interp/coqlib.cmx \
+    kernel/declarations.cmx library/declare.cmx library/declaremods.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    kernel/inductive.cmx library/libnames.cmx library/libobject.cmx \
+    library/library.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 \
+    parsing/pcoq.cmi lib/pp.cmi lib/pp_control.cmi parsing/q_coqast.cmo \
+    parsing/q_util.cmi lib/util.cmi toplevel/vernacexpr.cmo 
+parsing/tacextend.cmx: parsing/argextend.cmx interp/genarg.cmx \
+    parsing/pcoq.cmx lib/pp.cmx lib/pp_control.cmx parsing/q_coqast.cmx \
+    parsing/q_util.cmx lib/util.cmx toplevel/vernacexpr.cmx 
+parsing/tactic_printer.cmo: pretyping/evd.cmi library/global.cmi \
+    proofs/logic.cmi lib/options.cmi lib/pp.cmi parsing/pptactic.cmi \
+    translate/pptacticnew.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: pretyping/evd.cmx library/global.cmx \
+    proofs/logic.cmx lib/options.cmx lib/pp.cmx parsing/pptactic.cmx \
+    translate/pptacticnew.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/termast.cmo: parsing/ast.cmi pretyping/classops.cmi \
+    interp/constrextern.cmi parsing/coqast.cmi library/declare.cmi \
+    pretyping/detyping.cmi kernel/environ.cmi library/global.cmi \
+    library/impargs.cmi kernel/inductive.cmi library/libnames.cmi \
+    kernel/mod_subst.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi pretyping/pattern.cmi lib/pp.cmi \
+    pretyping/rawterm.cmi pretyping/reductionops.cmi kernel/sign.cmi \
+    kernel/term.cmi pretyping/termops.cmi kernel/univ.cmi lib/util.cmi \
+    parsing/termast.cmi 
+parsing/termast.cmx: parsing/ast.cmx pretyping/classops.cmx \
+    interp/constrextern.cmx parsing/coqast.cmx library/declare.cmx \
+    pretyping/detyping.cmx kernel/environ.cmx library/global.cmx \
+    library/impargs.cmx kernel/inductive.cmx library/libnames.cmx \
+    kernel/mod_subst.cmx library/nameops.cmx kernel/names.cmx \
+    library/nametab.cmx pretyping/pattern.cmx lib/pp.cmx \
+    pretyping/rawterm.cmx pretyping/reductionops.cmx kernel/sign.cmx \
+    kernel/term.cmx pretyping/termops.cmx kernel/univ.cmx lib/util.cmx \
+    parsing/termast.cmi 
+parsing/vernacextend.cmo: parsing/argextend.cmo parsing/ast.cmi \
+    interp/genarg.cmi parsing/pcoq.cmi lib/pp.cmi lib/pp_control.cmi \
+    parsing/q_coqast.cmo parsing/q_util.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+parsing/vernacextend.cmx: parsing/argextend.cmx parsing/ast.cmx \
+    interp/genarg.cmx parsing/pcoq.cmx lib/pp.cmx lib/pp_control.cmx \
+    parsing/q_coqast.cmx parsing/q_util.cmx lib/util.cmx \
+    toplevel/vernacexpr.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 kernel/type_errors.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 kernel/type_errors.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 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 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/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 \
-    kernel/indtypes.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/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 \
-    kernel/indtypes.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/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/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 \
-    lib/options.cmi kernel/names.cmi library/nameops.cmi library/libnames.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.cmi pretyping/indrec.cmi \
-    library/global.cmi pretyping/evd.cmi pretyping/evarutil.cmi \
-    pretyping/evarconv.cmi kernel/environ.cmi lib/dyn.cmi \
-    pretyping/detyping.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 \
-    lib/options.cmx kernel/names.cmx library/nameops.cmx library/libnames.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.cmx pretyping/indrec.cmx \
-    library/global.cmx pretyping/evd.cmx pretyping/evarutil.cmx \
-    pretyping/evarconv.cmx kernel/environ.cmx lib/dyn.cmx \
-    pretyping/detyping.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 kernel/mod_subst.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 kernel/mod_subst.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 lib/pp.cmi \
-    library/nametab.cmi kernel/names.cmi kernel/mod_subst.cmi \
-    library/library.cmi library/libobject.cmi library/libnames.cmi \
-    library/lib.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 lib/pp.cmx \
-    library/nametab.cmx kernel/names.cmx kernel/mod_subst.cmx \
-    library/library.cmx library/libobject.cmx library/libnames.cmx \
-    library/lib.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 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/tacred.cmi 
-pretyping/tacred.cmx: lib/util.cmx pretyping/typing.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.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 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 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 library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    pretyping/inductiveops.cmi kernel/inductive.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 library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    pretyping/inductiveops.cmx kernel/inductive.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/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/type_errors.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/type_errors.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 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 lib/util.cmx pretyping/evd.cmi 
+pretyping/indrec.cmo: kernel/declarations.cmi kernel/entries.cmi \
+    kernel/environ.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 kernel/reduction.cmi pretyping/reductionops.cmi \
+    kernel/safe_typing.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/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 kernel/reduction.cmx pretyping/reductionops.cmx \
+    kernel/safe_typing.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/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/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 pretyping/detyping.cmi \
+    lib/dyn.cmi kernel/environ.cmi pretyping/evarconv.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
+    pretyping/indrec.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi lib/options.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 pretyping/detyping.cmx \
+    lib/dyn.cmx kernel/environ.cmx pretyping/evarconv.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx library/global.cmx \
+    pretyping/indrec.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/libnames.cmx library/nameops.cmx kernel/names.cmx lib/options.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 library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    kernel/mod_subst.cmi kernel/names.cmi library/nametab.cmi lib/pp.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 library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    kernel/mod_subst.cmx kernel/names.cmx library/nametab.cmx lib/pp.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 \
+    pretyping/typing.cmi lib/util.cmi pretyping/tacred.cmi 
+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 \
+    pretyping/typing.cmx lib/util.cmx pretyping/tacred.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 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 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 kernel/inductive.cmi pretyping/inductiveops.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.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 kernel/inductive.cmx pretyping/inductiveops.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.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 translate/pptacticnew.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 library/global.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 translate/pptacticnew.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 library/global.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 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 \
-    parsing/coqast.cmi parsing/ast.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 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 \
-    parsing/coqast.cmx parsing/ast.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 \
-    parsing/ast.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 \
-    parsing/ast.cmx tactics/dhyp.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 \
+    library/global.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 \
+    translate/pptacticnew.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 \
+    library/global.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 \
+    translate/pptacticnew.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: parsing/ast.cmi parsing/coqast.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 tactics/tacticals.cmi \
+    tactics/tactics.cmi kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi tactics/autorewrite.cmi 
+tactics/autorewrite.cmx: parsing/ast.cmx parsing/coqast.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 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: parsing/ast.cmi pretyping/clenv.cmi interp/constrintern.cmi \
+    kernel/environ.cmi pretyping/evd.cmi library/global.cmi library/lib.cmi \
+    library/libnames.cmi library/libobject.cmi library/library.cmi \
+    pretyping/matching.cmi kernel/names.cmi tactics/nbtermdn.cmi \
+    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: parsing/ast.cmx pretyping/clenv.cmx interp/constrintern.cmx \
+    kernel/environ.cmx pretyping/evd.cmx library/global.cmx library/lib.cmx \
+    library/libnames.cmx library/libobject.cmx library/library.cmx \
+    pretyping/matching.cmx kernel/names.cmx tactics/nbtermdn.cmx \
+    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 lib/options.cmi \
-    kernel/names.cmi library/nameops.cmi proofs/logic.cmi library/global.cmi \
-    interp/genarg.cmi parsing/extend.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 lib/options.cmx \
-    kernel/names.cmx library/nameops.cmx proofs/logic.cmx library/global.cmx \
-    interp/genarg.cmx parsing/extend.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 lib/options.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 lib/options.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 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 tactics/evar_tactics.cmi 
-tactics/extraargs.cmo: lib/util.cmi tactics/tacinterp.cmi proofs/tacexpr.cmo \
-    tactics/setoid_replace.cmi parsing/pptactic.cmi parsing/ppconstr.cmi \
-    lib/pp.cmi parsing/pcoq.cmi kernel/names.cmi library/nameops.cmi \
-    toplevel/metasyntax.cmi interp/genarg.cmi parsing/extend.cmi \
-    tactics/extraargs.cmi 
-tactics/extraargs.cmx: lib/util.cmx tactics/tacinterp.cmx proofs/tacexpr.cmx \
-    tactics/setoid_replace.cmx parsing/pptactic.cmx parsing/ppconstr.cmx \
-    lib/pp.cmx parsing/pcoq.cmx kernel/names.cmx library/nameops.cmx \
-    toplevel/metasyntax.cmx interp/genarg.cmx parsing/extend.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 \
-    lib/options.cmi library/nametab.cmi kernel/names.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/eauto.cmo: tactics/auto.cmi toplevel/cerrors.cmi pretyping/clenv.cmi \
+    proofs/clenvtac.cmi kernel/declarations.cmi parsing/egrammar.cmi \
+    proofs/evar_refiner.cmi lib/explore.cmi parsing/extend.cmi \
+    interp/genarg.cmi library/global.cmi proofs/logic.cmi library/nameops.cmi \
+    kernel/names.cmi lib/options.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 parsing/extend.cmx \
+    interp/genarg.cmx library/global.cmx proofs/logic.cmx library/nameops.cmx \
+    kernel/names.cmx lib/options.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 lib/options.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 lib/options.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: 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: 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: parsing/extend.cmi interp/genarg.cmi \
+    toplevel/metasyntax.cmi library/nameops.cmi kernel/names.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/ppconstr.cmi parsing/pptactic.cmi \
+    tactics/setoid_replace.cmi proofs/tacexpr.cmo tactics/tacinterp.cmi \
+    lib/util.cmi tactics/extraargs.cmi 
+tactics/extraargs.cmx: parsing/extend.cmx interp/genarg.cmx \
+    toplevel/metasyntax.cmx library/nameops.cmx kernel/names.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/ppconstr.cmx parsing/pptactic.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 library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi kernel/mod_subst.cmi kernel/names.cmi \
+    lib/options.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: 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 \
-    lib/options.cmx library/nametab.cmx kernel/names.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.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 library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx kernel/mod_subst.cmx kernel/names.cmx \
+    lib/options.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: 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 \
-    proofs/proof_trees.cmi lib/pp.cmi pretyping/pattern.cmi kernel/names.cmi \
-    library/nameops.cmi pretyping/matching.cmi pretyping/inductiveops.cmi \
-    library/global.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/declarations.cmi interp/coqlib.cmi pretyping/clenv.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 pretyping/matching.cmi \
+    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
+    proofs/proof_trees.cmi pretyping/reductionops.cmi proofs/tacmach.cmi \
+    tactics/tacticals.cmi kernel/term.cmi pretyping/termops.cmi lib/util.cmi \
     tactics/hipattern.cmi 
-tactics/hipattern.cmx: lib/util.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tacticals.cmx proofs/tacmach.cmx pretyping/reductionops.cmx \
-    proofs/proof_trees.cmx lib/pp.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/nameops.cmx pretyping/matching.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 pretyping/matching.cmx \
+    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
+    proofs/proof_trees.cmx pretyping/reductionops.cmx proofs/tacmach.cmx \
+    tactics/tacticals.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     tactics/hipattern.cmi 
-tactics/inv.cmo: 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 \
-    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/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 \
-    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.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 \
-    kernel/reduction.cmi parsing/printer.cmi lib/pp.cmi kernel/names.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.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/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: 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/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: 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 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: 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 \
-    kernel/reduction.cmx parsing/printer.cmx lib/pp.cmx kernel/names.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx kernel/environ.cmx \
+tactics/refine.cmx: kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
+    kernel/reduction.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
+    kernel/term.cmx pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     tactics/refine.cmi 
-tactics/setoid_replace.cmo: 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 \
-    translate/ppconstrnew.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 \
-    translate/ppconstrnew.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 interp/syntax_def.cmi library/summary.cmi \
-    kernel/sign.cmi kernel/safe_typing.cmi pretyping/retyping.cmi \
-    proofs/refiner.cmi pretyping/rawterm.cmi proofs/proof_type.cmi \
-    parsing/printer.cmi pretyping/pretyping.cmi pretyping/pretype_errors.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 tactics/hiddentac.cmi lib/gmap.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.cmi kernel/environ.cmi \
-    kernel/entries.cmi tactics/elim.cmi lib/dyn.cmi tactics/dhyp.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo parsing/coqast.cmi \
-    interp/constrintern.cmi kernel/closure.cmi tactics/auto.cmi \
-    parsing/ast.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 interp/syntax_def.cmx library/summary.cmx \
-    kernel/sign.cmx kernel/safe_typing.cmx pretyping/retyping.cmx \
-    proofs/refiner.cmx pretyping/rawterm.cmx proofs/proof_type.cmx \
-    parsing/printer.cmx pretyping/pretyping.cmx pretyping/pretype_errors.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 tactics/hiddentac.cmx lib/gmap.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.cmx kernel/environ.cmx \
-    kernel/entries.cmx tactics/elim.cmx lib/dyn.cmx tactics/dhyp.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx parsing/coqast.cmx \
-    interp/constrintern.cmx kernel/closure.cmx tactics/auto.cmx \
-    parsing/ast.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 lib/options.cmi \
-    kernel/names.cmi library/libnames.cmi tactics/hipattern.cmi \
-    interp/genarg.cmi parsing/egrammar.cmi parsing/coqast.cmi \
-    toplevel/cerrors.cmi parsing/ast.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 lib/options.cmx \
-    kernel/names.cmx library/libnames.cmx tactics/hipattern.cmx \
-    interp/genarg.cmx parsing/egrammar.cmx parsing/coqast.cmx \
-    toplevel/cerrors.cmx parsing/ast.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/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 translate/ppconstrnew.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 translate/ppconstrnew.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: parsing/ast.cmi tactics/auto.cmi kernel/closure.cmi \
+    interp/constrintern.cmi parsing/coqast.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 interp/genarg.cmi library/global.cmi lib/gmap.cmi \
+    tactics/hiddentac.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 \
+    pretyping/pretype_errors.cmi pretyping/pretyping.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/rawterm.cmi proofs/refiner.cmi \
+    pretyping/retyping.cmi kernel/safe_typing.cmi kernel/sign.cmi \
+    library/summary.cmi interp/syntax_def.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: parsing/ast.cmx tactics/auto.cmx kernel/closure.cmx \
+    interp/constrintern.cmx parsing/coqast.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 interp/genarg.cmx library/global.cmx lib/gmap.cmx \
+    tactics/hiddentac.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 \
+    pretyping/pretype_errors.cmx pretyping/pretyping.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/rawterm.cmx proofs/refiner.cmx \
+    pretyping/retyping.cmx kernel/safe_typing.cmx kernel/sign.cmx \
+    library/summary.cmx interp/syntax_def.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: parsing/ast.cmi toplevel/cerrors.cmi parsing/coqast.cmi \
+    parsing/egrammar.cmi interp/genarg.cmi tactics/hipattern.cmi \
+    library/libnames.cmi kernel/names.cmi lib/options.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: parsing/ast.cmx toplevel/cerrors.cmx parsing/coqast.cmx \
+    parsing/egrammar.cmx interp/genarg.cmx tactics/hipattern.cmx \
+    library/libnames.cmx kernel/names.cmx lib/options.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 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 \
-    toplevel/himsg.cmi pretyping/cases.cmi parsing/ast.cmi \
-    toplevel/cerrors.cmi 
-toplevel/cerrors.cmx: lib/util.cmx kernel/univ.cmx kernel/type_errors.cmx \
-    proofs/tactic_debug.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 \
-    toplevel/himsg.cmx pretyping/cases.cmx parsing/ast.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/retyping.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/cerrors.cmo: parsing/ast.cmi pretyping/cases.cmi toplevel/himsg.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 proofs/tactic_debug.cmi \
+    kernel/type_errors.cmi kernel/univ.cmi lib/util.cmi toplevel/cerrors.cmi 
+toplevel/cerrors.cmx: parsing/ast.cmx pretyping/cases.cmx toplevel/himsg.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 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 \
+    pretyping/retyping.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: lib/util.cmx pretyping/typing.cmx pretyping/termops.cmx \
-    kernel/term.cmx kernel/sign.cmx kernel/safe_typing.cmx \
-    pretyping/retyping.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.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 \
+    pretyping/retyping.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/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/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 kernel/environ.cmi library/declaremods.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 kernel/environ.cmx library/declaremods.cmx \
-    toplevel/coqinit.cmx config/coq_config.cmx toplevel/cerrors.cmx \
-    toplevel/coqtop.cmi 
-toplevel/discharge.cmo: lib/util.cmi kernel/univ.cmi kernel/typeops.cmi \
-    kernel/term.cmi library/summary.cmi kernel/sign.cmi kernel/reduction.cmi \
-    pretyping/recordops.cmi toplevel/recordobj.cmi lib/pp.cmi lib/options.cmi \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi \
-    library/library.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 library/declare.cmi \
-    kernel/declarations.cmi library/decl_kinds.cmo kernel/cooking.cmi \
-    pretyping/classops.cmi toplevel/class.cmi toplevel/discharge.cmi 
-toplevel/discharge.cmx: lib/util.cmx kernel/univ.cmx kernel/typeops.cmx \
-    kernel/term.cmx library/summary.cmx kernel/sign.cmx kernel/reduction.cmx \
-    pretyping/recordops.cmx toplevel/recordobj.cmx lib/pp.cmx lib/options.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx \
-    library/library.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 library/declare.cmx \
-    kernel/declarations.cmx library/decl_kinds.cmx kernel/cooking.cmx \
-    pretyping/classops.cmx toplevel/class.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 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 library/global.cmi pretyping/evd.cmi \
-    kernel/environ.cmi pretyping/cases.cmi parsing/ast.cmi toplevel/himsg.cmi 
-toplevel/himsg.cmx: lib/util.cmx kernel/type_errors.cmx pretyping/termops.cmx \
-    kernel/term.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 library/global.cmx pretyping/evd.cmx \
-    kernel/environ.cmx pretyping/cases.cmx parsing/ast.cmx toplevel/himsg.cmi 
+toplevel/coqtop.cmo: toplevel/cerrors.cmi config/coq_config.cmi \
+    toplevel/coqinit.cmi library/declaremods.cmi kernel/environ.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 library/declaremods.cmx kernel/environ.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: toplevel/class.cmi pretyping/classops.cmi \
+    kernel/cooking.cmi library/decl_kinds.cmo kernel/declarations.cmi \
+    library/declare.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/library.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi toplevel/recordobj.cmi pretyping/recordops.cmi \
+    kernel/reduction.cmi kernel/sign.cmi library/summary.cmi kernel/term.cmi \
+    kernel/typeops.cmi kernel/univ.cmi lib/util.cmi toplevel/discharge.cmi 
+toplevel/discharge.cmx: toplevel/class.cmx pretyping/classops.cmx \
+    kernel/cooking.cmx library/decl_kinds.cmx kernel/declarations.cmx \
+    library/declare.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/library.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx toplevel/recordobj.cmx pretyping/recordops.cmx \
+    kernel/reduction.cmx kernel/sign.cmx library/summary.cmx kernel/term.cmx \
+    kernel/typeops.cmx kernel/univ.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: parsing/ast.cmi pretyping/cases.cmi kernel/environ.cmi \
+    pretyping/evd.cmi library/global.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 kernel/term.cmi \
+    pretyping/termops.cmi kernel/type_errors.cmi lib/util.cmi \
+    toplevel/himsg.cmi 
+toplevel/himsg.cmx: parsing/ast.cmx pretyping/cases.cmx kernel/environ.cmx \
+    pretyping/evd.cmx library/global.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 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 parsing/termast.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 library/nametab.cmi \
-    kernel/names.cmi library/library.cmi library/libobject.cmi \
-    library/libnames.cmi library/lib.cmi parsing/lexer.cmi library/global.cmi \
-    interp/genarg.cmi parsing/extend.cmi pretyping/evd.cmi \
-    parsing/esyntax.cmi parsing/egrammar.cmi parsing/coqast.cmi \
-    interp/constrintern.cmi interp/constrextern.cmi pretyping/classops.cmi \
-    parsing/ast.cmi toplevel/metasyntax.cmi 
-toplevel/metasyntax.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx parsing/termast.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 library/nametab.cmx \
-    kernel/names.cmx library/library.cmx library/libobject.cmx \
-    library/libnames.cmx library/lib.cmx parsing/lexer.cmx library/global.cmx \
-    interp/genarg.cmx parsing/extend.cmx pretyping/evd.cmx \
-    parsing/esyntax.cmx parsing/egrammar.cmx parsing/coqast.cmx \
-    interp/constrintern.cmx interp/constrextern.cmx pretyping/classops.cmx \
-    parsing/ast.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 parsing/coqast.cmi 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 parsing/coqast.cmx interp/constrintern.cmx \
-    toplevel/command.cmx toplevel/class.cmx toplevel/record.cmi 
-toplevel/recordobj.cmo: lib/util.cmi kernel/term.cmi pretyping/recordops.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 library/declare.cmi pretyping/classops.cmi \
-    toplevel/recordobj.cmi 
-toplevel/recordobj.cmx: lib/util.cmx kernel/term.cmx pretyping/recordops.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 library/declare.cmx pretyping/classops.cmx \
-    toplevel/recordobj.cmi 
-toplevel/toplevel.cmo: toplevel/vernacexpr.cmo toplevel/vernac.cmi \
-    lib/util.cmi toplevel/protectedtoplevel.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 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: parsing/ast.cmi pretyping/classops.cmi \
+    interp/constrextern.cmi interp/constrintern.cmi parsing/coqast.cmi \
+    parsing/egrammar.cmi parsing/esyntax.cmi pretyping/evd.cmi \
+    parsing/extend.cmi interp/genarg.cmi library/global.cmi parsing/lexer.cmi \
+    library/lib.cmi library/libnames.cmi library/libobject.cmi \
+    library/library.cmi kernel/names.cmi library/nametab.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 parsing/termast.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo toplevel/metasyntax.cmi 
+toplevel/metasyntax.cmx: parsing/ast.cmx pretyping/classops.cmx \
+    interp/constrextern.cmx interp/constrintern.cmx parsing/coqast.cmx \
+    parsing/egrammar.cmx parsing/esyntax.cmx pretyping/evd.cmx \
+    parsing/extend.cmx interp/genarg.cmx library/global.cmx parsing/lexer.cmx \
+    library/lib.cmx library/libnames.cmx library/libobject.cmx \
+    library/library.cmx kernel/names.cmx library/nametab.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 parsing/termast.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 parsing/coqast.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 parsing/coqast.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/recordobj.cmo: pretyping/classops.cmi library/declare.cmi \
+    kernel/environ.cmi library/global.cmi library/lib.cmi \
+    library/libnames.cmi library/nameops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi pretyping/recordops.cmi kernel/term.cmi \
+    lib/util.cmi toplevel/recordobj.cmi 
+toplevel/recordobj.cmx: pretyping/classops.cmx library/declare.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 pretyping/recordops.cmx kernel/term.cmx \
+    lib/util.cmx toplevel/recordobj.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 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 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/vernac.cmo: toplevel/vernacinterp.cmi toplevel/vernacexpr.cmo \
-    toplevel/vernacentries.cmi lib/util.cmi proofs/tacmach.cmi \
-    tactics/tacinterp.cmi lib/system.cmi library/states.cmi \
-    proofs/refiner.cmi translate/ppvernacnew.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 parsing/coqast.cmi \
-    interp/constrintern.cmi interp/constrextern.cmi toplevel/vernac.cmi 
-toplevel/vernac.cmx: toplevel/vernacinterp.cmx toplevel/vernacexpr.cmx \
-    toplevel/vernacentries.cmx lib/util.cmx proofs/tacmach.cmx \
-    tactics/tacinterp.cmx lib/system.cmx library/states.cmx \
-    proofs/refiner.cmx translate/ppvernacnew.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 parsing/coqast.cmx \
-    interp/constrintern.cmx interp/constrextern.cmx toplevel/vernac.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 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 \
-    toplevel/recordobj.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 \
-    toplevel/discharge.cmi pretyping/detyping.cmi library/declaremods.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 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 \
-    toplevel/recordobj.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 \
-    toplevel/discharge.cmx pretyping/detyping.cmx library/declaremods.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 \
-    parsing/extend.cmi parsing/coqast.cmi parsing/ast.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 \
-    parsing/extend.cmx parsing/coqast.cmx parsing/ast.cmx \
-    toplevel/vernacinterp.cmi 
-translate/ppconstrnew.cmo: lib/util.cmi kernel/univ.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi interp/syntax_def.cmi \
-    pretyping/retyping.cmi pretyping/rawterm.cmi pretyping/pretyping.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 library/lib.cmi \
-    library/global.cmi interp/genarg.cmi pretyping/evd.cmi parsing/coqast.cmi \
-    interp/constrintern.cmi interp/constrextern.cmi lib/bigint.cmi \
-    parsing/ast.cmi translate/ppconstrnew.cmi 
-translate/ppconstrnew.cmx: lib/util.cmx kernel/univ.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx interp/syntax_def.cmx \
-    pretyping/retyping.cmx pretyping/rawterm.cmx pretyping/pretyping.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 library/lib.cmx \
-    library/global.cmx interp/genarg.cmx pretyping/evd.cmx parsing/coqast.cmx \
-    interp/constrintern.cmx interp/constrextern.cmx lib/bigint.cmx \
-    parsing/ast.cmx translate/ppconstrnew.cmi 
-translate/pptacticnew.cmo: lib/util.cmi interp/topconstr.cmi \
-    pretyping/termops.cmi kernel/term.cmi proofs/tactic_debug.cmi \
-    proofs/tacexpr.cmo pretyping/rawterm.cmi parsing/printer.cmi \
-    parsing/pptactic.cmi interp/ppextend.cmi translate/ppconstrnew.cmi \
-    lib/pp.cmi lib/options.cmi library/nametab.cmi kernel/names.cmi \
-    library/nameops.cmi library/libnames.cmi library/global.cmi \
-    interp/genarg.cmi parsing/extend.cmi kernel/environ.cmi \
-    parsing/egrammar.cmi lib/dyn.cmi interp/constrextern.cmi \
-    kernel/closure.cmi translate/pptacticnew.cmi 
-translate/pptacticnew.cmx: lib/util.cmx interp/topconstr.cmx \
-    pretyping/termops.cmx kernel/term.cmx proofs/tactic_debug.cmx \
-    proofs/tacexpr.cmx pretyping/rawterm.cmx parsing/printer.cmx \
-    parsing/pptactic.cmx interp/ppextend.cmx translate/ppconstrnew.cmx \
-    lib/pp.cmx lib/options.cmx library/nametab.cmx kernel/names.cmx \
-    library/nameops.cmx library/libnames.cmx library/global.cmx \
-    interp/genarg.cmx parsing/extend.cmx kernel/environ.cmx \
-    parsing/egrammar.cmx lib/dyn.cmx interp/constrextern.cmx \
-    kernel/closure.cmx translate/pptacticnew.cmi 
-translate/ppvernacnew.cmo: toplevel/vernacexpr.cmo lib/util.cmi \
-    interp/topconstr.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tacinterp.cmi proofs/tacexpr.cmo pretyping/rawterm.cmi \
-    translate/pptacticnew.cmi parsing/pptactic.cmi interp/ppextend.cmi \
-    translate/ppconstrnew.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 toplevel/metasyntax.cmi library/library.cmi \
-    library/libnames.cmi library/lib.cmi library/impargs.cmi \
-    library/goptions.cmi library/global.cmi interp/genarg.cmi \
-    parsing/extend.cmi pretyping/evd.cmi kernel/environ.cmi \
-    parsing/egrammar.cmi library/declaremods.cmi library/decl_kinds.cmo \
-    parsing/coqast.cmi interp/constrintern.cmi interp/constrextern.cmi \
-    parsing/ast.cmi translate/ppvernacnew.cmi 
-translate/ppvernacnew.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx pretyping/termops.cmx kernel/term.cmx \
-    tactics/tacinterp.cmx proofs/tacexpr.cmx pretyping/rawterm.cmx \
-    translate/pptacticnew.cmx parsing/pptactic.cmx interp/ppextend.cmx \
-    translate/ppconstrnew.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 toplevel/metasyntax.cmx library/library.cmx \
-    library/libnames.cmx library/lib.cmx library/impargs.cmx \
-    library/goptions.cmx library/global.cmx interp/genarg.cmx \
-    parsing/extend.cmx pretyping/evd.cmx kernel/environ.cmx \
-    parsing/egrammar.cmx library/declaremods.cmx library/decl_kinds.cmx \
-    parsing/coqast.cmx interp/constrintern.cmx interp/constrextern.cmx \
-    parsing/ast.cmx translate/ppvernacnew.cmi 
-contrib/cc/ccalgo.cmo: lib/util.cmi kernel/term.cmi kernel/names.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 \
+    library/declaremods.cmi pretyping/detyping.cmi toplevel/discharge.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 toplevel/recordobj.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 \
+    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 \
+    library/declaremods.cmx pretyping/detyping.cmx toplevel/discharge.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 toplevel/recordobj.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 \
+    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: parsing/ast.cmi parsing/coqast.cmi \
+    parsing/extend.cmi 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: parsing/ast.cmx parsing/coqast.cmx \
+    parsing/extend.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/constrextern.cmi interp/constrintern.cmi \
+    parsing/coqast.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 translate/ppvernacnew.cmi proofs/refiner.cmi \
+    library/states.cmi lib/system.cmi tactics/tacinterp.cmi \
+    proofs/tacmach.cmi lib/util.cmi toplevel/vernacentries.cmi \
+    toplevel/vernacexpr.cmo toplevel/vernacinterp.cmi toplevel/vernac.cmi 
+toplevel/vernac.cmx: interp/constrextern.cmx interp/constrintern.cmx \
+    parsing/coqast.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 translate/ppvernacnew.cmx proofs/refiner.cmx \
+    library/states.cmx lib/system.cmx tactics/tacinterp.cmx \
+    proofs/tacmach.cmx lib/util.cmx toplevel/vernacentries.cmx \
+    toplevel/vernacexpr.cmx toplevel/vernacinterp.cmx toplevel/vernac.cmi 
+translate/ppconstrnew.cmo: parsing/ast.cmi lib/bigint.cmi \
+    interp/constrextern.cmi interp/constrintern.cmi parsing/coqast.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.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 interp/ppextend.cmi \
+    pretyping/pretyping.cmi pretyping/rawterm.cmi pretyping/retyping.cmi \
+    interp/syntax_def.cmi kernel/term.cmi pretyping/termops.cmi \
+    interp/topconstr.cmi kernel/univ.cmi lib/util.cmi \
+    translate/ppconstrnew.cmi 
+translate/ppconstrnew.cmx: parsing/ast.cmx lib/bigint.cmx \
+    interp/constrextern.cmx interp/constrintern.cmx parsing/coqast.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.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 interp/ppextend.cmx \
+    pretyping/pretyping.cmx pretyping/rawterm.cmx pretyping/retyping.cmx \
+    interp/syntax_def.cmx kernel/term.cmx pretyping/termops.cmx \
+    interp/topconstr.cmx kernel/univ.cmx lib/util.cmx \
+    translate/ppconstrnew.cmi 
+translate/pptacticnew.cmo: kernel/closure.cmi interp/constrextern.cmi \
+    lib/dyn.cmi parsing/egrammar.cmi kernel/environ.cmi parsing/extend.cmi \
+    interp/genarg.cmi library/global.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    lib/pp.cmi translate/ppconstrnew.cmi interp/ppextend.cmi \
+    parsing/pptactic.cmi parsing/printer.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo proofs/tactic_debug.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
+    translate/pptacticnew.cmi 
+translate/pptacticnew.cmx: kernel/closure.cmx interp/constrextern.cmx \
+    lib/dyn.cmx parsing/egrammar.cmx kernel/environ.cmx parsing/extend.cmx \
+    interp/genarg.cmx library/global.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    lib/pp.cmx translate/ppconstrnew.cmx interp/ppextend.cmx \
+    parsing/pptactic.cmx parsing/printer.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx proofs/tactic_debug.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx lib/util.cmx \
+    translate/pptacticnew.cmi 
+translate/ppvernacnew.cmo: parsing/ast.cmi interp/constrextern.cmi \
+    interp/constrintern.cmi parsing/coqast.cmi library/decl_kinds.cmo \
+    library/declaremods.cmi parsing/egrammar.cmi kernel/environ.cmi \
+    pretyping/evd.cmi parsing/extend.cmi interp/genarg.cmi library/global.cmi \
+    library/goptions.cmi library/impargs.cmi library/lib.cmi \
+    library/libnames.cmi library/library.cmi toplevel/metasyntax.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 translate/ppconstrnew.cmi interp/ppextend.cmi \
+    parsing/pptactic.cmi translate/pptacticnew.cmi pretyping/rawterm.cmi \
+    proofs/tacexpr.cmo tactics/tacinterp.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo translate/ppvernacnew.cmi 
+translate/ppvernacnew.cmx: parsing/ast.cmx interp/constrextern.cmx \
+    interp/constrintern.cmx parsing/coqast.cmx library/decl_kinds.cmx \
+    library/declaremods.cmx parsing/egrammar.cmx kernel/environ.cmx \
+    pretyping/evd.cmx parsing/extend.cmx interp/genarg.cmx library/global.cmx \
+    library/goptions.cmx library/impargs.cmx library/lib.cmx \
+    library/libnames.cmx library/library.cmx toplevel/metasyntax.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 translate/ppconstrnew.cmx interp/ppextend.cmx \
+    parsing/pptactic.cmx translate/pptacticnew.cmx pretyping/rawterm.cmx \
+    proofs/tacexpr.cmx tactics/tacinterp.cmx kernel/term.cmx \
+    pretyping/termops.cmx interp/topconstr.cmx lib/util.cmx \
+    toplevel/vernacexpr.cmx translate/ppvernacnew.cmi 
+contrib/cc/ccalgo.cmo: kernel/names.cmi kernel/term.cmi lib/util.cmi \
     contrib/cc/ccalgo.cmi 
-contrib/cc/ccalgo.cmx: lib/util.cmx kernel/term.cmx kernel/names.cmx \
+contrib/cc/ccalgo.cmx: kernel/names.cmx kernel/term.cmx lib/util.cmx \
     contrib/cc/ccalgo.cmi 
-contrib/cc/ccproof.cmo: lib/util.cmi lib/pp.cmi kernel/names.cmi \
-    contrib/cc/ccalgo.cmi contrib/cc/ccproof.cmi 
-contrib/cc/ccproof.cmx: lib/util.cmx lib/pp.cmx kernel/names.cmx \
-    contrib/cc/ccalgo.cmx contrib/cc/ccproof.cmi 
-contrib/cc/cctac.cmo: lib/util.cmi pretyping/termops.cmi kernel/term.cmi \
-    tactics/tactics.cmi tactics/tacticals.cmi proofs/tacmach.cmi \
-    tactics/tacinterp.cmi proofs/tacexpr.cmo kernel/sign.cmi \
-    proofs/refiner.cmi proofs/proof_type.cmi parsing/pptactic.cmi lib/pp.cmi \
-    parsing/pcoq.cmi lib/options.cmi kernel/names.cmi library/nameops.cmi \
-    library/library.cmi library/libnames.cmi pretyping/inductiveops.cmi \
-    kernel/inductive.cmi library/global.cmi pretyping/evd.cmi \
-    parsing/egrammar.cmi kernel/declarations.cmi interp/coqlib.cmi \
-    toplevel/cerrors.cmi contrib/cc/ccproof.cmi contrib/cc/ccalgo.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 proofs/tacexpr.cmx kernel/sign.cmx \
-    proofs/refiner.cmx proofs/proof_type.cmx parsing/pptactic.cmx lib/pp.cmx \
-    parsing/pcoq.cmx lib/options.cmx kernel/names.cmx library/nameops.cmx \
-    library/library.cmx library/libnames.cmx pretyping/inductiveops.cmx \
-    kernel/inductive.cmx library/global.cmx pretyping/evd.cmx \
-    parsing/egrammar.cmx kernel/declarations.cmx interp/coqlib.cmx \
-    toplevel/cerrors.cmx contrib/cc/ccproof.cmx contrib/cc/ccalgo.cmx 
-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/pcicenv.cmo: kernel/univ.cmi kernel/term.cmi \
-    kernel/sign.cmi kernel/names.cmi library/global.cmi \
+contrib/cc/ccproof.cmo: contrib/cc/ccalgo.cmi kernel/names.cmi lib/pp.cmi \
+    lib/util.cmi contrib/cc/ccproof.cmi 
+contrib/cc/ccproof.cmx: contrib/cc/ccalgo.cmx kernel/names.cmx lib/pp.cmx \
+    lib/util.cmx contrib/cc/ccproof.cmi 
+contrib/cc/cctac.cmo: contrib/cc/ccalgo.cmi contrib/cc/ccproof.cmi \
+    toplevel/cerrors.cmi interp/coqlib.cmi kernel/declarations.cmi \
+    parsing/egrammar.cmi pretyping/evd.cmi library/global.cmi \
+    kernel/inductive.cmi pretyping/inductiveops.cmi library/libnames.cmi \
+    library/library.cmi library/nameops.cmi kernel/names.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi proofs/proof_type.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 
+contrib/cc/cctac.cmx: contrib/cc/ccalgo.cmx contrib/cc/ccproof.cmx \
+    toplevel/cerrors.cmx interp/coqlib.cmx kernel/declarations.cmx \
+    parsing/egrammar.cmx pretyping/evd.cmx library/global.cmx \
+    kernel/inductive.cmx pretyping/inductiveops.cmx library/libnames.cmx \
+    library/library.cmx library/nameops.cmx kernel/names.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx proofs/proof_type.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 
+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/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 parsing/ast.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: parsing/ast.cmi 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 parsing/ast.cmx \
+contrib/correctness/pextract.cmx: parsing/ast.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 \
-    parsing/termast.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.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 \
+    parsing/termast.cmi pretyping/typing.cmi lib/util.cmi \
     contrib/correctness/pmlize.cmi 
-contrib/correctness/pmlize.cmx: lib/util.cmx pretyping/typing.cmx \
-    parsing/termast.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.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 \
+    parsing/termast.cmx pretyping/typing.cmx lib/util.cmx \
     contrib/correctness/pmlize.cmi 
-contrib/correctness/pmonad.cmo: lib/util.cmi parsing/termast.cmi \
-    kernel/term.cmi kernel/names.cmi contrib/correctness/pmonad.cmi 
-contrib/correctness/pmonad.cmx: lib/util.cmx parsing/termast.cmx \
-    kernel/term.cmx kernel/names.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/library.cmi \
-    library/libnames.cmi library/global.cmi tactics/extratactics.cmi \
-    pretyping/evd.cmi tactics/equality.cmi library/decl_kinds.cmo \
-    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/library.cmx \
-    library/libnames.cmx library/global.cmx tactics/extratactics.cmx \
-    pretyping/evd.cmx tactics/equality.cmx library/decl_kinds.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/pmonad.cmo: kernel/names.cmi kernel/term.cmi \
+    parsing/termast.cmi lib/util.cmi contrib/correctness/pmonad.cmi 
+contrib/correctness/pmonad.cmx: kernel/names.cmx kernel/term.cmx \
+    parsing/termast.cmx lib/util.cmx contrib/correctness/pmonad.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: library/decl_kinds.cmo tactics/equality.cmi \
+    pretyping/evd.cmi tactics/extratactics.cmi library/global.cmi \
+    library/libnames.cmi library/library.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: library/decl_kinds.cmx tactics/equality.cmx \
+    pretyping/evd.cmx tactics/extratactics.cmx library/global.cmx \
+    library/libnames.cmx library/library.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/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/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 translate/pptacticnew.cmi \
-    parsing/pptactic.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    interp/genarg.cmi contrib/extraction/extract_env.cmi parsing/extend.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 translate/pptacticnew.cmx \
-    parsing/pptactic.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    interp/genarg.cmx contrib/extraction/extract_env.cmx parsing/extend.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 parsing/extend.cmi \
+    contrib/extraction/extract_env.cmi interp/genarg.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
+    translate/pptacticnew.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 parsing/extend.cmx \
+    contrib/extraction/extract_env.cmx interp/genarg.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
+    translate/pptacticnew.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 \
-    translate/ppconstrnew.cmi lib/pp.cmi parsing/pcoq.cmi lib/options.cmi \
-    kernel/names.cmi kernel/mod_subst.cmi library/library.cmi \
-    library/libobject.cmi library/libnames.cmi library/lib.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 \
-    translate/ppconstrnew.cmx lib/pp.cmx parsing/pcoq.cmx lib/options.cmx \
-    kernel/names.cmx kernel/mod_subst.cmx library/library.cmx \
-    library/libobject.cmx library/libnames.cmx library/lib.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 kernel/inductive.cmi tactics/hipattern.cmi \
-    library/global.cmi kernel/declarations.cmi kernel/closure.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 library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi library/library.cmi kernel/mod_subst.cmi \
+    kernel/names.cmi lib/options.cmi parsing/pcoq.cmi lib/pp.cmi \
+    translate/ppconstrnew.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 library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx library/library.cmx kernel/mod_subst.cmx \
+    kernel/names.cmx lib/options.cmx parsing/pcoq.cmx lib/pp.cmx \
+    translate/ppconstrnew.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 kernel/inductive.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: 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 kernel/inductive.cmx tactics/hipattern.cmx \
-    library/global.cmx kernel/declarations.cmx kernel/closure.cmx \
+contrib/first-order/formula.cmx: kernel/closure.cmx kernel/declarations.cmx \
+    library/global.cmx tactics/hipattern.cmx kernel/inductive.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: 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 lib/options.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 lib/options.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 kernel/names.cmi library/libnames.cmi \
-    lib/heap.cmi contrib/first-order/formula.cmi pretyping/evd.cmi \
-    pretyping/detyping.cmi kernel/declarations.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 lib/options.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 lib/options.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 \
+    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 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 \
+    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 kernel/names.cmi library/libnames.cmi \
-    contrib/first-order/formula.cmi kernel/declarations.cmi interp/coqlib.cmi \
+contrib/first-order/rules.cmo: interp/coqlib.cmi kernel/declarations.cmi \
+    contrib/first-order/formula.cmi library/libnames.cmi kernel/names.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: 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 kernel/names.cmx library/libnames.cmx \
-    contrib/first-order/formula.cmx kernel/declarations.cmx interp/coqlib.cmx \
+contrib/first-order/rules.cmx: interp/coqlib.cmx kernel/declarations.cmx \
+    contrib/first-order/formula.cmx library/libnames.cmx kernel/names.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: lib/util.cmi contrib/first-order/unify.cmi \
-    kernel/term.cmi proofs/tacmach.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/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/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 \
+    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 \
+    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/library.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/library.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 lib/options.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 lib/options.cmx contrib/fourier/fourierR.cmx \
-    parsing/egrammar.cmx toplevel/cerrors.cmx 
-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 lib/options.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 lib/options.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/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 library/library.cmi \
+    kernel/names.cmi contrib/ring/ring.cmo proofs/tacmach.cmi \
+    tactics/tacticals.cmi tactics/tactics.cmi kernel/term.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo 
+contrib/fourier/fourierR.cmx: pretyping/clenv.cmx tactics/contradiction.cmx \
+    interp/coqlib.cmx tactics/equality.cmx pretyping/evarutil.cmx \
+    contrib/fourier/fourier.cmx library/libnames.cmx library/library.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 lib/options.cmi 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 lib/options.cmx parsing/pcoq.cmx lib/pp.cmx \
+    parsing/pptactic.cmx proofs/refiner.cmx proofs/tacexpr.cmx \
+    tactics/tacinterp.cmx lib/util.cmx 
+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 \
+    lib/options.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 \
+    lib/options.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 \
-    contrib/interface/ctast.cmo toplevel/command.cmi pretyping/clenv.cmi \
-    tactics/auto.cmi contrib/interface/blast.cmi 
-contrib/interface/blast.cmx: toplevel/vernacinterp.cmx \
-    toplevel/vernacentries.cmx lib/util.cmx pretyping/typing.cmx \
-    pretyping/termops.cmx kernel/term.cmx tactics/tactics.cmx \
-    tactics/tacticals.cmx parsing/tactic_printer.cmx pretyping/tacred.cmx \
-    proofs/tacmach.cmx tactics/tacinterp.cmx kernel/sign.cmx \
-    proofs/refiner.cmx kernel/reduction.cmx pretyping/rawterm.cmx \
-    proofs/proof_type.cmx proofs/proof_trees.cmx parsing/printer.cmx \
-    parsing/pptactic.cmx lib/pp.cmx proofs/pfedit.cmx parsing/pcoq.cmx \
-    contrib/interface/pbp.cmx pretyping/pattern.cmx kernel/names.cmx \
-    library/nameops.cmx proofs/logic.cmx kernel/inductive.cmx \
-    tactics/hipattern.cmx library/global.cmx lib/explore.cmx \
-    pretyping/evd.cmx tactics/equality.cmx kernel/environ.cmx \
-    tactics/eauto.cmx library/declare.cmx kernel/declarations.cmx \
-    contrib/interface/ctast.cmx toplevel/command.cmx pretyping/clenv.cmx \
-    tactics/auto.cmx contrib/interface/blast.cmi 
-contrib/interface/centaur.cmo: contrib/interface/xlate.cmi \
-    contrib/interface/vtp.cmi toplevel/vernacinterp.cmi \
-    toplevel/vernacexpr.cmo toplevel/vernacentries.cmi toplevel/vernac.cmi \
-    lib/util.cmi contrib/interface/translate.cmi parsing/termast.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 lib/options.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 \
-    contrib/interface/history.cmi library/global.cmi interp/genarg.cmi \
-    parsing/extend.cmi pretyping/evd.cmi kernel/environ.cmi \
-    parsing/egrammar.cmi library/declare.cmi kernel/declarations.cmi \
-    contrib/interface/debug_tac.cmi parsing/coqast.cmi \
-    interp/constrintern.cmi toplevel/command.cmi pretyping/classops.cmi \
-    toplevel/cerrors.cmi contrib/interface/blast.cmi parsing/ast.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 parsing/termast.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 lib/options.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 \
-    contrib/interface/history.cmx library/global.cmx interp/genarg.cmx \
-    parsing/extend.cmx pretyping/evd.cmx kernel/environ.cmx \
-    parsing/egrammar.cmx library/declare.cmx kernel/declarations.cmx \
-    contrib/interface/debug_tac.cmx parsing/coqast.cmx \
-    interp/constrintern.cmx toplevel/command.cmx pretyping/classops.cmx \
-    toplevel/cerrors.cmx contrib/interface/blast.cmx parsing/ast.cmx \
-    contrib/interface/ascent.cmi 
-contrib/interface/ctast.cmo: lib/util.cmi kernel/names.cmi \
-    library/libnames.cmi lib/dyn.cmi parsing/coqast.cmi 
-contrib/interface/ctast.cmx: lib/util.cmx kernel/names.cmx \
-    library/libnames.cmx lib/dyn.cmx parsing/coqast.cmx 
-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 interp/genarg.cmi \
-    parsing/coqast.cmi toplevel/cerrors.cmi parsing/ast.cmi \
+contrib/interface/blast.cmo: tactics/auto.cmi pretyping/clenv.cmi \
+    toplevel/command.cmi contrib/interface/ctast.cmo kernel/declarations.cmi \
+    library/declare.cmi tactics/eauto.cmi kernel/environ.cmi \
+    tactics/equality.cmi pretyping/evd.cmi lib/explore.cmi library/global.cmi \
+    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: tactics/auto.cmx pretyping/clenv.cmx \
+    toplevel/command.cmx contrib/interface/ctast.cmx kernel/declarations.cmx \
+    library/declare.cmx tactics/eauto.cmx kernel/environ.cmx \
+    tactics/equality.cmx pretyping/evd.cmx lib/explore.cmx library/global.cmx \
+    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/ascent.cmi parsing/ast.cmi \
+    contrib/interface/blast.cmi toplevel/cerrors.cmi pretyping/classops.cmi \
+    toplevel/command.cmi interp/constrintern.cmi parsing/coqast.cmi \
+    contrib/interface/debug_tac.cmi kernel/declarations.cmi \
+    library/declare.cmi parsing/egrammar.cmi kernel/environ.cmi \
+    pretyping/evd.cmi parsing/extend.cmi interp/genarg.cmi library/global.cmi \
+    contrib/interface/history.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 lib/options.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 \
+    parsing/termast.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 parsing/ast.cmx \
+    contrib/interface/blast.cmx toplevel/cerrors.cmx pretyping/classops.cmx \
+    toplevel/command.cmx interp/constrintern.cmx parsing/coqast.cmx \
+    contrib/interface/debug_tac.cmx kernel/declarations.cmx \
+    library/declare.cmx parsing/egrammar.cmx kernel/environ.cmx \
+    pretyping/evd.cmx parsing/extend.cmx interp/genarg.cmx library/global.cmx \
+    contrib/interface/history.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 lib/options.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 \
+    parsing/termast.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/ctast.cmo: parsing/coqast.cmi lib/dyn.cmi \
+    library/libnames.cmi kernel/names.cmi lib/util.cmi 
+contrib/interface/ctast.cmx: parsing/coqast.cmx lib/dyn.cmx \
+    library/libnames.cmx kernel/names.cmx lib/util.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: parsing/ast.cmi toplevel/cerrors.cmi \
+    parsing/coqast.cmi interp/genarg.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 interp/genarg.cmx \
-    parsing/coqast.cmx toplevel/cerrors.cmx parsing/ast.cmx \
+contrib/interface/debug_tac.cmx: parsing/ast.cmx toplevel/cerrors.cmx \
+    parsing/coqast.cmx interp/genarg.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 
@@ -3063,160 +3067,160 @@ 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 parsing/termast.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 \
-    parsing/coqast.cmi interp/constrextern.cmi pretyping/classops.cmi \
-    parsing/ast.cmi contrib/interface/name_to_ast.cmi 
-contrib/interface/name_to_ast.cmx: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx parsing/termast.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 \
-    parsing/coqast.cmx interp/constrextern.cmx pretyping/classops.cmx \
-    parsing/ast.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 parsing/esyntax.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 parsing/esyntax.cmx \
-    library/declaremods.cmx config/coq_config.cmx toplevel/cerrors.cmx \
-    contrib/interface/ascent.cmi 
+contrib/interface/name_to_ast.cmo: parsing/ast.cmi pretyping/classops.cmi \
+    interp/constrextern.cmi parsing/coqast.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 \
+    parsing/termast.cmi interp/topconstr.cmi lib/util.cmi \
+    toplevel/vernacexpr.cmo contrib/interface/name_to_ast.cmi 
+contrib/interface/name_to_ast.cmx: parsing/ast.cmx pretyping/classops.cmx \
+    interp/constrextern.cmx parsing/coqast.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 \
+    parsing/termast.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 \
+    parsing/esyntax.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 \
+    parsing/esyntax.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.cmo: toplevel/vernacinterp.cmi lib/util.cmi \
-    pretyping/typing.cmi contrib/interface/translate.cmi \
-    pretyping/termops.cmi parsing/termast.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 \
-    parsing/coqast.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 \
+    parsing/esyntax.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 \
+    parsing/esyntax.cmx library/global.cmx toplevel/metasyntax.cmx lib/pp.cmx \
+    parsing/printer.cmx contrib/interface/translate.cmx \
+    contrib/interface/vtp.cmx contrib/interface/xlate.cmx 
+contrib/interface/showproof.cmo: pretyping/clenv.cmi interp/constrintern.cmi \
+    parsing/coqast.cmi kernel/declarations.cmi kernel/environ.cmi \
+    pretyping/evd.cmi interp/genarg.cmi library/global.cmi \
+    kernel/inductive.cmi pretyping/inductiveops.cmi library/libnames.cmi \
+    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 parsing/termast.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 parsing/termast.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 \
-    parsing/coqast.cmx interp/constrintern.cmx pretyping/clenv.cmx \
+contrib/interface/showproof.cmx: pretyping/clenv.cmx interp/constrintern.cmx \
+    parsing/coqast.cmx kernel/declarations.cmx kernel/environ.cmx \
+    pretyping/evd.cmx interp/genarg.cmx library/global.cmx \
+    kernel/inductive.cmx pretyping/inductiveops.cmx library/libnames.cmx \
+    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 parsing/termast.cmx \
+    pretyping/termops.cmx contrib/interface/translate.cmx \
+    pretyping/typing.cmx lib/util.cmx toplevel/vernacinterp.cmx \
     contrib/interface/showproof.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 \
-    parsing/esyntax.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 \
-    parsing/esyntax.cmx contrib/interface/ascent.cmi 
-contrib/interface/translate.cmo: contrib/interface/xlate.cmi \
-    contrib/interface/vtp.cmi toplevel/vernacinterp.cmi lib/util.cmi \
-    parsing/termast.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 contrib/interface/ctast.cmo \
-    interp/constrextern.cmi parsing/ast.cmi contrib/interface/ascent.cmi \
+contrib/interface/translate.cmo: contrib/interface/ascent.cmi parsing/ast.cmi \
+    interp/constrextern.cmi contrib/interface/ctast.cmo 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 \
+    parsing/termast.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/xlate.cmx \
-    contrib/interface/vtp.cmx toplevel/vernacinterp.cmx lib/util.cmx \
-    parsing/termast.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 contrib/interface/ctast.cmx \
-    interp/constrextern.cmx parsing/ast.cmx contrib/interface/ascent.cmi \
+contrib/interface/translate.cmx: contrib/interface/ascent.cmi parsing/ast.cmx \
+    interp/constrextern.cmx contrib/interface/ctast.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 \
+    parsing/termast.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 lib/options.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 parsing/ast.cmi contrib/interface/ascent.cmi \
+contrib/interface/xlate.cmo: contrib/interface/ascent.cmi parsing/ast.cmi \
+    lib/bigint.cmi library/decl_kinds.cmo tactics/eauto.cmi \
+    parsing/extend.cmi tactics/extraargs.cmi contrib/field/field.cmo \
+    interp/genarg.cmi library/goptions.cmi library/libnames.cmi \
+    kernel/names.cmi lib/options.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: toplevel/vernacexpr.cmx lib/util.cmx \
-    interp/topconstr.cmx kernel/term.cmx proofs/tacexpr.cmx \
-    pretyping/rawterm.cmx parsing/ppconstr.cmx lib/options.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 parsing/ast.cmx contrib/interface/ascent.cmi \
+contrib/interface/xlate.cmx: contrib/interface/ascent.cmi parsing/ast.cmx \
+    lib/bigint.cmx library/decl_kinds.cmx tactics/eauto.cmx \
+    parsing/extend.cmx tactics/extraargs.cmx contrib/field/field.cmx \
+    interp/genarg.cmx library/goptions.cmx library/libnames.cmx \
+    kernel/names.cmx lib/options.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: 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 \
-    lib/options.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 \
-    lib/options.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/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 \
+    lib/options.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 \
+    lib/options.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 \
@@ -3225,230 +3229,228 @@ 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 lib/options.cmi contrib/omega/omega.cmo \
-    library/nametab.cmi kernel/names.cmi library/nameops.cmi proofs/logic.cmi \
-    library/library.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 parsing/ast.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 lib/options.cmx contrib/omega/omega.cmx \
-    library/nametab.cmx kernel/names.cmx library/nameops.cmx proofs/logic.cmx \
-    library/library.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 parsing/ast.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 lib/options.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 lib/options.cmx parsing/egrammar.cmx \
-    contrib/omega/coq_omega.cmx toplevel/cerrors.cmx 
-contrib/omega/omega.cmo: lib/util.cmi kernel/names.cmi library/nameops.cmi 
-contrib/omega/omega.cmx: lib/util.cmx kernel/names.cmx library/nameops.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 lib/options.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 lib/options.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 lib/options.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 lib/options.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/library.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/library.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/library.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/library.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 lib/options.cmi \
-    library/nametab.cmi kernel/names.cmi library/libnames.cmi \
-    library/global.cmi interp/coqlib.cmi lib/bigint.cmi 
-contrib/romega/const_omega.cmx: lib/util.cmx kernel/term.cmx lib/options.cmx \
-    library/nametab.cmx kernel/names.cmx library/libnames.cmx \
-    library/global.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 lib/options.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 lib/options.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 lib/options.cmi contrib/omega/omega.cmo \
-    kernel/names.cmi proofs/logic.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 lib/options.cmx contrib/omega/omega.cmx \
-    kernel/names.cmx proofs/logic.cmx contrib/romega/const_omega.cmx \
-    lib/bigint.cmx 
-contrib/xml/acic.cmo: kernel/term.cmi kernel/names.cmi 
-contrib/xml/acic.cmx: kernel/term.cmx kernel/names.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/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 kernel/inductive.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 kernel/inductive.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/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 kernel/inductive.cmi \
-    pretyping/evd.cmi pretyping/evarutil.cmi kernel/environ.cmi \
-    kernel/conv_oracle.cmi contrib/xml/acic.cmo \
+contrib/omega/coq_omega.cmo: parsing/ast.cmi 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 library/library.cmi proofs/logic.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    contrib/omega/omega.cmo lib/options.cmi 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: parsing/ast.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 library/library.cmx proofs/logic.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+    contrib/omega/omega.cmx lib/options.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 lib/options.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 lib/options.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: library/nameops.cmi kernel/names.cmi lib/util.cmi 
+contrib/omega/omega.cmx: library/nameops.cmx kernel/names.cmx lib/util.cmx 
+contrib/ring/g_quote.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    interp/genarg.cmi lib/options.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 lib/options.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 lib/options.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 lib/options.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 library/library.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 library/library.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 \
+    library/library.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 \
+    library/library.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/global.cmi library/libnames.cmi kernel/names.cmi \
+    library/nametab.cmi lib/options.cmi kernel/term.cmi lib/util.cmi 
+contrib/romega/const_omega.cmx: lib/bigint.cmx interp/coqlib.cmx \
+    library/global.cmx library/libnames.cmx kernel/names.cmx \
+    library/nametab.cmx lib/options.cmx kernel/term.cmx lib/util.cmx 
+contrib/romega/g_romega.cmo: toplevel/cerrors.cmi parsing/egrammar.cmi \
+    lib/options.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 \
+    lib/options.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 \
+    proofs/logic.cmi kernel/names.cmi contrib/omega/omega.cmo lib/options.cmi \
+    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 \
+    proofs/logic.cmx kernel/names.cmx contrib/omega/omega.cmx lib/options.cmx \
+    lib/pp.cmx parsing/printer.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
+    tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
+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 kernel/inductive.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 kernel/inductive.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/doubleTypeInference.cmo: contrib/xml/acic.cmo \
+    kernel/conv_oracle.cmi kernel/environ.cmi pretyping/evarutil.cmi \
+    pretyping/evd.cmi kernel/inductive.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: 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 kernel/inductive.cmx \
-    pretyping/evd.cmx pretyping/evarutil.cmx kernel/environ.cmx \
-    kernel/conv_oracle.cmx contrib/xml/acic.cmx \
+contrib/xml/doubleTypeInference.cmx: contrib/xml/acic.cmx \
+    kernel/conv_oracle.cmx kernel/environ.cmx pretyping/evarutil.cmx \
+    pretyping/evd.cmx kernel/inductive.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: 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 library/global.cmi \
-    pretyping/evd.cmi pretyping/evarutil.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 library/global.cmx \
-    pretyping/evd.cmx pretyping/evarutil.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 translate/pptacticnew.cmi parsing/pptactic.cmi \
-    lib/pp.cmi lib/options.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 translate/pptacticnew.cmx parsing/pptactic.cmx \
-    lib/pp.cmx lib/options.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/xml/proof2aproof.cmo: pretyping/evarutil.cmi pretyping/evd.cmi \
+    library/global.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: pretyping/evarutil.cmx pretyping/evd.cmx \
+    library/global.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/options.cmi \
+    lib/pp.cmi parsing/pptactic.cmi translate/pptacticnew.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/options.cmx \
+    lib/pp.cmx parsing/pptactic.cmx translate/pptacticnew.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/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 \
+    kernel/inductive.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 kernel/sign.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 \
+    kernel/inductive.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 kernel/sign.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/pcoq.cmi lib/pp.cmi \
+    lib/util.cmi toplevel/vernacinterp.cmi contrib/xml/xmlcommand.cmi 
+contrib/xml/xmlentries.cmx: toplevel/cerrors.cmx parsing/egrammar.cmx \
+    parsing/extend.cmx interp/genarg.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 
-contrib/xml/xmlcommand.cmo: contrib/xml/xml.cmi toplevel/vernac.cmi \
-    lib/util.cmi contrib/xml/unshare.cmi kernel/term.cmi proofs/tacmach.cmi \
-    kernel/sign.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 \
-    kernel/inductive.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 \
-    kernel/sign.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 \
-    kernel/inductive.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.cmi 
-contrib/xml/xmlentries.cmo: contrib/xml/xmlcommand.cmi \
-    toplevel/vernacinterp.cmi lib/util.cmi lib/pp.cmi parsing/pcoq.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 \
-    interp/genarg.cmx parsing/extend.cmx parsing/egrammar.cmx \
-    toplevel/cerrors.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_html_config.cmo: ide/utils/uoptions.cmi \
-    ide/utils/configwin_types.cmo ide/utils/configwin_messages.cmo \
-    ide/utils/configwin_ihm.cmo 
-ide/utils/configwin_html_config.cmx: ide/utils/uoptions.cmx \
-    ide/utils/configwin_types.cmx ide/utils/configwin_messages.cmx \
-    ide/utils/configwin_ihm.cmx 
-ide/utils/configwin_ihm.cmo: ide/utils/uoptions.cmi ide/utils/okey.cmi \
-    ide/utils/configwin_types.cmo ide/utils/configwin_messages.cmo 
-ide/utils/configwin_ihm.cmx: ide/utils/uoptions.cmx ide/utils/okey.cmx \
-    ide/utils/configwin_types.cmx ide/utils/configwin_messages.cmx 
-ide/utils/configwin_types.cmo: ide/utils/uoptions.cmi \
-    ide/utils/configwin_keys.cmo 
-ide/utils/configwin_types.cmx: ide/utils/uoptions.cmx \
-    ide/utils/configwin_keys.cmx 
+ide/utils/configwin_html_config.cmo: ide/utils/configwin_ihm.cmo \
+    ide/utils/configwin_messages.cmo ide/utils/configwin_types.cmo \
+    ide/utils/uoptions.cmi 
+ide/utils/configwin_html_config.cmx: ide/utils/configwin_ihm.cmx \
+    ide/utils/configwin_messages.cmx ide/utils/configwin_types.cmx \
+    ide/utils/uoptions.cmx 
+ide/utils/configwin_ihm.cmo: ide/utils/configwin_messages.cmo \
+    ide/utils/configwin_types.cmo ide/utils/okey.cmi ide/utils/uoptions.cmi 
+ide/utils/configwin_ihm.cmx: ide/utils/configwin_messages.cmx \
+    ide/utils/configwin_types.cmx ide/utils/okey.cmx ide/utils/uoptions.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/configwin_keys.cmo \
+    ide/utils/uoptions.cmi 
+ide/utils/configwin_types.cmx: ide/utils/configwin_keys.cmx \
+    ide/utils/uoptions.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 
@@ -3457,15 +3459,15 @@ tools/coqdoc/alpha.cmo: tools/coqdoc/alpha.cmi
 tools/coqdoc/alpha.cmx: tools/coqdoc/alpha.cmi 
 tools/coqdoc/index.cmo: tools/coqdoc/alpha.cmi tools/coqdoc/index.cmi 
 tools/coqdoc/index.cmx: tools/coqdoc/alpha.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/main.cmx: tools/coqdoc/pretty.cmx tools/coqdoc/output.cmx \
-    tools/coqdoc/index.cmx config/coq_config.cmx 
+tools/coqdoc/main.cmo: config/coq_config.cmi tools/coqdoc/index.cmi \
+    tools/coqdoc/output.cmi tools/coqdoc/pretty.cmi 
+tools/coqdoc/main.cmx: config/coq_config.cmx tools/coqdoc/index.cmx \
+    tools/coqdoc/output.cmx tools/coqdoc/pretty.cmx 
 tools/coqdoc/output.cmo: tools/coqdoc/index.cmi tools/coqdoc/output.cmi 
 tools/coqdoc/output.cmx: tools/coqdoc/index.cmx tools/coqdoc/output.cmi 
-tools/coqdoc/pretty.cmo: tools/coqdoc/output.cmi tools/coqdoc/index.cmi \
+tools/coqdoc/pretty.cmo: tools/coqdoc/index.cmi tools/coqdoc/output.cmi \
     tools/coqdoc/pretty.cmi 
-tools/coqdoc/pretty.cmx: tools/coqdoc/output.cmx tools/coqdoc/index.cmx \
+tools/coqdoc/pretty.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
@@ -3570,72 +3572,80 @@ tools/coq_makefile.cmx:
 tools/coq-tex.cmo: 
 tools/coq-tex.cmx: 
 coq_fix_code.o: kernel/byterun/coq_fix_code.c \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/misc.h \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/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 \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/misc.h \
-  /home/logical/local/lib/ocaml/caml/alloc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/alloc.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
-  kernel/byterun/coq_jumptbl.h
+  kernel/byterun/coq_memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/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 \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/misc.h \
-  /home/logical/local/lib/ocaml/caml/alloc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/alloc.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h
+  kernel/byterun/coq_memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/memory.h
 coq_values.o: kernel/byterun/coq_values.c kernel/byterun/coq_fix_code.h \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/misc.h kernel/byterun/coq_instruct.h \
-  kernel/byterun/coq_memory.h /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
-  /home/logical/local/lib/ocaml/caml/alloc.h
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  kernel/byterun/coq_instruct.h kernel/byterun/coq_memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/memory.h \
+  kernel/byterun/coq_values.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/alloc.h
 coq_fix_code.d.o: kernel/byterun/coq_fix_code.c \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/misc.h \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/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 \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/misc.h \
-  /home/logical/local/lib/ocaml/caml/alloc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/alloc.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
-  kernel/byterun/coq_jumptbl.h
+  kernel/byterun/coq_memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/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 \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/misc.h \
-  /home/logical/local/lib/ocaml/caml/alloc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/alloc.h \
   kernel/byterun/coq_instruct.h kernel/byterun/coq_fix_code.h \
-  kernel/byterun/coq_memory.h /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h
+  kernel/byterun/coq_memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/memory.h
 coq_values.d.o: kernel/byterun/coq_values.c kernel/byterun/coq_fix_code.h \
-  /home/logical/local/lib/ocaml/caml/mlvalues.h \
-  /home/logical/local/lib/ocaml/caml/compatibility.h \
-  /home/logical/local/lib/ocaml/caml/config.h \
-  /home/logical/local/lib/ocaml/caml/misc.h kernel/byterun/coq_instruct.h \
-  kernel/byterun/coq_memory.h /home/logical/local/lib/ocaml/caml/fail.h \
-  /home/logical/local/lib/ocaml/caml/memory.h kernel/byterun/coq_values.h \
-  /home/logical/local/lib/ocaml/caml/alloc.h
+  /auto/demons/sacerdot/local/lib/ocaml/caml/mlvalues.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/compatibility.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/config.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/misc.h \
+  kernel/byterun/coq_instruct.h kernel/byterun/coq_memory.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/fail.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/memory.h \
+  kernel/byterun/coq_values.h \
+  /auto/demons/sacerdot/local/lib/ocaml/caml/alloc.h
diff --git a/CHANGES b/CHANGES
index 4cb22381c..97bb4fc8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,8 @@ Ltac
 Tactics
 
 - Added "dependent rewrite term" and "dependent rewrite term in hyp" (doc TODO)
+- The argument of Declare Left Step and Declare Right Step is now a term
+  (it used to be a reference) (doc TODO)
 - Omega now handles arbitrary precision integers
 
 Modules
diff --git a/Makefile b/Makefile
index fa8b6ebaa..c68f2748f 100644
--- a/Makefile
+++ b/Makefile
@@ -1370,8 +1370,9 @@ GRAMMARNEEDEDCMO=\
   library/nameops.cmo library/libnames.cmo library/summary.cmo \
   library/nametab.cmo library/libobject.cmo library/lib.cmo \
   library/goptions.cmo library/decl_kinds.cmo library/global.cmo \
-  pretyping/termops.cmo pretyping/evd.cmo \
-  pretyping/rawterm.cmo pretyping/pattern.cmo \
+  pretyping/termops.cmo pretyping/evd.cmo pretyping/reductionops.cmo \
+  pretyping/inductiveops.cmo pretyping/rawterm.cmo pretyping/detyping.cmo \
+  pretyping/pattern.cmo \
   interp/topconstr.cmo interp/genarg.cmo interp/ppextend.cmo \
   proofs/tacexpr.cmo \
   parsing/coqast.cmo parsing/ast.cmo \
diff --git a/contrib/extraction/table.ml b/contrib/extraction/table.ml
index f95f81ee9..ce2a99c6d 100644
--- a/contrib/extraction/table.ml
+++ b/contrib/extraction/table.ml
@@ -337,14 +337,22 @@ let add_inline_entries b l =
 
 (* Registration of operations for rollback. *)
 
-let (inline_extraction,_) = 
+let (inline_extraction,_) =
   declare_object 
     {(default_object "Extraction Inline") with 
        cache_function = (fun (_,(b,l)) -> add_inline_entries b l);
        load_function = (fun _ (_,(b,l)) -> add_inline_entries b l);
        export_function = (fun x -> Some x); 
        classify_function = (fun (_,o) -> Substitute o); 
-       subst_function = (fun (_,s,(b,l)) -> (b,(List.map (subst_global s) l))) }
+       (*CSC: The following substitution may istantiate a realized parameter.
+         The right solution would be to make the substitution erase the
+         realizer from the table. However, this is not allowed by Coq.
+         In this particular case, though, keeping the realizer is place seems
+         to be harmless since the current code looks for a realizer only
+         when the constant is a parameter. However, if this behaviour changes
+         subtle bugs can happear in the future. *)
+       subst_function =
+        (fun (_,s,(b,l)) -> (b,(List.map (fun x -> fst (subst_global s x)) l)))}
 
 let _ = declare_summary "Extraction Inline"
 	  { freeze_function = (fun () -> !inline_table);
diff --git a/interp/notation.ml b/interp/notation.ml
index 60e16e709..f90219b24 100644
--- a/interp/notation.ml
+++ b/interp/notation.ml
@@ -369,7 +369,7 @@ let cache_arguments_scope (_,(r,scl)) =
   List.iter (option_iter check_scope) scl;
   arguments_scope := Refmap.add r scl !arguments_scope
 
-let subst_arguments_scope (_,subst,(r,scl)) = (subst_global subst r,scl)
+let subst_arguments_scope (_,subst,(r,scl)) = (fst (subst_global subst r),scl)
 
 let (inArgumentsScope,outArgumentsScope) = 
   declare_object {(default_object "ARGUMENTS-SCOPE") with
diff --git a/interp/syntax_def.ml b/interp/syntax_def.ml
index f2a31f9de..17c0e96c8 100644
--- a/interp/syntax_def.ml
+++ b/interp/syntax_def.ml
@@ -48,7 +48,7 @@ let cache_syntax_constant d =
   load_syntax_constant 1 d
 
 let subst_syntax_constant ((sp,kn),subst,(local,c,onlyparse)) =
-  (local,subst_aconstr subst c,onlyparse)
+  (local,subst_aconstr subst [] c,onlyparse)
 
 let classify_syntax_constant (_,(local,_,_ as o)) =
   if local then Dispose else Substitute o
diff --git a/interp/topconstr.ml b/interp/topconstr.ml
index 56e2171e9..f18be16cc 100644
--- a/interp/topconstr.ml
+++ b/interp/topconstr.ml
@@ -111,100 +111,6 @@ let rec subst_pat subst pat =
         if kn' == kn && cpl' == cpl then pat else
           PatCstr (loc,((kn',i),j),cpl',n)
 
-let rec subst_aconstr subst raw =
-  match raw with
-  | ARef ref -> 
-      let ref' = subst_global subst ref in 
-	if ref' == ref then raw else
-	  ARef ref'
-
-  | AVar _ -> raw
-
-  | AApp (r,rl) -> 
-      let r' = subst_aconstr subst r 
-      and rl' = list_smartmap (subst_aconstr subst) rl in
-	if r' == r && rl' == rl then raw else
-	  AApp(r',rl')
-
-  | AList (id1,id2,r1,r2,b) -> 
-      let r1' = subst_aconstr subst r1 and r2' = subst_aconstr subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  AList (id1,id2,r1',r2',b)
-
-  | ALambda (n,r1,r2) -> 
-      let r1' = subst_aconstr subst r1 and r2' = subst_aconstr subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  ALambda (n,r1',r2')
-
-  | AProd (n,r1,r2) -> 
-      let r1' = subst_aconstr subst r1 and r2' = subst_aconstr subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  AProd (n,r1',r2')
-
-  | ALetIn (n,r1,r2) -> 
-      let r1' = subst_aconstr subst r1 and r2' = subst_aconstr subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  ALetIn (n,r1',r2')
-
-  | ACases (ro,rtntypopt,rl,branches) -> 
-      let ro' = option_smartmap (subst_aconstr subst) ro 
-      and rtntypopt' = option_smartmap (subst_aconstr subst) rtntypopt
-      and rl' = list_smartmap
-        (fun (a,(n,signopt) as x) -> 
-	  let a' = subst_aconstr subst a in
-	  let signopt' = option_app (fun ((indkn,i),nal as z) ->
-	    let indkn' = subst_kn subst indkn in
-	    if indkn == indkn' then z else ((indkn',i),nal)) signopt in
-	  if a' == a && signopt' == signopt then x else (a',(n,signopt')))
-        rl
-      and branches' = list_smartmap 
-                        (fun (idl,cpl,r as branch) ->
-                           let cpl' = list_smartmap (subst_pat subst) cpl
-                           and r' = subst_aconstr subst r in
-                             if cpl' == cpl && r' == r then branch else
-                               (idl,cpl',r'))
-                        branches
-      in
-        if ro' == ro && rtntypopt == rtntypopt' &
-          rl' == rl && branches' == branches then raw else
-          ACases (ro',rtntypopt',rl',branches')
-
-  | AOrderedCase (b,ro,r,ra) -> 
-      let ro' = option_smartmap (subst_aconstr subst) ro
-      and r' = subst_aconstr subst r 
-      and ra' = array_smartmap (subst_aconstr subst) ra in
-	if ro' == ro && r' == r && ra' == ra then raw else
-	  AOrderedCase (b,ro',r',ra')
-
-  | ALetTuple (nal,(na,po),b,c) ->
-      let po' = option_smartmap (subst_aconstr subst) po
-      and b' = subst_aconstr subst b 
-      and c' = subst_aconstr subst c in
-	if po' == po && b' == b && c' == c then raw else
-	  ALetTuple (nal,(na,po'),b',c')
-
-  | AIf (c,(na,po),b1,b2) ->
-      let po' = option_smartmap (subst_aconstr subst) po
-      and b1' = subst_aconstr subst b1
-      and b2' = subst_aconstr subst b2 
-      and c' = subst_aconstr subst c in
-	if po' == po && b1' == b1 && b2' == b2 && c' == c then raw else
-	  AIf (c',(na,po'),b1',b2')
-
-  | APatVar _ | ASort _ -> raw
-
-  | AHole (Evd.ImplicitArg (ref,i)) ->
-      let ref' = subst_global subst ref in 
-	if ref' == ref then raw else
-	  AHole (Evd.ImplicitArg (ref',i))
-  | AHole (Evd.BinderType _ | Evd.QuestionMark | Evd.CasesType |
-      Evd.InternalHole | Evd.TomatchTypeParameter _) -> raw
-
-  | ACast (r1,r2) -> 
-      let r1' = subst_aconstr subst r1 and r2' = subst_aconstr subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  ACast (r1',r2')
-
 let add_name r = function
   | Anonymous -> ()
   | Name id -> r := id :: !r
@@ -334,6 +240,104 @@ let aconstr_of_rawconstr vars a =
   List.iter check_type vars;
   a
 
+let aconstr_of_constr avoiding t =
+ aconstr_of_rawconstr [] (Detyping.detype (false,Global.env()) avoiding [] t)
+
+let rec subst_aconstr subst bound raw =
+  match raw with
+  | ARef ref -> 
+      let ref',t = subst_global subst ref in 
+	if ref' == ref then raw else
+	  aconstr_of_constr bound t
+
+  | AVar _ -> raw
+
+  | AApp (r,rl) -> 
+      let r' = subst_aconstr subst bound r 
+      and rl' = list_smartmap (subst_aconstr subst bound) rl in
+	if r' == r && rl' == rl then raw else
+	  AApp(r',rl')
+
+  | AList (id1,id2,r1,r2,b) -> 
+      let r1' = subst_aconstr subst bound r1 and r2' = subst_aconstr subst bound r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  AList (id1,id2,r1',r2',b)
+
+  | ALambda (n,r1,r2) -> 
+      let r1' = subst_aconstr subst bound r1 and r2' = subst_aconstr subst bound r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  ALambda (n,r1',r2')
+
+  | AProd (n,r1,r2) -> 
+      let r1' = subst_aconstr subst bound r1 and r2' = subst_aconstr subst bound r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  AProd (n,r1',r2')
+
+  | ALetIn (n,r1,r2) -> 
+      let r1' = subst_aconstr subst bound r1 and r2' = subst_aconstr subst bound r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  ALetIn (n,r1',r2')
+
+  | ACases (ro,rtntypopt,rl,branches) -> 
+      let ro' = option_smartmap (subst_aconstr subst bound) ro 
+      and rtntypopt' = option_smartmap (subst_aconstr subst bound) rtntypopt
+      and rl' = list_smartmap
+        (fun (a,(n,signopt) as x) -> 
+	  let a' = subst_aconstr subst bound a in
+	  let signopt' = option_app (fun ((indkn,i),nal as z) ->
+	    let indkn' = subst_kn subst indkn in
+	    if indkn == indkn' then z else ((indkn',i),nal)) signopt in
+	  if a' == a && signopt' == signopt then x else (a',(n,signopt')))
+        rl
+      and branches' = list_smartmap 
+                        (fun (idl,cpl,r as branch) ->
+                           let cpl' = list_smartmap (subst_pat subst) cpl
+                           and r' = subst_aconstr subst bound r in
+                             if cpl' == cpl && r' == r then branch else
+                               (idl,cpl',r'))
+                        branches
+      in
+        if ro' == ro && rtntypopt == rtntypopt' &
+          rl' == rl && branches' == branches then raw else
+          ACases (ro',rtntypopt',rl',branches')
+
+  | AOrderedCase (b,ro,r,ra) -> 
+      let ro' = option_smartmap (subst_aconstr subst bound) ro
+      and r' = subst_aconstr subst bound r 
+      and ra' = array_smartmap (subst_aconstr subst bound) ra in
+	if ro' == ro && r' == r && ra' == ra then raw else
+	  AOrderedCase (b,ro',r',ra')
+
+  | ALetTuple (nal,(na,po),b,c) ->
+      let po' = option_smartmap (subst_aconstr subst bound) po
+      and b' = subst_aconstr subst bound b 
+      and c' = subst_aconstr subst bound c in
+	if po' == po && b' == b && c' == c then raw else
+	  ALetTuple (nal,(na,po'),b',c')
+
+  | AIf (c,(na,po),b1,b2) ->
+      let po' = option_smartmap (subst_aconstr subst bound) po
+      and b1' = subst_aconstr subst bound b1
+      and b2' = subst_aconstr subst bound b2 
+      and c' = subst_aconstr subst bound c in
+	if po' == po && b1' == b1 && b2' == b2 && c' == c then raw else
+	  AIf (c',(na,po'),b1',b2')
+
+  | APatVar _ | ASort _ -> raw
+
+  | AHole (Evd.ImplicitArg (ref,i)) ->
+      let ref',t = subst_global subst ref in 
+	if ref' == ref then raw else
+	  AHole (Evd.InternalHole)
+  | AHole (Evd.BinderType _ | Evd.QuestionMark | Evd.CasesType |
+      Evd.InternalHole | Evd.TomatchTypeParameter _) -> raw
+
+  | ACast (r1,r2) -> 
+      let r1' = subst_aconstr subst bound r1 and r2' = subst_aconstr subst bound r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  ACast (r1',r2')
+
+
 let encode_list_value l = RApp (dummy_loc,RVar (dummy_loc,ldots_var),l)
 
 (* Pattern-matching rawconstr and aconstr *)
diff --git a/interp/topconstr.mli b/interp/topconstr.mli
index 152a54dc0..9b9dd80dc 100644
--- a/interp/topconstr.mli
+++ b/interp/topconstr.mli
@@ -48,7 +48,7 @@ val rawconstr_of_aconstr_with_binders : loc ->
   (identifier -> 'a -> identifier * 'a) ->
   ('a -> aconstr -> rawconstr) -> 'a -> aconstr -> rawconstr
 
-val subst_aconstr : substitution -> aconstr -> aconstr
+val subst_aconstr : substitution -> Names.identifier list -> aconstr -> aconstr
 
 val aconstr_of_rawconstr : identifier list -> rawconstr -> aconstr
 
diff --git a/kernel/cemitcodes.ml b/kernel/cemitcodes.ml
index 8e31f5976..cccb18443 100644
--- a/kernel/cemitcodes.ml
+++ b/kernel/cemitcodes.ml
@@ -255,7 +255,7 @@ let subst_patch s (ri,pos) =
       let ci = {a.ci with ci_ind = (subst_kn s kn,i)} in
       (Reloc_annot {a with ci = ci},pos)
   | Reloc_const sc -> (Reloc_const (subst_strcst s sc), pos)
-  | Reloc_getglobal kn -> (Reloc_getglobal (subst_con s kn), pos)
+  | Reloc_getglobal kn -> (Reloc_getglobal (fst (subst_con s kn)), pos)
 
 let subst_to_patch s (code,pl,fv) = 
   code,List.rev_map (subst_patch s) pl,fv
@@ -267,7 +267,7 @@ type body_code =
 
 let subst_body_code s = function
   | BCdefined (b,tp) -> BCdefined (b,subst_to_patch s tp)
-  | BCallias kn -> BCallias (subst_con s kn)
+  | BCallias kn -> BCallias (fst (subst_con s kn))
   | BCconstant -> BCconstant
 
 type to_patch_substituted = body_code substituted
diff --git a/kernel/mod_subst.ml b/kernel/mod_subst.ml
index 48bb9933c..e0d16d499 100644
--- a/kernel/mod_subst.ml
+++ b/kernel/mod_subst.ml
@@ -13,6 +13,20 @@ open Util
 open Names
 open Term
 
+(* WARNING: not every constant in the associative list domain used to exist
+   in the environment. This allows a simple implementation of the join
+   operation. However, iterating over the associative list becomes a non-sense
+*)
+type resolver = (constant * constr option) list
+
+let make_resolver resolve = resolve
+
+let apply_opt_resolver resolve kn =
+ match resolve with
+    None -> None
+  | Some resolve ->
+     try List.assoc kn resolve with Not_found -> assert false
+
 type substitution_domain = MSI of mod_self_id | MBI of mod_bound_id
 
 let string_of_subst_domain = function
@@ -24,21 +38,21 @@ module Umap = Map.Make(struct
 			 let compare = Pervasives.compare
 		       end)
 
-(* this is correct under the condition that bound and struct
-   identifiers can never be identical (i.e. get the same stamp)! *) 
-
-type substitution = module_path Umap.t
+type substitution = (module_path * resolver option) Umap.t
 
 let empty_subst = Umap.empty
 
-let add_msid sid = Umap.add (MSI sid)
-let add_mbid bid = Umap.add (MBI bid)
+let add_msid msid mp =
+  Umap.add (MSI msid) (mp,None)
+let add_mbid mbid mp resolve =
+ let mp' = MBI mbid in
+  Umap.add (MBI mbid) (mp,resolve)
 
 let map_msid msid mp = add_msid msid mp empty_subst
-let map_mbid mbid mp = add_mbid mbid mp empty_subst
+let map_mbid mbid mp resolve = add_mbid mbid mp resolve empty_subst
 
 let list_contents sub = 
-  let one_pair uid mp l =
+  let one_pair uid (mp,_) l =
     (string_of_subst_domain uid, string_of_mp mp)::l
   in
     Umap.fold one_pair sub []
@@ -53,22 +67,155 @@ let debug_pr_subst sub =
   in
     str "{" ++ hov 2 (prlist_with_sep pr_coma f l) ++ str "}" 
 
-let rec subst_mp sub mp = (* 's like subst *)
+let subst_mp0 sub mp = (* 's like subst *)
+ let rec aux mp =
   match mp with
     | MPself sid -> 
-	(try Umap.find (MSI sid) sub with Not_found -> mp)
+        let mp',resolve = Umap.find (MSI sid) sub in
+         mp',resolve
     | MPbound bid ->
-	(try Umap.find (MBI bid) sub with Not_found -> mp)
+        let mp',resolve = Umap.find (MBI bid) sub in
+         mp',resolve
+    | MPdot (mp1,l) -> 
+	let mp1',resolve = aux mp1 in
+	 MPdot (mp1',l),resolve
+    | _ -> raise Not_found
+ in
+  try Some (aux mp) with Not_found -> None
+
+let subst_mp sub mp =
+ match subst_mp0 sub mp with
+    None -> mp
+  | Some (mp',_) -> mp'
+
+
+let subst_kn0 sub kn =
+ let mp,dir,l = repr_kn kn in
+  match subst_mp0 sub mp with
+     Some (mp',_) ->
+      Some (make_kn mp' dir l)
+   | None -> None
+
+let subst_kn sub kn =
+ match subst_kn0 sub kn with
+    None -> kn
+  | Some kn' -> kn'
+
+let subst_con sub con =
+ let mp,dir,l = repr_con con in
+  match subst_mp0 sub mp with
+     None -> con,mkConst con
+   | Some (mp',resolve) ->
+      let con' = make_con mp' dir l in
+       match apply_opt_resolver resolve con with
+          None -> con',mkConst con'
+        | Some t -> con',t
+
+(* Here the semantics is completely unclear.
+   What does "Hint Unfold t" means when "t" is a parameter?
+   Does the user mean "Unfold X.t" or does she mean "Unfold y"
+   where X.t is later on instantiated with y? I choose the first
+   interpretation (i.e. an evaluable reference is never expanded). *)
+let subst_evaluable_reference subst = function
+  | EvalVarRef id -> EvalVarRef id
+  | EvalConstRef kn -> EvalConstRef (fst (subst_con subst kn))
+
+(* 
+This should be rewritten to prevent duplication of constr's when not
+necessary.
+For now, it uses map_constr and is rather ineffective
+*)
+
+let rec map_kn f f' c = 
+  let func = map_kn f f' in
+    match kind_of_term c with
+      | Const kn -> f' kn
+      | Ind (kn,i) -> 
+         (match f kn with
+             None -> c
+           | Some kn' ->
+	      mkInd (kn',i))
+      | Construct ((kn,i),j) -> 
+         (match f kn with
+             None -> c
+           | Some kn' ->
+	      mkConstruct ((kn',i),j))
+      | Case (ci,p,c,l) ->
+	  let ci' =
+           { ci with
+              ci_ind =
+               let (kn,i) = ci.ci_ind in
+                match f kn with None -> ci.ci_ind | Some kn' -> kn',i } in
+	  mkCase (ci', func p, func c, array_smartmap func l) 
+      | _ -> map_constr func c
+
+let subst_mps sub = 
+  map_kn (subst_kn0 sub) (fun con -> snd (subst_con sub con))
+
+let rec replace_mp_in_mp mpfrom mpto mp =
+  match mp with
+    | _ when mp = mpfrom -> mpto
     | MPdot (mp1,l) -> 
-	let mp1' = subst_mp sub mp1 in
-	  if mp1==mp1' then 
-	    mp
-	  else
-	    MPdot (mp1',l)
+	let mp1' = replace_mp_in_mp mpfrom mpto mp1 in
+	  if mp1==mp1' then mp
+	  else MPdot (mp1',l)
     | _ -> mp
 
-let join subst1 subst2 = 
-  let subst = Umap.map (subst_mp subst2) subst1 in
+let replace_mp_in_con mpfrom mpto kn =
+ let mp,dir,l = repr_con kn in
+  let mp'' = replace_mp_in_mp mpfrom mpto mp in
+    if mp==mp'' then kn
+    else make_con mp'' dir l
+
+exception BothSubstitutionsAreIdentitySubstitutions
+exception ChangeDomain of resolver
+
+let join (subst1 : substitution) (subst2 : substitution) = 
+  let apply_subst (sub : substitution) key (mp,resolve) =
+   let mp',resolve' =
+    match subst_mp0 sub mp with
+       None -> mp, None
+     | Some (mp',resolve') -> mp',resolve' in
+   let resolve'' : resolver option =
+    try
+     let res =
+      match resolve with
+         Some res -> res
+       | None ->
+          match resolve' with
+             None -> raise BothSubstitutionsAreIdentitySubstitutions
+           | Some res -> raise (ChangeDomain res)
+     in
+      Some
+       (List.map
+         (fun (kn,topt) ->
+           kn,
+           match topt with
+              None ->
+               (match key with
+                   MSI msid ->
+                    let kn' = replace_mp_in_con (MPself msid) mp kn in
+                     apply_opt_resolver resolve' kn'
+                 | MBI mbid ->
+                    let kn' = replace_mp_in_con (MPbound mbid) mp kn in
+                     apply_opt_resolver resolve' kn')
+            | Some t -> Some (subst_mps sub t)) res)
+    with
+       BothSubstitutionsAreIdentitySubstitutions -> None
+     | ChangeDomain res ->
+        Some
+         ((List.map
+            (fun (kn,topt) ->
+              let key' =
+               match key with
+                  MSI msid -> MPself msid
+                | MBI mbid -> MPbound mbid in
+              (* let's replace mp with key in kn *)
+              let kn' = replace_mp_in_con mp key' kn in
+               kn',topt)) res)
+   in
+    mp',resolve'' in
+  let subst = Umap.mapi (apply_subst subst2) subst1 in
   Umap.fold Umap.add subst2 subst
 
 let rec occur_in_path uid path =
@@ -79,7 +226,7 @@ let rec occur_in_path uid path =
   | _ -> false
     
 let occur_uid uid sub = 
-  let check_one uid' mp =
+  let check_one uid' (mp,_) =
     if uid = uid' || occur_in_path uid mp then raise Exit
   in
     try 
@@ -112,42 +259,3 @@ let subst_substituted s r =
   | LSlazy(s',a) ->
       let s'' = join s' s in
       ref (LSlazy(s'',a))
-
-let subst_kn sub kn =
- let mp,dir,l = repr_kn kn in
-  let mp' = subst_mp sub mp in
-    if mp==mp' then kn else make_kn mp' dir l
-
-let subst_con sub con =
- let mp,dir,l = repr_con con in
-  let mp' = subst_mp sub mp in
-    if mp==mp' then con else make_con mp' dir l
-
-let subst_evaluable_reference subst = function
-  | EvalVarRef id -> EvalVarRef id
-  | EvalConstRef kn -> EvalConstRef (subst_con subst kn)
-
-(* 
-map_kn : (kernel_name -> kernel_name) -> constr -> constr
-
-This should be rewritten to prevent duplication of constr's when not
-necessary.
-For now, it uses map_constr and is rather ineffective
-*)
-
-let rec map_kn f f_con c = 
-  let func = map_kn f f_con in
-    match kind_of_term c with
-      | Const kn -> 
-	  mkConst (f_con kn)
-      | Ind (kn,i) -> 
-	  mkInd (f kn,i)
-      | Construct ((kn,i),j) -> 
-	  mkConstruct ((f kn,i),j)
-      | Case (ci,p,c,l) ->
-	  let ci' = { ci with ci_ind = let (kn,i) = ci.ci_ind in f kn, i } in
-	  mkCase (ci', func p, func c, array_smartmap func l) 
-      | _ -> map_constr func c
-
-let subst_mps sub = 
-  map_kn (subst_kn sub) (subst_con sub)
diff --git a/kernel/mod_subst.mli b/kernel/mod_subst.mli
index f4003c7f9..89491e2f9 100644
--- a/kernel/mod_subst.mli
+++ b/kernel/mod_subst.mli
@@ -8,22 +8,27 @@
 
 (*i $Id$ i*)
 
+(*s Mod_subst *)
+
 open Names
 open Term
 
-(*s Substitutions *)
-
+type resolver
 type substitution
 
+val make_resolver :  (constant * constr option) list -> resolver
+
 val empty_subst : substitution
 
 val add_msid : 
   mod_self_id -> module_path -> substitution -> substitution
 val add_mbid : 
-  mod_bound_id -> module_path -> substitution -> substitution
+  mod_bound_id -> module_path -> resolver option -> substitution -> substitution
 
-val map_msid : mod_self_id -> module_path -> substitution
-val map_mbid : mod_bound_id -> module_path -> substitution
+val map_msid :
+  mod_self_id -> module_path -> substitution
+val map_mbid :
+  mod_bound_id -> module_path -> resolver option -> substitution
 
 (* sequential composition: 
    [substitute (join sub1 sub2) t = substitute sub2 (substitute sub1 t)]
@@ -47,18 +52,29 @@ val debug_pr_subst : substitution -> Pp.std_ppcmds
 val subst_mp : 
   substitution -> module_path -> module_path
 
-(* [occur_*id id sub] returns true iff [id] occurs in [sub] 
-   on either side *)
+val subst_kn :
+  substitution -> kernel_name -> kernel_name
 
-val occur_msid : mod_self_id -> substitution -> bool
-val occur_mbid : mod_bound_id -> substitution -> bool
+val subst_con :
+  substitution -> constant -> constant * constr
 
-val subst_kn : substitution -> kernel_name -> kernel_name
-val subst_con : substitution -> constant -> constant
+(* Here the semantics is completely unclear.
+   What does "Hint Unfold t" means when "t" is a parameter?
+   Does the user mean "Unfold X.t" or does she mean "Unfold y"
+   where X.t is later on instantiated with y? I choose the first
+   interpretation (i.e. an evaluable reference is never expanded). *)
 val subst_evaluable_reference :
   substitution -> evaluable_global_reference -> evaluable_global_reference
 
+(* [replace_mp_in_con mp mp' con] replaces [mp] with [mp'] in [con] *)
+val replace_mp_in_con : module_path -> module_path -> constant -> constant
 
 (* [subst_mps sub c] performs the substitution [sub] on all kernel
    names appearing in [c] *)
 val subst_mps : substitution -> constr -> constr
+
+(* [occur_*id id sub] returns true iff [id] occurs in [sub] 
+   on either side *)
+
+val occur_msid : mod_self_id -> substitution -> bool
+val occur_mbid : mod_bound_id -> substitution -> bool
diff --git a/kernel/mod_typing.ml b/kernel/mod_typing.ml
index 0001a6c5e..1d63486ba 100644
--- a/kernel/mod_typing.ml
+++ b/kernel/mod_typing.ml
@@ -259,8 +259,13 @@ and translate_mexpr env mexpr = match mexpr with
 	  | Not_path -> error_application_to_not_path mexpr
 	      (* place for nondep_supertype *)
       in
+       let resolve = Modops.resolver_of_environment farg_id farg_b mp env in
 	MEBapply(feb,meb,cst),
-	subst_modtype (map_mbid farg_id mp) fbody_b
+        (* This is the place where the functor formal parameter is
+           substituted by the given argument to compute the type of the
+           functor application. *)
+	subst_modtype
+         (map_mbid farg_id mp (Some resolve)) fbody_b
   | MEstruct (msid,structure) ->
       let structure,signature = translate_entry_list env msid true structure in
 	MEBstruct (msid,structure),
diff --git a/kernel/mod_typing.mli b/kernel/mod_typing.mli
index 73dc91481..cfcc7bd58 100644
--- a/kernel/mod_typing.mli
+++ b/kernel/mod_typing.mli
@@ -19,6 +19,8 @@ val translate_modtype : env -> module_type_entry -> module_type_body
 
 val translate_module : env -> module_entry -> module_body
 
+val translate_mexpr : env -> module_expr -> module_expr_body * module_type_body
+
 val add_modtype_constraints : env -> module_type_body -> env
 
 val add_module_constraints : env -> module_body -> env
diff --git a/kernel/modops.ml b/kernel/modops.ml
index 0a1897832..2808973fa 100644
--- a/kernel/modops.ml
+++ b/kernel/modops.ml
@@ -124,6 +124,9 @@ let rec check_modpath_equiv env mp1 mp2 =
 
 
 let rec subst_modtype sub = function
+    (* This is the case in which I am substituting a whole module.
+       For instance "Module M(X). Module N := X. End M". When I apply
+       M to M' I must substitute M' for X in "Module N := X". *)
   | MTBident ln -> MTBident (subst_kn sub ln)
   | MTBfunsig (arg_id, arg_b, body_b) ->
       if occur_mbid arg_id sub then failwith "capture";
@@ -149,16 +152,62 @@ and subst_signature sub sign =
 
 and subst_module sub mb =
   let mtb' = subst_modtype sub mb.msb_modtype in
+  (* This is similar to the previous case. In this case we have
+     a module M in a signature that is knows to be equivalent to a module M'
+     (because the signature is "K with Module M := M'") and we are substituting
+     M' with some M''. *)
   let mpo' = option_smartmap (subst_mp sub) mb.msb_equiv in
     if mtb'==mb.msb_modtype && mpo'==mb.msb_equiv then mb else
       { msb_modtype=mtb'; 
 	msb_equiv=mpo'; 
 	msb_constraints=mb.msb_constraints}
 
-
 let subst_signature_msid msid mp = 
   subst_signature (map_msid msid mp)
 
+let rec constants_of_specification env mp sign =
+ let aux res (l,elem) =
+  match elem with
+   | SPBconst cb -> (make_con mp empty_dirpath l)::res
+   | SPBmind _ -> res
+   | SPBmodule mb ->
+      (constants_of_modtype env (MPdot (mp,l))
+        (module_body_of_spec mb).mod_type) @ res
+   | SPBmodtype mtb -> res (* ???? *)
+ in
+  List.fold_left aux [] sign
+
+and constants_of_modtype env mp modtype =
+ match scrape_modtype env modtype with
+    MTBident _ -> anomaly "scrape_modtype does not work!"
+  | MTBsig (msid,sign) ->
+     constants_of_specification env mp
+      (subst_signature_msid msid mp sign)
+  | MTBfunsig _ -> []
+
+(* returns a resolver for kn that maps mbid to mp and then delta-expands
+   the obtained constants according to env *)
+let resolver_of_environment mbid modtype mp env =
+ let constants = constants_of_modtype env (MPbound mbid) modtype in
+ let resolve =
+  List.map
+   (fun con ->
+     let con' = replace_mp_in_con (MPbound mbid) mp con in
+     let constr =
+      try
+       let constant = lookup_constant con' env in
+        if constant.Declarations.const_opaque then
+         None
+        else
+         option_app Declarations.force
+          constant.Declarations.const_body
+      with Not_found -> assert false
+     in
+      con,constr
+   ) constants
+ in
+  Mod_subst.make_resolver resolve
+
 (* we assume that the substitution of "mp" into "msid" is already done
 (or unnecessary) *)
 let rec add_signature mp sign env = 
@@ -182,7 +231,6 @@ and add_module mp mb env =
       | MTBident _ -> anomaly "scrape_modtype does not work!"
       | MTBsig (msid,sign) -> 
 	  add_signature mp (subst_signature_msid msid mp sign) env
-
       | MTBfunsig _ -> env
 
 
@@ -247,3 +295,4 @@ and strengthen_sig env msid sign mp = match sign with
 	item::rest'
 
 let strengthen env mtb mp = strengthen_mtb env mp mtb
+
diff --git a/kernel/modops.mli b/kernel/modops.mli
index 0e1d9cd34..e770edc93 100644
--- a/kernel/modops.mli
+++ b/kernel/modops.mli
@@ -95,3 +95,6 @@ val error_with_incorrect : label -> 'a
 val error_local_context : label option -> 'a
 
 val error_circular_with_module : identifier -> 'a
+
+val resolver_of_environment :
+ mod_bound_id -> module_type_body -> module_path -> env -> resolver
diff --git a/kernel/subtyping.ml b/kernel/subtyping.ml
index 383f7c2c9..9f03b57c5 100644
--- a/kernel/subtyping.ml
+++ b/kernel/subtyping.ml
@@ -249,8 +249,10 @@ and check_modtypes cst env mtb1 mtb2 equiv =
 	    add_module (MPbound arg_id2) (module_body_of_type arg_t2) env 
 	  in
 	  let body_t1' = 
+            (* since we are just checking well-typedness we do not need
+               to expand any constant. Hence the identity resolver. *)
 	    subst_modtype 
-	      (map_mbid arg_id1 (MPbound arg_id2)) 
+              (map_mbid arg_id1 (MPbound arg_id2) None)
 	      body_t1
 	  in
 	  check_modtypes cst env' body_t1' body_t2 equiv
diff --git a/library/declaremods.ml b/library/declaremods.ml
index e1a27314f..ddcfd1bcd 100644
--- a/library/declaremods.ml
+++ b/library/declaremods.ml
@@ -698,21 +698,25 @@ let declare_modtype interp_modtype id args mty =
   ignore (add_leaf id (in_modtype (Some entry, substobjs)))
 			       
 
-
-let rec get_module_substobjs = function
+let rec get_module_substobjs env = function
   | MEident mp -> MPmap.find mp !modtab_substobjs 
   | MEfunctor (mbid,mty,mexpr) ->
-      let (subst, mbids, msid, objs) = 
-	get_module_substobjs mexpr 
-      in
+       let (subst, mbids, msid, objs) = get_module_substobjs env mexpr in
 	(subst, mbid::mbids, msid, objs)
   | MEstruct (msid,_) ->
       (empty_subst, [], msid, [])
   | MEapply (mexpr, MEident mp) ->
-      let (subst, mbids, msid, objs) = get_module_substobjs mexpr in
+      let feb,ftb = Mod_typing.translate_mexpr env mexpr in
+      let ftb = Modops.scrape_modtype env ftb in
+      let farg_id, farg_b, fbody_b = Modops.destr_functor ftb in
+      let (subst, mbids, msid, objs) = get_module_substobjs env mexpr in
 	(match mbids with
 	   | mbid::mbids ->
-	       (add_mbid mbid mp subst, mbids, msid, objs)
+              let resolve =
+               Modops.resolver_of_environment farg_id farg_b mp env in
+               (* application outside the kernel, only for substitutive
+                  objects (that are all non-logical objects) *)
+	       (add_mbid mbid mp (Some resolve) subst, mbids, msid, objs)
 	   | [] -> match mexpr with
 	       | MEident _ | MEstruct _ -> error "Application of a non-functor"
 	       | _ -> error "Application of a functor with too few arguments")
@@ -758,7 +762,7 @@ let declare_module interp_modtype interp_modexpr id args mty_o mexpr_o =
   let substobjs =
     match entry with
       | {mod_entry_type = Some mte} -> get_modtype_substobjs mte
-      | {mod_entry_expr = Some mexpr} -> get_module_substobjs mexpr
+      | {mod_entry_expr = Some mexpr} -> get_module_substobjs env mexpr
       | _ -> anomaly "declare_module: No type, no body ..."
   in
     Summary.unfreeze_summaries fs;
diff --git a/library/impargs.ml b/library/impargs.ml
index d77543367..8daf939ef 100644
--- a/library/impargs.ml
+++ b/library/impargs.ml
@@ -358,7 +358,7 @@ let cache_implicits_decl (r,imps) =
 let cache_implicits (_,l) = List.iter cache_implicits_decl l
 
 let subst_implicits_decl subst (r,imps as o) =
-  let r' = subst_global subst r in if r==r' then o else (r',imps)
+  let r' = fst (subst_global subst r) in if r==r' then o else (r',imps)
 
 let subst_implicits (_,subst,l) =
   list_smartmap (subst_implicits_decl subst) l
diff --git a/library/libnames.ml b/library/libnames.ml
index fd5bb2196..f21b98698 100644
--- a/library/libnames.ml
+++ b/library/libnames.ml
@@ -22,16 +22,16 @@ type global_reference =
   | ConstructRef of constructor
 
 let subst_global subst ref = match ref with
-  | VarRef _ -> ref
+  | VarRef var -> ref, mkVar var
   | ConstRef kn ->
-      let kn' = subst_con subst kn in if kn==kn' then ref else
-          ConstRef kn'
+     let kn',t = subst_con subst kn in
+      if kn==kn' then ref, mkConst kn else ConstRef kn', t
   | IndRef (kn,i) ->
-      let kn' = subst_kn subst kn in if kn==kn' then ref else
-          IndRef(kn',i)
+      let kn' = subst_kn subst kn in if kn==kn' then ref, mkInd (kn,i) else
+          IndRef(kn',i), mkInd (kn',i)
   | ConstructRef ((kn,i),j) ->
-      let kn' = subst_kn subst kn in if kn==kn' then ref else
-          ConstructRef ((kn',i),j)
+      let kn' = subst_kn subst kn in if kn==kn' then ref, mkConstruct ((kn,i),j)
+          else ConstructRef ((kn',i),j), mkConstruct ((kn',i),j)
 
 let reference_of_constr c = match kind_of_term c with
   | Const sp -> ConstRef sp
diff --git a/library/libnames.mli b/library/libnames.mli
index b2c32f89b..379ce64b4 100644
--- a/library/libnames.mli
+++ b/library/libnames.mli
@@ -23,7 +23,7 @@ type global_reference =
   | IndRef of inductive
   | ConstructRef of constructor
 
-val subst_global : substitution -> global_reference -> global_reference
+val subst_global : substitution -> global_reference -> global_reference * constr
 
 (* Turn a global reference into a construction *)
 val constr_of_reference : global_reference -> constr
diff --git a/parsing/ast.ml b/parsing/ast.ml
index e366600c8..eef1ca4b7 100755
--- a/parsing/ast.ml
+++ b/parsing/ast.ml
@@ -588,22 +588,3 @@ let rec occur_var_ast s = function
   | Slam(_,sopt,body) -> (Some s <> sopt) & occur_var_ast s body
   | Id _ | Str _ | Num _ | Path _ | ConPath _ -> false
   | Dynamic _ -> (* Hum... what to do here *) false
-
-
-(**********************************************************************)
-(* Object substitution in modules *)
-
-let rec subst_astpat subst = function
-  | Pquote a -> Pquote (subst_ast subst a)
-  | Pmeta _ as p -> p
-  | Pnode (s,pl) -> Pnode (s,subst_astpatlist subst pl)
-  | Pslam (ido,p) -> Pslam (ido,subst_astpat subst p)
-  | Pmeta_slam (s,p) -> Pmeta_slam (s,subst_astpat subst p)
-
-and subst_astpatlist subst = function
-  | Pcons (p,pl) -> Pcons (subst_astpat subst p, subst_astpatlist subst pl)
-  | (Plmeta _ | Pnil) as pl -> pl
-
-let subst_pat subst = function
-  | AstListPat pl -> AstListPat (subst_astpatlist subst pl)
-  | PureAstPat p -> PureAstPat (subst_astpat subst p)
diff --git a/parsing/ast.mli b/parsing/ast.mli
index b915c6552..9c7eec43c 100755
--- a/parsing/ast.mli
+++ b/parsing/ast.mli
@@ -46,7 +46,7 @@ val meta_of_ast : Coqast.t -> string
 
 (* patterns of ast *)
 type astpat =
-  | Pquote of t
+  | Pquote of Coqast.t
   | Pmeta of string * tok_kind
   | Pnode of string * patlist
   | Pslam of identifier option * astpat
@@ -119,6 +119,3 @@ val find_all_matches : ('a -> astpat) -> env -> t -> 'a list -> ('a * env) list
 val first_matchl : ('a -> patlist) -> env -> Coqast.t list -> 'a list ->
   ('a * env) option
 val to_pat : entry_env -> Coqast.t -> (astpat * entry_env)
-
-(* Object substitution in modules *)
-val subst_astpat : substitution -> astpat -> astpat
diff --git a/parsing/coqast.ml b/parsing/coqast.ml
index a80982f8a..3811dd322 100644
--- a/parsing/coqast.ml
+++ b/parsing/coqast.ml
@@ -102,31 +102,3 @@ let hcons_ast (hstr,hid,hpath,hconpath) =
   let hloc = Hashcons.simple_hcons Hloc.f () in
   let hast = Hashcons.recursive_hcons Hast.f (hloc,hstr,hid,hpath,hconpath) in
   (hast,hloc)
-
-let rec subst_ast subst ast = match ast with
-  | Node (l,s,astl) ->
-      let astl' = Util.list_smartmap (subst_ast subst) astl in
-	if astl' == astl then ast else
-	  Node (l,s,astl')
-  | Slam (l,ido,ast1) ->
-      let ast1' = subst_ast subst ast1 in
-	if ast1' == ast1 then ast else
-	  Slam (l,ido,ast1')
-  | Smetalam (l,s,ast1) ->
-      let ast1' = subst_ast subst ast1 in
-	if ast1' == ast1 then ast else
-	  Smetalam (l,s,ast1')
-  | Path (loc,kn) -> 
-      let kn' = subst_kn subst kn in
-	if kn' == kn then ast else
-	  Path(loc,kn')
-  | ConPath (loc,kn) -> 
-      let kn' = subst_con subst kn in
-	if kn' == kn then ast else
-	  ConPath(loc,kn')
-  | Nmeta _
-  | Nvar _ -> ast
-  | Num _
-  | Str _
-  | Id _
-  | Dynamic _ -> ast
diff --git a/parsing/coqast.mli b/parsing/coqast.mli
index a769c66f9..b588d9cea 100644
--- a/parsing/coqast.mli
+++ b/parsing/coqast.mli
@@ -12,7 +12,6 @@
 open Util
 open Names
 open Libnames
-open Mod_subst
 (*i*)
 
 (* Abstract syntax trees. *)
@@ -43,8 +42,6 @@ val hcons_ast:
   * (kernel_name -> kernel_name) * (constant -> constant)
   -> (t -> t) * (loc -> loc)
 
-val subst_ast: substitution -> t -> t
-
 (*
 val map_tactic_expr : (t -> t) -> (tactic_expr -> tactic_expr) -> tactic_expr -> tactic_expr
 val fold_tactic_expr :
diff --git a/parsing/termast.ml b/parsing/termast.ml
index efa6c9206..ace1b47d2 100644
--- a/parsing/termast.ml
+++ b/parsing/termast.ml
@@ -26,6 +26,7 @@ open Ast
 open Rawterm
 open Pattern
 open Nametab
+open Mod_subst
 
 (* In this file, we translate rawconstr to ast, in order to print constr *)
 
@@ -390,6 +391,55 @@ let ast_of_constr at_top env t =
   ast_of_raw 
     (Detyping.detype (at_top,env) avoid (names_of_rel_context env) t')
 
+(**********************************************************************)
+(* Object substitution in modules *)
+
+let rec subst_ast subst ast = match ast with
+  | Node (l,s,astl) ->
+      let astl' = Util.list_smartmap (subst_ast subst) astl in
+	if astl' == astl then ast else
+	  Node (l,s,astl')
+  | Slam (l,ido,ast1) ->
+      let ast1' = subst_ast subst ast1 in
+	if ast1' == ast1 then ast else
+	  Slam (l,ido,ast1')
+  | Smetalam (l,s,ast1) ->
+      let ast1' = subst_ast subst ast1 in
+	if ast1' == ast1 then ast else
+	  Smetalam (l,s,ast1')
+  | Path (loc,kn) -> 
+      let kn' = subst_kn subst kn in
+	if kn' == kn then ast else
+	  Path(loc,kn')
+  | ConPath (loc,kn) -> 
+      let kn',t = subst_con subst kn in
+	if kn' == kn then ast else
+	  ast_of_constr false (Global.env ()) t
+  | Nmeta _
+  | Nvar _ -> ast
+  | Num _
+  | Str _
+  | Id _
+  | Dynamic _ -> ast
+
+let rec subst_astpat subst = function
+(*CSC: this is wrong since I am not recompiling the whole pattern.
+  However, this is V7-syntax code that is doomed to disappear. Hence I
+  prefer to be lazy and to not fix the bug. *)
+  | Pquote a -> Pquote (subst_ast subst a)
+  | Pmeta _ as p -> p
+  | Pnode (s,pl) -> Pnode (s,subst_astpatlist subst pl)
+  | Pslam (ido,p) -> Pslam (ido,subst_astpat subst p)
+  | Pmeta_slam (s,p) -> Pmeta_slam (s,subst_astpat subst p)
+
+and subst_astpatlist subst = function
+  | Pcons (p,pl) -> Pcons (subst_astpat subst p, subst_astpatlist subst pl)
+  | (Plmeta _ | Pnil) as pl -> pl
+
+let subst_pat subst = function
+  | AstListPat pl -> AstListPat (subst_astpatlist subst pl)
+  | PureAstPat p -> PureAstPat (subst_astpat subst p)
+
 let ast_of_constant env sp =
   let a = ast_of_constant_ref sp in
   a
diff --git a/parsing/termast.mli b/parsing/termast.mli
index f4c9466d3..da7e476be 100644
--- a/parsing/termast.mli
+++ b/parsing/termast.mli
@@ -18,6 +18,7 @@ open Libnames
 open Nametab
 open Rawterm
 open Pattern
+open Mod_subst
 (*i*)
 
 (* Translation of pattern, cases pattern, rawterm and term into syntax
@@ -32,6 +33,10 @@ val ast_of_pattern : env -> names_context -> constr_pattern -> Coqast.t
 
 val ast_of_constr : bool -> env -> constr -> Coqast.t
 
+(* Object substitution in modules *)
+val subst_ast: substitution -> Coqast.t -> Coqast.t
+val subst_astpat : substitution -> Ast.astpat -> Ast.astpat
+
 val ast_of_constant     : env -> constant -> Coqast.t
 val ast_of_existential  : env -> existential -> Coqast.t
 val ast_of_constructor  : env -> constructor -> Coqast.t
diff --git a/pretyping/classops.ml b/pretyping/classops.ml
index aef35cd7c..66ed81d02 100755
--- a/pretyping/classops.ml
+++ b/pretyping/classops.ml
@@ -153,21 +153,35 @@ let lookup_pattern_path_between (s,t) =
 	 | Construct sp -> (sp, coe.coe_param)
 	 | _ -> raise Not_found) l
 
+(* find_class_type : constr -> cl_typ * int *)
+
+let find_class_type t =
+  let t', args = decompose_app (Reductionops.whd_betaiotazeta t) in
+  match kind_of_term t' with
+    | Var id -> CL_SECVAR id, args
+    | Const sp -> CL_CONST sp, args
+    | Ind ind_sp -> CL_IND ind_sp, args
+    | Prod (_,_,_) -> CL_FUN, []
+    | Sort _ -> CL_SORT, []
+    |  _ -> raise Not_found
+
 
 let subst_cl_typ subst ct = match ct with
     CL_SORT
   | CL_FUN
   | CL_SECVAR _ -> ct
   | CL_CONST kn -> 
-      let kn' = subst_con subst kn in 
+      let kn',t = subst_con subst kn in 
 	if kn' == kn then ct else
-	  CL_CONST kn'
+         fst (find_class_type t)
   | CL_IND (kn,i) ->
       let kn' = subst_kn subst kn in 
 	if kn' == kn then ct else
 	  CL_IND (kn',i)
 
-let subst_coe_typ = subst_global
+(*CSC: here we should change the datatype for coercions: it should be possible
+       to declare any term as a coercion *)
+let subst_coe_typ subst t = fst (subst_global subst t)
 
 let subst_coe_info subst info = 
   let jud = info.coe_value in
@@ -209,18 +223,6 @@ let _ =
 
 (* classe d'un terme *)
 
-(* find_class_type : constr -> cl_typ * int *)
-
-let find_class_type t =
-  let t', args = decompose_app (Reductionops.whd_betaiotazeta t) in
-  match kind_of_term t' with
-    | Var id -> CL_SECVAR id, args
-    | Const sp -> CL_CONST sp, args
-    | Ind ind_sp -> CL_IND ind_sp, args
-    | Prod (_,_,_) -> CL_FUN, []
-    | Sort _ -> CL_SORT, []
-    |  _ -> raise Not_found
-
 (* class_of : Term.constr -> int *)
 
 let class_of env sigma t = 
diff --git a/pretyping/detyping.ml b/pretyping/detyping.ml
index 6a0ea0060..880605313 100644
--- a/pretyping/detyping.ml
+++ b/pretyping/detyping.ml
@@ -492,3 +492,117 @@ and detype_binder tenv bk avoid env na ty c =
     | BProd -> RProd (dummy_loc, na',detype tenv [] env ty, r)
     | BLambda -> RLambda (dummy_loc, na',detype tenv [] env ty, r)
     | BLetIn -> RLetIn (dummy_loc, na',detype tenv [] env ty, r)
+
+let rec subst_pat subst pat = 
+  match pat with
+  | PatVar _ -> pat
+  | PatCstr (loc,((kn,i),j),cpl,n) -> 
+      let kn' = subst_kn subst kn 
+      and cpl' = list_smartmap (subst_pat subst) cpl in
+	if kn' == kn && cpl' == cpl then pat else
+	  PatCstr (loc,((kn',i),j),cpl',n)
+
+let rec subst_raw subst raw = 
+  match raw with
+  | RRef (loc,ref) -> 
+      let ref',t = subst_global subst ref in 
+	if ref' == ref then raw else
+         detype (false,Global.env ()) [] [] t
+
+  | RVar _ -> raw
+  | REvar _ -> raw
+  | RPatVar _ -> raw
+
+  | RApp (loc,r,rl) -> 
+      let r' = subst_raw subst r 
+      and rl' = list_smartmap (subst_raw subst) rl in
+	if r' == r && rl' == rl then raw else
+	  RApp(loc,r',rl')
+
+  | RLambda (loc,n,r1,r2) -> 
+      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  RLambda (loc,n,r1',r2')
+
+  | RProd (loc,n,r1,r2) -> 
+      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  RProd (loc,n,r1',r2')
+
+  | RLetIn (loc,n,r1,r2) -> 
+      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  RLetIn (loc,n,r1',r2')
+
+  | RCases (loc,(ro,rtno),rl,branches) -> 
+      let ro' = option_smartmap (subst_raw subst) ro 
+      and rtno' = ref (option_smartmap (subst_raw subst) !rtno)
+      and rl' = list_smartmap (fun (a,x as y) ->
+        let a' = subst_raw subst a in
+        let (n,topt) = !x in 
+        let topt' = option_smartmap
+          (fun (loc,(sp,i),x as t) ->
+            let sp' = subst_kn subst sp in
+            if sp == sp' then t else (loc,(sp',i),x)) topt in
+        if a == a' && topt == topt' then y else (a',ref (n,topt'))) rl
+      and branches' = list_smartmap 
+			(fun (loc,idl,cpl,r as branch) ->
+			   let cpl' = list_smartmap (subst_pat subst) cpl
+			   and r' = subst_raw subst r in
+			     if cpl' == cpl && r' == r then branch else
+			       (loc,idl,cpl',r'))
+			branches
+      in
+	if ro' == ro && rl' == rl && branches' == branches then raw else
+	  RCases (loc,(ro',rtno'),rl',branches')
+
+  | ROrderedCase (loc,b,ro,r,ra,x) -> 
+      let ro' = option_smartmap (subst_raw subst) ro
+      and r' = subst_raw subst r 
+      and ra' = array_smartmap (subst_raw subst) ra in
+	if ro' == ro && r' == r && ra' == ra then raw else
+	  ROrderedCase (loc,b,ro',r',ra',x)
+
+  | RLetTuple (loc,nal,(na,po),b,c) ->
+      let po' = option_smartmap (subst_raw subst) po
+      and b' = subst_raw subst b 
+      and c' = subst_raw subst c in
+	if po' == po && b' == b && c' == c then raw else
+          RLetTuple (loc,nal,(na,po'),b',c')
+      
+  | RIf (loc,c,(na,po),b1,b2) ->
+      let po' = option_smartmap (subst_raw subst) po
+      and b1' = subst_raw subst b1 
+      and b2' = subst_raw subst b2 
+      and c' = subst_raw subst c in
+	if c' == c & po' == po && b1' == b1 && b2' == b2 then raw else
+          RIf (loc,c',(na,po'),b1',b2')
+
+  | RRec (loc,fix,ida,bl,ra1,ra2) -> 
+      let ra1' = array_smartmap (subst_raw subst) ra1
+      and ra2' = array_smartmap (subst_raw subst) ra2 in
+      let bl' = array_smartmap
+        (list_smartmap (fun (na,obd,ty as dcl) ->
+          let ty' = subst_raw subst ty in
+          let obd' = option_smartmap (subst_raw subst) obd in
+          if ty'==ty & obd'==obd then dcl else (na,obd',ty')))
+        bl in
+	if ra1' == ra1 && ra2' == ra2 && bl'==bl then raw else
+	  RRec (loc,fix,ida,bl',ra1',ra2')
+
+  | RSort _ -> raw
+
+  | RHole (loc,ImplicitArg (ref,i)) ->
+      let ref',_ = subst_global subst ref in 
+	if ref' == ref then raw else
+	  RHole (loc,InternalHole)
+  | RHole (loc, (BinderType _ | QuestionMark | CasesType |
+      InternalHole | TomatchTypeParameter _)) -> raw
+
+  | RCast (loc,r1,r2) -> 
+      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
+	if r1' == r1 && r2' == r2 then raw else
+	  RCast (loc,r1',r2')
+
+  | RDynamic _ -> raw
+
diff --git a/pretyping/detyping.mli b/pretyping/detyping.mli
index 15743e7bf..e4aa8a657 100644
--- a/pretyping/detyping.mli
+++ b/pretyping/detyping.mli
@@ -16,8 +16,11 @@ open Sign
 open Environ
 open Rawterm
 open Termops
+open Mod_subst
 (*i*)
 
+val subst_raw : substitution -> rawconstr -> rawconstr
+
 (* [detype env avoid nenv c] turns [c], typed in [env], into a rawconstr. *)
 (* De Bruijn indexes are turned to bound names, avoiding names in [avoid] *)
 
diff --git a/pretyping/pattern.ml b/pretyping/pattern.ml
index b091d797a..6e06f978f 100644
--- a/pretyping/pattern.ml
+++ b/pretyping/pattern.ml
@@ -63,56 +63,11 @@ let rec occur_meta_pattern = function
   | PMeta _ | PSoApp _ -> true
   | PEvar _ | PVar _ | PRef _ | PRel _ | PSort _ | PFix _ | PCoFix _ -> false
 
-let rec subst_pattern subst pat = match pat with
-  | PRef ref ->
-      let ref' = subst_global subst ref in
-	if ref' == ref then pat else 
-	  PRef ref'
-  | PVar _ 
-  | PEvar _
-  | PRel _ -> pat
-  | PApp (f,args) ->
-      let f' = subst_pattern subst f in 
-      let args' = array_smartmap (subst_pattern subst) args in
-	if f' == f && args' == args then pat else
-	  PApp (f',args')
-  | PSoApp (i,args) ->
-      let args' = list_smartmap (subst_pattern subst) args in
-	if args' == args then pat else
-	  PSoApp (i,args')
-  | PLambda (name,c1,c2) ->
-      let c1' = subst_pattern subst c1 in
-      let c2' = subst_pattern subst c2 in
-	if c1' == c1 && c2' == c2 then pat else
-	  PLambda (name,c1',c2')
-  | PProd (name,c1,c2) ->
-      let c1' = subst_pattern subst c1 in
-      let c2' = subst_pattern subst c2 in
-	if c1' == c1 && c2' == c2 then pat else
-	  PProd (name,c1',c2')
-  | PLetIn (name,c1,c2) ->
-      let c1' = subst_pattern subst c1 in
-      let c2' = subst_pattern subst c2 in
-	if c1' == c1 && c2' == c2 then pat else
-	  PLetIn (name,c1',c2')
-  | PSort _ 
-  | PMeta _ -> pat
-  | PCase (cs,typ, c, branches) -> 
-      let typ' = option_smartmap (subst_pattern subst) typ in 
-      let c' = subst_pattern subst c in
-      let branches' = array_smartmap (subst_pattern subst) branches in
-	if typ' == typ && c' == c && branches' == branches then pat else
-	  PCase(cs,typ', c', branches') 
-  | PFix fixpoint ->
-      let cstr = mkFix fixpoint in
-      let fixpoint' = destFix (subst_mps subst cstr) in
-	if fixpoint' == fixpoint then pat else
-	  PFix fixpoint'
-  | PCoFix cofixpoint ->
-      let cstr = mkCoFix cofixpoint in
-      let cofixpoint' = destCoFix (subst_mps subst cstr) in
-	if cofixpoint' == cofixpoint then pat else
-	  PCoFix cofixpoint'
+type constr_label =
+  | ConstNode of constant
+  | IndNode of inductive
+  | CstrNode of constructor
+  | VarNode of identifier
 
 exception BoundPattern;;
 
@@ -177,6 +132,58 @@ let rec inst lvar = function
   | (PFix _ | PCoFix _ as r) ->
       error ("Not instantiable pattern")
 
+let rec subst_pattern subst pat = match pat with
+  | PRef ref ->
+      let ref',t = subst_global subst ref in
+	if ref' == ref then pat else
+	 pattern_of_constr t
+  | PVar _ 
+  | PEvar _
+  | PRel _ -> pat
+  | PApp (f,args) ->
+      let f' = subst_pattern subst f in 
+      let args' = array_smartmap (subst_pattern subst) args in
+	if f' == f && args' == args then pat else
+	  PApp (f',args')
+  | PSoApp (i,args) ->
+      let args' = list_smartmap (subst_pattern subst) args in
+	if args' == args then pat else
+	  PSoApp (i,args')
+  | PLambda (name,c1,c2) ->
+      let c1' = subst_pattern subst c1 in
+      let c2' = subst_pattern subst c2 in
+	if c1' == c1 && c2' == c2 then pat else
+	  PLambda (name,c1',c2')
+  | PProd (name,c1,c2) ->
+      let c1' = subst_pattern subst c1 in
+      let c2' = subst_pattern subst c2 in
+	if c1' == c1 && c2' == c2 then pat else
+	  PProd (name,c1',c2')
+  | PLetIn (name,c1,c2) ->
+      let c1' = subst_pattern subst c1 in
+      let c2' = subst_pattern subst c2 in
+	if c1' == c1 && c2' == c2 then pat else
+	  PLetIn (name,c1',c2')
+  | PSort _ 
+  | PMeta _ -> pat
+  | PCase (cs,typ, c, branches) -> 
+      let typ' = option_smartmap (subst_pattern subst) typ in 
+      let c' = subst_pattern subst c in
+      let branches' = array_smartmap (subst_pattern subst) branches in
+	if typ' == typ && c' == c && branches' == branches then pat else
+	  PCase(cs,typ', c', branches') 
+  | PFix fixpoint ->
+      let cstr = mkFix fixpoint in
+      let fixpoint' = destFix (subst_mps subst cstr) in
+	if fixpoint' == fixpoint then pat else
+	  PFix fixpoint'
+  | PCoFix cofixpoint ->
+      let cstr = mkCoFix cofixpoint in
+      let cofixpoint' = destCoFix (subst_mps subst cstr) in
+	if cofixpoint' == cofixpoint then pat else
+	  PCoFix cofixpoint'
+
+
 let instantiate_pattern = inst
 
 let rec pat_of_raw metas vars = function
diff --git a/pretyping/rawterm.ml b/pretyping/rawterm.ml
index 054312ff3..b91531395 100644
--- a/pretyping/rawterm.ml
+++ b/pretyping/rawterm.ml
@@ -16,7 +16,6 @@ open Term
 open Libnames
 open Nametab
 open Evd
-open Mod_subst
 (*i*)
 
 (* Untyped intermediate terms, after ASTs and before constr. *)
@@ -196,119 +195,6 @@ let occur_rawconstr id =
 
   in occur
 
-let rec subst_pat subst pat = 
-  match pat with
-  | PatVar _ -> pat
-  | PatCstr (loc,((kn,i),j),cpl,n) -> 
-      let kn' = subst_kn subst kn 
-      and cpl' = list_smartmap (subst_pat subst) cpl in
-	if kn' == kn && cpl' == cpl then pat else
-	  PatCstr (loc,((kn',i),j),cpl',n)
-
-let rec subst_raw subst raw = 
-  match raw with
-  | RRef (loc,ref) -> 
-      let ref' = subst_global subst ref in 
-	if ref' == ref then raw else
-	  RRef (loc,ref')
-
-  | RVar _ -> raw
-  | REvar _ -> raw
-  | RPatVar _ -> raw
-
-  | RApp (loc,r,rl) -> 
-      let r' = subst_raw subst r 
-      and rl' = list_smartmap (subst_raw subst) rl in
-	if r' == r && rl' == rl then raw else
-	  RApp(loc,r',rl')
-
-  | RLambda (loc,n,r1,r2) -> 
-      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  RLambda (loc,n,r1',r2')
-
-  | RProd (loc,n,r1,r2) -> 
-      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  RProd (loc,n,r1',r2')
-
-  | RLetIn (loc,n,r1,r2) -> 
-      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  RLetIn (loc,n,r1',r2')
-
-  | RCases (loc,(ro,rtno),rl,branches) -> 
-      let ro' = option_smartmap (subst_raw subst) ro 
-      and rtno' = ref (option_smartmap (subst_raw subst) !rtno)
-      and rl' = list_smartmap (fun (a,x as y) ->
-        let a' = subst_raw subst a in
-        let (n,topt) = !x in 
-        let topt' = option_smartmap
-          (fun (loc,(sp,i),x as t) ->
-            let sp' = subst_kn subst sp in
-            if sp == sp' then t else (loc,(sp',i),x)) topt in
-        if a == a' && topt == topt' then y else (a',ref (n,topt'))) rl
-      and branches' = list_smartmap 
-			(fun (loc,idl,cpl,r as branch) ->
-			   let cpl' = list_smartmap (subst_pat subst) cpl
-			   and r' = subst_raw subst r in
-			     if cpl' == cpl && r' == r then branch else
-			       (loc,idl,cpl',r'))
-			branches
-      in
-	if ro' == ro && rl' == rl && branches' == branches then raw else
-	  RCases (loc,(ro',rtno'),rl',branches')
-
-  | ROrderedCase (loc,b,ro,r,ra,x) -> 
-      let ro' = option_smartmap (subst_raw subst) ro
-      and r' = subst_raw subst r 
-      and ra' = array_smartmap (subst_raw subst) ra in
-	if ro' == ro && r' == r && ra' == ra then raw else
-	  ROrderedCase (loc,b,ro',r',ra',x)
-
-  | RLetTuple (loc,nal,(na,po),b,c) ->
-      let po' = option_smartmap (subst_raw subst) po
-      and b' = subst_raw subst b 
-      and c' = subst_raw subst c in
-	if po' == po && b' == b && c' == c then raw else
-          RLetTuple (loc,nal,(na,po'),b',c')
-      
-  | RIf (loc,c,(na,po),b1,b2) ->
-      let po' = option_smartmap (subst_raw subst) po
-      and b1' = subst_raw subst b1 
-      and b2' = subst_raw subst b2 
-      and c' = subst_raw subst c in
-	if c' == c & po' == po && b1' == b1 && b2' == b2 then raw else
-          RIf (loc,c',(na,po'),b1',b2')
-
-  | RRec (loc,fix,ida,bl,ra1,ra2) -> 
-      let ra1' = array_smartmap (subst_raw subst) ra1
-      and ra2' = array_smartmap (subst_raw subst) ra2 in
-      let bl' = array_smartmap
-        (list_smartmap (fun (na,obd,ty as dcl) ->
-          let ty' = subst_raw subst ty in
-          let obd' = option_smartmap (subst_raw subst) obd in
-          if ty'==ty & obd'==obd then dcl else (na,obd',ty')))
-        bl in
-	if ra1' == ra1 && ra2' == ra2 && bl'==bl then raw else
-	  RRec (loc,fix,ida,bl',ra1',ra2')
-
-  | RSort _ -> raw
-
-  | RHole (loc,ImplicitArg (ref,i)) ->
-      let ref' = subst_global subst ref in 
-	if ref' == ref then raw else
-	  RHole (loc,ImplicitArg (ref',i))
-  | RHole (loc, (BinderType _ | QuestionMark | CasesType |
-      InternalHole | TomatchTypeParameter _)) -> raw
-
-  | RCast (loc,r1,r2) -> 
-      let r1' = subst_raw subst r1 and r2' = subst_raw subst r2 in
-	if r1' == r1 && r2' == r2 then raw else
-	  RCast (loc,r1',r2')
-
-  | RDynamic _ -> raw
-
 let loc_of_rawconstr = function
   | RRef (loc,_) -> loc
   | RVar (loc,_) -> loc
diff --git a/pretyping/rawterm.mli b/pretyping/rawterm.mli
index 127eb1dc6..759e0adb6 100644
--- a/pretyping/rawterm.mli
+++ b/pretyping/rawterm.mli
@@ -15,7 +15,6 @@ open Sign
 open Term
 open Libnames
 open Nametab
-open Mod_subst
 (*i*)
 
 (* Untyped intermediate terms, after ASTs and before constr. *)
@@ -100,8 +99,6 @@ val occur_rawconstr : identifier -> rawconstr -> bool
 
 val loc_of_rawconstr : rawconstr -> loc
 
-val subst_raw : substitution -> rawconstr -> rawconstr
-
 type 'a raw_red_flag = {
   rBeta : bool;
   rIota : bool;
diff --git a/pretyping/recordops.ml b/pretyping/recordops.ml
index 4cbd02ca4..cc53ae7f3 100755
--- a/pretyping/recordops.ml
+++ b/pretyping/recordops.ml
@@ -47,9 +47,12 @@ let cache_structure (_,(ind,struc)) =
 
 let subst_structure (_,subst,((kn,i),struc as obj)) = 
   let kn' = subst_kn subst kn in
-  let proj' = list_smartmap 
-		(option_smartmap (subst_con subst)) 
-		struc.s_PROJ 
+  let proj' =
+   (* invariant: struc.s_PROJ is an evaluable reference. Thus we can take *)
+   (* the first component of subst_con.                                   *)
+   list_smartmap 
+    (option_smartmap (fun kn -> fst (subst_con subst kn)))
+    struc.s_PROJ
   in
     if proj' == struc.s_PROJ && kn' == kn then obj else
       (kn',i),{struc with s_PROJ = proj'}
@@ -120,14 +123,19 @@ let cache_canonical_structure (_,(cst,lo)) =
       object_table := x :: (!object_table)) lo
 
 let subst_object subst ((r1,r2),o as obj) = 
-  let r1' = subst_global subst r1 in
-  let r2' = subst_global subst r2 in
+  (* invariant: r1 and r2 are evaluable references. Thus subst_global   *)
+  (* cannot instantiate them. Hence we can use just the first component *)
+  (* of the answer.                                                     *)
+  let r1',_ = subst_global subst r1 in
+  let r2',_ = subst_global subst r2 in
   let o' = subst_obj subst o in
   if r1' == r1 && r2' == r2 && o' == o then obj
   else (r1',r2'),o'
 
 let subst_canonical_structure (_,subst,(cst,lo as obj)) =
-  let cst' = subst_con subst cst in
+  (* invariant: cst is an evaluable reference. Thus we can take *)
+  (* the first component of subst_con.                                   *)
+  let cst' = fst (subst_con subst cst) in
   let lo' = list_smartmap (subst_object subst) lo in
   if cst' == cst & lo' == lo then obj else (cst',lo')
 
diff --git a/tactics/auto.ml b/tactics/auto.ml
index fedf91d53..4ac300827 100644
--- a/tactics/auto.ml
+++ b/tactics/auto.ml
@@ -305,7 +305,10 @@ let subst_autohint (_,subst,(local,name,hintlist as obj)) =
     }
   in
   let subst_hint (lab,data as hint) =
-    let lab' = subst_global subst lab in
+    let lab',elab' = subst_global subst lab in
+    let lab' =
+     try head_of_constr_reference (List.hd (head_constr_bound elab' []))
+     with Tactics.Bound -> lab' in
     let data' = match data.code with
       | Res_pf (c, clenv) ->
 	  let c' = subst_mps subst c in
diff --git a/tactics/extratactics.ml4 b/tactics/extratactics.ml4
index edf99f175..4068289eb 100644
--- a/tactics/extratactics.ml4
+++ b/tactics/extratactics.ml4
@@ -14,6 +14,7 @@ open Pp
 open Pcoq
 open Genarg
 open Extraargs
+open Mod_subst
 
 (* Equality *)
 open Equality
@@ -348,7 +349,7 @@ let step left x tac =
   let l =
     List.map (fun lem ->
       tclTHENLAST
-      (apply_with_bindings (constr_of_reference lem, ImplicitBindings [x]))
+      (apply_with_bindings (lem, ImplicitBindings [x]))
         tac)
       !(if left then transitivity_left_table else transitivity_right_table)
   in
@@ -362,7 +363,7 @@ let cache_transitivity_lemma (_,(left,lem)) =
   else
     transitivity_right_table := lem :: !transitivity_right_table
   
-let subst_transitivity_lemma (_,subst,(b,ref)) = (b,subst_global subst ref)
+let subst_transitivity_lemma (_,subst,(b,ref)) = (b,subst_mps subst ref)
 
 let (inTransitivity,_) =
   declare_object {(default_object "TRANSITIVITY-STEPS") with
@@ -394,8 +395,9 @@ let _ =
 
 (* Main entry points *)
 
-let add_transitivity_lemma left ref =
-  add_anonymous_leaf (inTransitivity (left,Nametab.global ref))
+let add_transitivity_lemma left lem =
+ let lem' = Constrintern.interp_constr Evd.empty (Global.env ()) lem in
+  add_anonymous_leaf (inTransitivity (left,lem'))
 
 (* Vernacular syntax *)
 
@@ -410,11 +412,11 @@ TACTIC EXTEND Stepr
 END
 
 VERNAC COMMAND EXTEND AddStepl
-| [ "Declare" "Left" "Step" global(id) ] ->
-    [ add_transitivity_lemma true id ]
+| [ "Declare" "Left" "Step" constr(t) ] ->
+    [ add_transitivity_lemma true t ]
 END
 
 VERNAC COMMAND EXTEND AddStepr
-| [ "Declare" "Right" "Step" global(id) ] ->
-    [ add_transitivity_lemma false id ]
+| [ "Declare" "Right" "Step" constr(t) ] ->
+    [ add_transitivity_lemma false t ]
 END
diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml
index 8eb798212..2c9b053dd 100644
--- a/tactics/tacinterp.ml
+++ b/tactics/tacinterp.ml
@@ -42,6 +42,7 @@ open Hiddentac
 open Genarg
 open Decl_kinds
 open Mod_subst
+open Printer
 
 let strip_meta id = (* For Grammar v7 compatibility *)
   let s = string_of_id id in
@@ -116,8 +117,8 @@ let pr_value env = function
   | VVoid -> str "()"
   | VInteger n -> int n
   | VIntroPattern ipat -> pr_intro_pattern ipat
-  | VConstr c -> Printer.prterm_env env c
-  | VConstr_context c -> Printer.prterm_env env c
+  | VConstr c -> prterm_env env c
+  | VConstr_context c -> prterm_env env c
   | (VTactic _ | VRTactic _ | VFun _ | VRec _) -> str "<fun>"
 
 (* Transforms a named_context into a (string * constr) list *)
@@ -236,7 +237,7 @@ let coerce_to_inductive = function
 	  | VConstr c -> reference_of_constr c
 	  | _ -> failwith "" in
 	errorlabstrm "coerce_to_inductive"
-          (Printer.pr_global r ++ str " is not an inductive type")
+          (pr_global r ++ str " is not an inductive type")
       with _ ->
 	errorlabstrm "coerce_to_inductive"
           (str "Found an argument which should be an inductive type")
@@ -1841,7 +1842,7 @@ let subst_inductive subst (kn,i) = (subst_kn subst kn,i)
 
 let subst_rawconstr subst (c,e) =
   assert (e=None); (* e<>None only for toplevel tactics *)
-  (subst_raw subst c,None)
+  (Detyping.subst_raw subst c,None)
 
 let subst_binding subst (loc,b,c) =
   (loc,subst_quantified_hypothesis subst b,subst_rawconstr subst c)
@@ -1872,11 +1873,23 @@ let subst_located f (_loc,id) = (loc,f id)
 let subst_reference subst = 
   subst_or_var (subst_located (subst_kn subst))
 
+(*CSC: subst_global_reference is used "only" for RefArgType, that propagates
+  to the syntactic non-terminals "global", used in commands such as
+  Print. It is also used for non-evaluable references. *) 
 let subst_global_reference subst = 
-  subst_or_var (subst_located (subst_global subst))
+ let subst_global ref =
+  let ref',t' = subst_global subst ref in
+   if not (eq_constr (constr_of_reference ref') t') then
+    ppnl (str "Warning: the reference " ++ pr_global ref ++ str " is not " ++
+          str " expanded to \"" ++ prterm t' ++ str "\", but to " ++
+          pr_global ref') ;
+   ref'
+ in
+  subst_or_var (subst_located subst_global)
 
 let subst_evaluable subst =
-  subst_or_var (subst_and_short_name (subst_evaluable_reference subst))
+  let subst_eval_ref = subst_evaluable_reference subst in
+    subst_or_var (subst_and_short_name subst_eval_ref)
 
 let subst_unfold subst (l,e) = 
   (l,subst_evaluable subst e)
diff --git a/toplevel/metasyntax.ml b/toplevel/metasyntax.ml
index 995b29317..2dc20dced 100644
--- a/toplevel/metasyntax.ml
+++ b/toplevel/metasyntax.ml
@@ -99,7 +99,7 @@ let _ =
 let cache_syntax (_,ppobj) = Esyntax.add_ppobject ppobj
 
 let subst_syntax (_,subst,ppobj) = 
-  Extend.subst_syntax_command Ast.subst_astpat subst ppobj
+  Extend.subst_syntax_command Termast.subst_astpat subst ppobj
 
 let (inPPSyntax,outPPSyntax) =
   declare_object {(default_object "PPSYNTAX") with
@@ -1075,9 +1075,9 @@ let cache_notation o =
 
 let subst_notation (_,subst,(lc,oldse,ntn,scope,(metas,pat),b,b',df)) =
   (lc,option_app
-    (list_smartmap (Extend.subst_syntax_entry Ast.subst_astpat subst)) oldse,
+    (list_smartmap(Extend.subst_syntax_entry Termast.subst_astpat subst)) oldse,
    ntn,scope,
-   (metas,subst_aconstr subst pat), b, b', df)
+   (metas,subst_aconstr subst (List.map fst metas) pat), b, b', df)
 
 let classify_notation (_,(local,_,_,_,_,_,_,_ as o)) =
   if local then Dispose else Substitute o