mise a jour

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

1 files changed, 253 insertions, 265 deletions

diff --git a/.depend b/.depend
index a6544bdf8..3f6a7b46b 100644
--- a/.depend
+++ b/.depend
@@ -1,6 +1,5 @@
 kernel/closure.cmi: kernel/environ.cmi kernel/esubst.cmi kernel/names.cmi \
     lib/pp.cmi kernel/term.cmi 
-kernel/conv_oracle.cmi: kernel/closure.cmi kernel/names.cmi 
 kernel/cooking.cmi: kernel/declarations.cmi kernel/environ.cmi \
     kernel/names.cmi kernel/term.cmi kernel/univ.cmi 
 kernel/declarations.cmi: kernel/names.cmi kernel/sign.cmi kernel/term.cmi \
@@ -25,6 +24,8 @@ kernel/typeops.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 
 lib/pp.cmi: lib/pp_control.cmi 
+lib/system.cmi: lib/pp.cmi 
+lib/util.cmi: lib/pp.cmi 
 library/declare.cmi: kernel/cooking.cmi kernel/declarations.cmi \
     kernel/environ.cmi kernel/indtypes.cmi library/libobject.cmi \
     library/library.cmi kernel/names.cmi library/nametab.cmi \
@@ -40,13 +41,12 @@ library/lib.cmi: library/libobject.cmi kernel/names.cmi library/summary.cmi
 library/libobject.cmi: kernel/names.cmi 
 library/library.cmi: library/lib.cmi library/libobject.cmi kernel/names.cmi \
     library/nametab.cmi lib/pp.cmi lib/system.cmi 
-library/nameops.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
-    kernel/term.cmi 
+library/nameops.cmi: kernel/environ.cmi kernel/names.cmi kernel/term.cmi 
 library/nametab.cmi: kernel/environ.cmi kernel/names.cmi lib/pp.cmi \
     lib/util.cmi 
+library/opaque.cmi: kernel/closure.cmi kernel/environ.cmi kernel/names.cmi \
+    kernel/safe_typing.cmi 
 library/summary.cmi: kernel/names.cmi 
-lib/system.cmi: lib/pp.cmi 
-lib/util.cmi: lib/pp.cmi 
 parsing/ast.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     parsing/pcoq.cmi lib/pp.cmi 
 parsing/astterm.cmi: parsing/coqast.cmi kernel/environ.cmi pretyping/evd.cmi \
@@ -83,7 +83,7 @@ pretyping/cases.cmi: kernel/environ.cmi pretyping/evarutil.cmi \
     pretyping/evd.cmi pretyping/inductiveops.cmi kernel/names.cmi \
     pretyping/rawterm.cmi kernel/term.cmi 
 pretyping/cbv.cmi: kernel/closure.cmi kernel/environ.cmi kernel/esubst.cmi \
-    kernel/names.cmi kernel/term.cmi 
+    pretyping/evd.cmi kernel/names.cmi lib/pp.cmi kernel/term.cmi 
 pretyping/classops.cmi: library/declare.cmi kernel/environ.cmi \
     pretyping/evd.cmi library/libobject.cmi kernel/names.cmi \
     library/nametab.cmi lib/pp.cmi kernel/term.cmi 
@@ -224,18 +224,18 @@ toplevel/recordobj.cmi: library/nametab.cmi
 toplevel/searchisos.cmi: library/libobject.cmi kernel/names.cmi \
     kernel/term.cmi 
 toplevel/toplevel.cmi: parsing/pcoq.cmi lib/pp.cmi 
+toplevel/vernac.cmi: parsing/coqast.cmi parsing/pcoq.cmi 
 toplevel/vernacentries.cmi: kernel/environ.cmi pretyping/evd.cmi \
     kernel/names.cmi kernel/term.cmi toplevel/vernacinterp.cmi 
 toplevel/vernacinterp.cmi: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     library/nametab.cmi proofs/proof_type.cmi 
-toplevel/vernac.cmi: parsing/coqast.cmi parsing/pcoq.cmi 
 contrib/correctness/past.cmi: parsing/coqast.cmi kernel/names.cmi \
     contrib/correctness/ptype.cmi kernel/term.cmi 
+contrib/correctness/pcic.cmi: contrib/correctness/past.cmi \
+    pretyping/rawterm.cmi 
 contrib/correctness/pcicenv.cmi: kernel/names.cmi \
     contrib/correctness/penv.cmi contrib/correctness/prename.cmi \
     kernel/sign.cmi kernel/term.cmi 
-contrib/correctness/pcic.cmi: contrib/correctness/past.cmi \
-    pretyping/rawterm.cmi 
 contrib/correctness/pdb.cmi: kernel/names.cmi contrib/correctness/past.cmi \
     contrib/correctness/ptype.cmi 
 contrib/correctness/peffect.cmi: kernel/names.cmi lib/pp.cmi 
@@ -332,10 +332,6 @@ kernel/closure.cmo: kernel/environ.cmi kernel/esubst.cmi kernel/names.cmi \
 kernel/closure.cmx: kernel/environ.cmx kernel/esubst.cmx kernel/names.cmx \
     lib/pp.cmx kernel/term.cmx kernel/univ.cmx lib/util.cmx \
     kernel/closure.cmi 
-kernel/conv_oracle.cmo: kernel/closure.cmi kernel/names.cmi \
-    kernel/conv_oracle.cmi 
-kernel/conv_oracle.cmx: kernel/closure.cmx kernel/names.cmx \
-    kernel/conv_oracle.cmi 
 kernel/cooking.cmo: 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 
@@ -370,14 +366,12 @@ kernel/names.cmo: lib/hashcons.cmi lib/pp.cmi lib/predicate.cmi lib/util.cmi \
     kernel/names.cmi 
 kernel/names.cmx: lib/hashcons.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/reduction.cmo: kernel/closure.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/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/environ.cmi kernel/indtypes.cmi kernel/inductive.cmi \
     kernel/names.cmi kernel/reduction.cmi kernel/sign.cmi kernel/term.cmi \
@@ -424,24 +418,32 @@ 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/gmap.cmi lib/util.cmi lib/gmapl.cmi 
+lib/gmapl.cmx: lib/gmap.cmx lib/util.cmx lib/gmapl.cmi 
 lib/gset.cmo: lib/gset.cmi 
 lib/gset.cmx: lib/gset.cmi 
 lib/hashcons.cmo: lib/hashcons.cmi 
 lib/hashcons.cmx: lib/hashcons.cmi 
 lib/options.cmo: lib/util.cmi lib/options.cmi 
 lib/options.cmx: lib/util.cmx lib/options.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/pp_control.cmo: lib/pp_control.cmi 
+lib/pp_control.cmx: lib/pp_control.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/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/pp.cmi lib/util.cmi 
+lib/util.cmx: lib/pp.cmx lib/util.cmi 
 library/declare.cmo: kernel/declarations.cmi kernel/environ.cmi \
     library/global.cmi library/impargs.cmi kernel/indtypes.cmi \
     kernel/inductive.cmi library/lib.cmi library/libobject.cmi \
@@ -499,17 +501,23 @@ library/library.cmx: kernel/environ.cmx library/global.cmx library/lib.cmx \
     library/nametab.cmx lib/options.cmx lib/pp.cmx library/summary.cmx \
     lib/system.cmx lib/util.cmx library/library.cmi 
 library/nameops.cmo: kernel/declarations.cmi kernel/environ.cmi \
-    kernel/names.cmi lib/pp.cmi kernel/term.cmi lib/util.cmi \
-    library/nameops.cmi 
+    kernel/names.cmi kernel/term.cmi lib/util.cmi library/nameops.cmi 
 library/nameops.cmx: kernel/declarations.cmx kernel/environ.cmx \
-    kernel/names.cmx lib/pp.cmx kernel/term.cmx lib/util.cmx \
-    library/nameops.cmi 
+    kernel/names.cmx kernel/term.cmx lib/util.cmx library/nameops.cmi 
 library/nametab.cmo: kernel/declarations.cmi kernel/environ.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 kernel/environ.cmx \
     library/nameops.cmx kernel/names.cmx lib/pp.cmx library/summary.cmx \
     lib/util.cmx library/nametab.cmi 
+library/opaque.cmo: kernel/closure.cmi kernel/declarations.cmi \
+    kernel/environ.cmi library/global.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi library/summary.cmi kernel/term.cmi \
+    lib/util.cmi library/opaque.cmi 
+library/opaque.cmx: kernel/closure.cmx kernel/declarations.cmx \
+    kernel/environ.cmx library/global.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx library/summary.cmx kernel/term.cmx \
+    lib/util.cmx library/opaque.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 \
@@ -518,14 +526,6 @@ library/summary.cmo: lib/dyn.cmi kernel/names.cmi lib/pp.cmi lib/util.cmi \
     library/summary.cmi 
 library/summary.cmx: lib/dyn.cmx kernel/names.cmx lib/pp.cmx lib/util.cmx \
     library/summary.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/pp.cmi lib/util.cmi 
-lib/util.cmx: lib/pp.cmx lib/util.cmi 
 parsing/ast.cmo: parsing/coqast.cmi lib/dyn.cmi kernel/names.cmi \
     parsing/pcoq.cmi lib/pp.cmi lib/util.cmi parsing/ast.cmi 
 parsing/ast.cmx: parsing/coqast.cmx lib/dyn.cmx kernel/names.cmx \
@@ -646,16 +646,16 @@ parsing/prettyp.cmx: pretyping/classops.cmx kernel/declarations.cmx \
     kernel/term.cmx pretyping/termops.cmx lib/util.cmx parsing/prettyp.cmi 
 parsing/printer.cmo: parsing/ast.cmi parsing/coqast.cmi library/declare.cmi \
     lib/dyn.cmi kernel/environ.cmi parsing/esyntax.cmi parsing/extend.cmi \
-    library/global.cmi library/nameops.cmi kernel/names.cmi \
-    library/nametab.cmi lib/options.cmi pretyping/pattern.cmi lib/pp.cmi \
-    kernel/sign.cmi kernel/term.cmi parsing/termast.cmi pretyping/termops.cmi \
-    lib/util.cmi parsing/printer.cmi 
+    library/global.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi lib/pp.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 parsing/coqast.cmx library/declare.cmx \
     lib/dyn.cmx kernel/environ.cmx parsing/esyntax.cmx parsing/extend.cmx \
-    library/global.cmx library/nameops.cmx kernel/names.cmx \
-    library/nametab.cmx lib/options.cmx pretyping/pattern.cmx lib/pp.cmx \
-    kernel/sign.cmx kernel/term.cmx parsing/termast.cmx pretyping/termops.cmx \
-    lib/util.cmx parsing/printer.cmi 
+    library/global.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx lib/pp.cmx kernel/sign.cmx kernel/term.cmx \
+    parsing/termast.cmx pretyping/termops.cmx lib/util.cmx \
+    parsing/printer.cmi 
 parsing/q_coqast.cmo: parsing/coqast.cmi kernel/names.cmi parsing/pcoq.cmi 
 parsing/q_coqast.cmx: parsing/coqast.cmx kernel/names.cmx parsing/pcoq.cmx 
 parsing/search.cmo: parsing/astterm.cmi parsing/coqast.cmi parsing/coqlib.cmi \
@@ -704,12 +704,14 @@ pretyping/cases.cmx: pretyping/coercion.cmx kernel/declarations.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/environ.cmi kernel/esubst.cmi \
-    pretyping/evd.cmi pretyping/instantiate.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/environ.cmx kernel/esubst.cmx \
-    pretyping/evd.cmx pretyping/instantiate.cmx kernel/names.cmx lib/pp.cmx \
-    kernel/term.cmx kernel/univ.cmx lib/util.cmx pretyping/cbv.cmi 
+pretyping/cbv.cmo: kernel/closure.cmi kernel/declarations.cmi \
+    kernel/environ.cmi kernel/esubst.cmi pretyping/evd.cmi \
+    pretyping/instantiate.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/declarations.cmx \
+    kernel/environ.cmx kernel/esubst.cmx pretyping/evd.cmx \
+    pretyping/instantiate.cmx kernel/names.cmx lib/pp.cmx kernel/term.cmx \
+    kernel/univ.cmx lib/util.cmx pretyping/cbv.cmi 
 pretyping/classops.cmo: library/declare.cmi kernel/environ.cmi \
     library/global.cmi library/lib.cmi library/libobject.cmi \
     library/library.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
@@ -884,16 +886,14 @@ pretyping/syntax_def.cmx: library/lib.cmx library/libobject.cmx \
     library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/pp.cmx \
     pretyping/rawterm.cmx library/summary.cmx lib/util.cmx \
     pretyping/syntax_def.cmi 
-pretyping/tacred.cmo: pretyping/cbv.cmi kernel/closure.cmi \
-    kernel/conv_oracle.cmi kernel/declarations.cmi kernel/environ.cmi \
+pretyping/tacred.cmo: pretyping/cbv.cmi kernel/closure.cmi kernel/environ.cmi \
     pretyping/evd.cmi kernel/inductive.cmi pretyping/instantiate.cmi \
-    library/nameops.cmi kernel/names.cmi lib/pp.cmi \
+    library/nameops.cmi kernel/names.cmi library/opaque.cmi lib/pp.cmi \
     pretyping/reductionops.cmi library/summary.cmi kernel/term.cmi \
     pretyping/termops.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/tacred.cmx: pretyping/cbv.cmx kernel/closure.cmx kernel/environ.cmx \
     pretyping/evd.cmx kernel/inductive.cmx pretyping/instantiate.cmx \
-    library/nameops.cmx kernel/names.cmx lib/pp.cmx \
+    library/nameops.cmx kernel/names.cmx library/opaque.cmx lib/pp.cmx \
     pretyping/reductionops.cmx library/summary.cmx kernel/term.cmx \
     pretyping/termops.cmx lib/util.cmx pretyping/tacred.cmi 
 pretyping/termops.cmo: kernel/environ.cmi library/global.cmi \
@@ -914,17 +914,17 @@ pretyping/typing.cmx: kernel/environ.cmx kernel/inductive.cmx \
     kernel/typeops.cmx lib/util.cmx pretyping/typing.cmi 
 proofs/clenv.cmo: kernel/environ.cmi proofs/evar_refiner.cmi \
     pretyping/evarutil.cmi pretyping/evd.cmi pretyping/instantiate.cmi \
-    proofs/logic.cmi library/nameops.cmi kernel/names.cmi lib/pp.cmi \
-    parsing/printer.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
-    pretyping/reductionops.cmi proofs/refiner.cmi pretyping/retyping.cmi \
-    kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi pretyping/termops.cmi \
+    proofs/logic.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
+    proofs/refiner.cmi pretyping/retyping.cmi kernel/sign.cmi \
+    proofs/tacmach.cmi kernel/term.cmi pretyping/termops.cmi \
     pretyping/typing.cmi lib/util.cmi proofs/clenv.cmi 
 proofs/clenv.cmx: kernel/environ.cmx proofs/evar_refiner.cmx \
     pretyping/evarutil.cmx pretyping/evd.cmx pretyping/instantiate.cmx \
-    proofs/logic.cmx library/nameops.cmx kernel/names.cmx lib/pp.cmx \
-    parsing/printer.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
-    pretyping/reductionops.cmx proofs/refiner.cmx pretyping/retyping.cmx \
-    kernel/sign.cmx proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx \
+    proofs/logic.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
+    proofs/refiner.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx \
     pretyping/typing.cmx lib/util.cmx proofs/clenv.cmi 
 proofs/evar_refiner.cmo: parsing/astterm.cmi kernel/environ.cmi \
     pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
@@ -942,46 +942,44 @@ proofs/evar_refiner.cmx: parsing/astterm.cmx kernel/environ.cmx \
     proofs/evar_refiner.cmi 
 proofs/logic.cmo: parsing/coqast.cmi library/declare.cmi kernel/environ.cmi \
     pretyping/evarutil.cmi pretyping/evd.cmi library/global.cmi \
-    kernel/inductive.cmi pretyping/inductiveops.cmi library/nameops.cmi \
-    kernel/names.cmi library/nametab.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
-    pretyping/retyping.cmi kernel/sign.cmi kernel/term.cmi \
-    pretyping/termops.cmi kernel/type_errors.cmi kernel/typeops.cmi \
-    pretyping/typing.cmi lib/util.cmi proofs/logic.cmi 
+    kernel/inductive.cmi pretyping/inductiveops.cmi kernel/names.cmi \
+    library/nametab.cmi lib/pp.cmi parsing/printer.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/reductionops.cmi pretyping/retyping.cmi \
+    kernel/sign.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/type_errors.cmi kernel/typeops.cmi pretyping/typing.cmi \
+    lib/util.cmi proofs/logic.cmi 
 proofs/logic.cmx: parsing/coqast.cmx library/declare.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 parsing/printer.cmx \
-    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
-    pretyping/retyping.cmx kernel/sign.cmx kernel/term.cmx \
-    pretyping/termops.cmx kernel/type_errors.cmx kernel/typeops.cmx \
-    pretyping/typing.cmx lib/util.cmx proofs/logic.cmi 
+    kernel/inductive.cmx pretyping/inductiveops.cmx kernel/names.cmx \
+    library/nametab.cmx lib/pp.cmx parsing/printer.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/reductionops.cmx pretyping/retyping.cmx \
+    kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/type_errors.cmx kernel/typeops.cmx pretyping/typing.cmx \
+    lib/util.cmx proofs/logic.cmi 
 proofs/pfedit.cmo: parsing/astterm.cmi kernel/declarations.cmi \
     library/declare.cmi lib/edit.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 kernel/safe_typing.cmi kernel/sign.cmi \
-    proofs/tacmach.cmi kernel/term.cmi pretyping/typing.cmi lib/util.cmi \
-    proofs/pfedit.cmi 
+    kernel/names.cmi lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    kernel/safe_typing.cmi kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi \
+    pretyping/typing.cmi lib/util.cmi proofs/pfedit.cmi 
 proofs/pfedit.cmx: parsing/astterm.cmx kernel/declarations.cmx \
     library/declare.cmx lib/edit.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 kernel/safe_typing.cmx kernel/sign.cmx \
-    proofs/tacmach.cmx kernel/term.cmx pretyping/typing.cmx lib/util.cmx \
-    proofs/pfedit.cmi 
+    kernel/names.cmx lib/pp.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    kernel/safe_typing.cmx kernel/sign.cmx proofs/tacmach.cmx kernel/term.cmx \
+    pretyping/typing.cmx lib/util.cmx proofs/pfedit.cmi 
 proofs/proof_trees.cmo: parsing/ast.cmi kernel/closure.cmi \
     pretyping/detyping.cmi kernel/environ.cmi pretyping/evarutil.cmi \
-    pretyping/evd.cmi library/global.cmi library/nameops.cmi kernel/names.cmi \
-    library/nametab.cmi lib/pp.cmi parsing/printer.cmi proofs/proof_type.cmi \
-    kernel/sign.cmi pretyping/tacred.cmi kernel/term.cmi parsing/termast.cmi \
+    pretyping/evd.cmi library/global.cmi kernel/names.cmi library/nametab.cmi \
+    lib/pp.cmi parsing/printer.cmi proofs/proof_type.cmi kernel/sign.cmi \
+    pretyping/tacred.cmi kernel/term.cmi parsing/termast.cmi \
     pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
     proofs/proof_trees.cmi 
 proofs/proof_trees.cmx: parsing/ast.cmx kernel/closure.cmx \
     pretyping/detyping.cmx kernel/environ.cmx pretyping/evarutil.cmx \
-    pretyping/evd.cmx library/global.cmx library/nameops.cmx kernel/names.cmx \
-    library/nametab.cmx lib/pp.cmx parsing/printer.cmx proofs/proof_type.cmx \
-    kernel/sign.cmx pretyping/tacred.cmx kernel/term.cmx parsing/termast.cmx \
+    pretyping/evd.cmx library/global.cmx kernel/names.cmx library/nametab.cmx \
+    lib/pp.cmx parsing/printer.cmx proofs/proof_type.cmx kernel/sign.cmx \
+    pretyping/tacred.cmx kernel/term.cmx parsing/termast.cmx \
     pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     proofs/proof_trees.cmi 
 proofs/proof_type.cmo: parsing/coqast.cmi kernel/environ.cmi \
@@ -1005,10 +1003,10 @@ proofs/refiner.cmx: parsing/ast.cmx kernel/environ.cmx pretyping/evarutil.cmx \
     kernel/term.cmx pretyping/termops.cmx kernel/type_errors.cmx lib/util.cmx \
     proofs/refiner.cmi 
 proofs/tacinterp.cmo: parsing/ast.cmi parsing/astterm.cmi kernel/closure.cmi \
-    kernel/conv_oracle.cmi parsing/coqast.cmi kernel/declarations.cmi \
-    library/declare.cmi lib/dyn.cmi kernel/environ.cmi pretyping/evd.cmi \
-    library/global.cmi lib/gmap.cmi library/lib.cmi library/libobject.cmi \
-    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    parsing/coqast.cmi kernel/declarations.cmi library/declare.cmi \
+    lib/dyn.cmi kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
+    lib/gmap.cmi library/lib.cmi library/libobject.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi library/opaque.cmi lib/options.cmi \
     pretyping/pattern.cmi proofs/pfedit.cmi lib/pp.cmi \
     pretyping/pretyping.cmi proofs/proof_type.cmi pretyping/rawterm.cmi \
     kernel/safe_typing.cmi kernel/sign.cmi library/summary.cmi \
@@ -1016,10 +1014,10 @@ proofs/tacinterp.cmo: parsing/ast.cmi parsing/astterm.cmi kernel/closure.cmi \
     kernel/term.cmi pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
     proofs/tacinterp.cmi 
 proofs/tacinterp.cmx: parsing/ast.cmx parsing/astterm.cmx kernel/closure.cmx \
-    kernel/conv_oracle.cmx parsing/coqast.cmx kernel/declarations.cmx \
-    library/declare.cmx lib/dyn.cmx kernel/environ.cmx pretyping/evd.cmx \
-    library/global.cmx lib/gmap.cmx library/lib.cmx library/libobject.cmx \
-    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    parsing/coqast.cmx kernel/declarations.cmx library/declare.cmx \
+    lib/dyn.cmx kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
+    lib/gmap.cmx library/lib.cmx library/libobject.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx library/opaque.cmx lib/options.cmx \
     pretyping/pattern.cmx proofs/pfedit.cmx lib/pp.cmx \
     pretyping/pretyping.cmx proofs/proof_type.cmx pretyping/rawterm.cmx \
     kernel/safe_typing.cmx kernel/sign.cmx library/summary.cmx \
@@ -1029,17 +1027,17 @@ proofs/tacinterp.cmx: parsing/ast.cmx parsing/astterm.cmx kernel/closure.cmx \
 proofs/tacmach.cmo: parsing/ast.cmi parsing/astterm.cmi library/declare.cmi \
     kernel/environ.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
     library/global.cmi pretyping/instantiate.cmi proofs/logic.cmi \
-    library/nameops.cmi kernel/names.cmi lib/pp.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi proofs/proof_type.cmi pretyping/reductionops.cmi \
-    proofs/refiner.cmi kernel/sign.cmi pretyping/tacred.cmi kernel/term.cmi \
+    kernel/names.cmi lib/pp.cmi parsing/printer.cmi proofs/proof_trees.cmi \
+    proofs/proof_type.cmi pretyping/reductionops.cmi proofs/refiner.cmi \
+    kernel/sign.cmi pretyping/tacred.cmi kernel/term.cmi \
     pretyping/termops.cmi pretyping/typing.cmi lib/util.cmi \
     proofs/tacmach.cmi 
 proofs/tacmach.cmx: parsing/ast.cmx parsing/astterm.cmx library/declare.cmx \
     kernel/environ.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
     library/global.cmx pretyping/instantiate.cmx proofs/logic.cmx \
-    library/nameops.cmx kernel/names.cmx lib/pp.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx proofs/proof_type.cmx pretyping/reductionops.cmx \
-    proofs/refiner.cmx kernel/sign.cmx pretyping/tacred.cmx kernel/term.cmx \
+    kernel/names.cmx lib/pp.cmx parsing/printer.cmx proofs/proof_trees.cmx \
+    proofs/proof_type.cmx pretyping/reductionops.cmx proofs/refiner.cmx \
+    kernel/sign.cmx pretyping/tacred.cmx kernel/term.cmx \
     pretyping/termops.cmx pretyping/typing.cmx lib/util.cmx \
     proofs/tacmach.cmi 
 proofs/tactic_debug.cmo: parsing/ast.cmi lib/pp.cmi parsing/printer.cmi \
@@ -1115,15 +1113,15 @@ tactics/dhyp.cmx: parsing/ast.cmx parsing/astterm.cmx proofs/clenv.cmx \
 tactics/dn.cmo: lib/tlm.cmi tactics/dn.cmi 
 tactics/dn.cmx: lib/tlm.cmx tactics/dn.cmi 
 tactics/eauto.cmo: tactics/auto.cmi proofs/clenv.cmi proofs/evar_refiner.cmi \
-    lib/explore.cmi proofs/logic.cmi library/nameops.cmi kernel/names.cmi \
-    pretyping/pattern.cmi lib/pp.cmi proofs/proof_trees.cmi \
-    proofs/proof_type.cmi kernel/reduction.cmi kernel/sign.cmi \
+    lib/explore.cmi proofs/logic.cmi kernel/names.cmi pretyping/pattern.cmi \
+    lib/pp.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
+    kernel/reduction.cmi parsing/search.cmi kernel/sign.cmi \
     proofs/tacmach.cmi tactics/tacticals.cmi tactics/tactics.cmi \
     kernel/term.cmi pretyping/termops.cmi lib/util.cmi 
 tactics/eauto.cmx: tactics/auto.cmx proofs/clenv.cmx proofs/evar_refiner.cmx \
-    lib/explore.cmx proofs/logic.cmx library/nameops.cmx kernel/names.cmx \
-    pretyping/pattern.cmx lib/pp.cmx proofs/proof_trees.cmx \
-    proofs/proof_type.cmx kernel/reduction.cmx kernel/sign.cmx \
+    lib/explore.cmx proofs/logic.cmx kernel/names.cmx pretyping/pattern.cmx \
+    lib/pp.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
+    kernel/reduction.cmx parsing/search.cmx kernel/sign.cmx \
     proofs/tacmach.cmx tactics/tacticals.cmx tactics/tactics.cmx \
     kernel/term.cmx pretyping/termops.cmx lib/util.cmx 
 tactics/elim.cmo: proofs/clenv.cmi library/declare.cmi kernel/environ.cmi \
@@ -1156,9 +1154,8 @@ tactics/equality.cmo: parsing/astterm.cmi proofs/clenv.cmi parsing/coqast.cmi \
     library/global.cmi lib/gmapl.cmi tactics/hipattern.cmi \
     pretyping/indrec.cmi kernel/inductive.cmi pretyping/inductiveops.cmi \
     pretyping/instantiate.cmi library/lib.cmi library/libobject.cmi \
-    proofs/logic.cmi library/nameops.cmi kernel/names.cmi \
-    pretyping/pattern.cmi lib/pp.cmi proofs/proof_type.cmi \
-    pretyping/reductionops.cmi pretyping/retyping.cmi \
+    proofs/logic.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
+    proofs/proof_type.cmi pretyping/reductionops.cmi pretyping/retyping.cmi \
     tactics/setoid_replace.cmi proofs/tacinterp.cmi proofs/tacmach.cmi \
     pretyping/tacred.cmi tactics/tacticals.cmi tactics/tactics.cmi \
     kernel/term.cmi pretyping/termops.cmi kernel/typeops.cmi \
@@ -1170,9 +1167,8 @@ tactics/equality.cmx: parsing/astterm.cmx proofs/clenv.cmx parsing/coqast.cmx \
     library/global.cmx lib/gmapl.cmx tactics/hipattern.cmx \
     pretyping/indrec.cmx kernel/inductive.cmx pretyping/inductiveops.cmx \
     pretyping/instantiate.cmx library/lib.cmx library/libobject.cmx \
-    proofs/logic.cmx library/nameops.cmx kernel/names.cmx \
-    pretyping/pattern.cmx lib/pp.cmx proofs/proof_type.cmx \
-    pretyping/reductionops.cmx pretyping/retyping.cmx \
+    proofs/logic.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
+    proofs/proof_type.cmx pretyping/reductionops.cmx pretyping/retyping.cmx \
     tactics/setoid_replace.cmx proofs/tacinterp.cmx proofs/tacmach.cmx \
     pretyping/tacred.cmx tactics/tacticals.cmx tactics/tactics.cmx \
     kernel/term.cmx pretyping/termops.cmx kernel/typeops.cmx \
@@ -1197,21 +1193,19 @@ tactics/hipattern.cmx: proofs/clenv.cmx parsing/coqlib.cmx \
 tactics/inv.cmo: tactics/auto.cmi proofs/clenv.cmi parsing/coqlib.cmi \
     tactics/elim.cmi kernel/environ.cmi tactics/equality.cmi \
     proofs/evar_refiner.cmi library/global.cmi pretyping/inductiveops.cmi \
-    library/nameops.cmi kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi \
-    parsing/printer.cmi proofs/proof_type.cmi pretyping/reductionops.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/wcclausenv.cmi tactics/inv.cmi 
+    kernel/names.cmi pretyping/pattern.cmi lib/pp.cmi parsing/printer.cmi \
+    proofs/proof_type.cmi pretyping/reductionops.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/wcclausenv.cmi tactics/inv.cmi 
 tactics/inv.cmx: tactics/auto.cmx proofs/clenv.cmx parsing/coqlib.cmx \
     tactics/elim.cmx kernel/environ.cmx tactics/equality.cmx \
     proofs/evar_refiner.cmx library/global.cmx pretyping/inductiveops.cmx \
-    library/nameops.cmx kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx \
-    parsing/printer.cmx proofs/proof_type.cmx pretyping/reductionops.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/wcclausenv.cmx tactics/inv.cmi 
+    kernel/names.cmx pretyping/pattern.cmx lib/pp.cmx parsing/printer.cmx \
+    proofs/proof_type.cmx pretyping/reductionops.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/wcclausenv.cmx tactics/inv.cmi 
 tactics/leminv.cmo: parsing/astterm.cmi proofs/clenv.cmi \
     kernel/declarations.cmi library/declare.cmi kernel/environ.cmi \
     proofs/evar_refiner.cmi pretyping/evd.cmi library/global.cmi \
@@ -1340,12 +1334,12 @@ tactics/wcclausenv.cmx: proofs/clenv.cmx kernel/environ.cmx \
     proofs/proof_trees.cmx pretyping/reductionops.cmx kernel/sign.cmx \
     proofs/tacmach.cmx kernel/term.cmx pretyping/termops.cmx lib/util.cmx \
     tactics/wcclausenv.cmi 
-tools/coqdep_lexer.cmo: config/coq_config.cmi 
-tools/coqdep_lexer.cmx: config/coq_config.cmx 
-tools/coqdep.cmo: config/coq_config.cmi tools/coqdep_lexer.cmo 
-tools/coqdep.cmx: config/coq_config.cmx tools/coqdep_lexer.cmx 
 tools/coq_vo2xml.cmo: config/coq_config.cmi toplevel/usage.cmi 
 tools/coq_vo2xml.cmx: config/coq_config.cmx toplevel/usage.cmx 
+tools/coqdep.cmo: config/coq_config.cmi tools/coqdep_lexer.cmo 
+tools/coqdep.cmx: config/coq_config.cmx tools/coqdep_lexer.cmx 
+tools/coqdep_lexer.cmo: config/coq_config.cmi 
+tools/coqdep_lexer.cmx: config/coq_config.cmx 
 tools/gallina.cmo: tools/gallina_lexer.cmo 
 tools/gallina.cmx: tools/gallina_lexer.cmx 
 toplevel/class.cmo: pretyping/classops.cmi kernel/declarations.cmi \
@@ -1442,18 +1436,16 @@ toplevel/fhimsg.cmx: kernel/environ.cmx parsing/g_minicoq.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 \
     library/global.cmi kernel/indtypes.cmi kernel/inductive.cmi \
-    proofs/logic.cmi library/nameops.cmi kernel/names.cmi lib/options.cmi \
-    lib/pp.cmi pretyping/pretype_errors.cmi parsing/printer.cmi \
-    kernel/reduction.cmi kernel/sign.cmi proofs/tacmach.cmi kernel/term.cmi \
-    pretyping/termops.cmi kernel/type_errors.cmi lib/util.cmi \
-    toplevel/himsg.cmi 
+    proofs/logic.cmi kernel/names.cmi lib/options.cmi lib/pp.cmi \
+    pretyping/pretype_errors.cmi parsing/printer.cmi kernel/reduction.cmi \
+    kernel/sign.cmi proofs/tacmach.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 \
     library/global.cmx kernel/indtypes.cmx kernel/inductive.cmx \
-    proofs/logic.cmx library/nameops.cmx kernel/names.cmx lib/options.cmx \
-    lib/pp.cmx pretyping/pretype_errors.cmx parsing/printer.cmx \
-    kernel/reduction.cmx kernel/sign.cmx proofs/tacmach.cmx kernel/term.cmx \
-    pretyping/termops.cmx kernel/type_errors.cmx lib/util.cmx \
-    toplevel/himsg.cmi 
+    proofs/logic.cmx kernel/names.cmx lib/options.cmx lib/pp.cmx \
+    pretyping/pretype_errors.cmx parsing/printer.cmx kernel/reduction.cmx \
+    kernel/sign.cmx proofs/tacmach.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: parsing/ast.cmi parsing/astterm.cmi \
@@ -1492,29 +1484,29 @@ toplevel/record.cmo: parsing/ast.cmi parsing/astterm.cmi toplevel/class.cmi \
     toplevel/command.cmi parsing/coqast.cmi kernel/declarations.cmi \
     library/declare.cmi kernel/environ.cmi pretyping/evd.cmi \
     library/global.cmi kernel/indtypes.cmi kernel/inductive.cmi \
-    pretyping/inductiveops.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 kernel/type_errors.cmi kernel/typeops.cmi \
-    lib/util.cmi toplevel/record.cmi 
+    pretyping/inductiveops.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 \
+    kernel/type_errors.cmi kernel/typeops.cmi lib/util.cmi \
+    toplevel/record.cmi 
 toplevel/record.cmx: parsing/ast.cmx parsing/astterm.cmx toplevel/class.cmx \
     toplevel/command.cmx parsing/coqast.cmx kernel/declarations.cmx \
     library/declare.cmx kernel/environ.cmx pretyping/evd.cmx \
     library/global.cmx kernel/indtypes.cmx kernel/inductive.cmx \
-    pretyping/inductiveops.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 kernel/type_errors.cmx kernel/typeops.cmx \
-    lib/util.cmx toplevel/record.cmi 
+    pretyping/inductiveops.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 \
+    kernel/type_errors.cmx kernel/typeops.cmx lib/util.cmx \
+    toplevel/record.cmi 
 toplevel/recordobj.cmo: pretyping/classops.cmi library/declare.cmi \
     kernel/environ.cmi library/global.cmi pretyping/instantiate.cmi \
-    library/lib.cmi library/nameops.cmi kernel/names.cmi library/nametab.cmi \
-    lib/pp.cmi pretyping/recordops.cmi kernel/term.cmi pretyping/termops.cmi \
+    library/lib.cmi kernel/names.cmi library/nametab.cmi lib/pp.cmi \
+    pretyping/recordops.cmi kernel/term.cmi pretyping/termops.cmi \
     lib/util.cmi toplevel/recordobj.cmi 
 toplevel/recordobj.cmx: pretyping/classops.cmx library/declare.cmx \
     kernel/environ.cmx library/global.cmx pretyping/instantiate.cmx \
-    library/lib.cmx library/nameops.cmx kernel/names.cmx library/nametab.cmx \
-    lib/pp.cmx pretyping/recordops.cmx kernel/term.cmx pretyping/termops.cmx \
+    library/lib.cmx kernel/names.cmx library/nametab.cmx lib/pp.cmx \
+    pretyping/recordops.cmx kernel/term.cmx pretyping/termops.cmx \
     lib/util.cmx toplevel/recordobj.cmi 
 toplevel/toplevel.cmo: parsing/ast.cmi toplevel/errors.cmi library/lib.cmi \
     toplevel/mltop.cmi kernel/names.cmi lib/options.cmi parsing/pcoq.cmi \
@@ -1526,15 +1518,25 @@ toplevel/toplevel.cmx: parsing/ast.cmx toplevel/errors.cmx library/lib.cmx \
     toplevel/vernac.cmx toplevel/vernacinterp.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: parsing/ast.cmi parsing/coqast.cmi library/lib.cmi \
+    library/library.cmi library/nameops.cmi kernel/names.cmi lib/options.cmi \
+    parsing/pcoq.cmi lib/pp.cmi library/states.cmi lib/system.cmi \
+    pretyping/termops.cmi lib/util.cmi toplevel/vernacinterp.cmi \
+    toplevel/vernac.cmi 
+toplevel/vernac.cmx: parsing/ast.cmx parsing/coqast.cmx library/lib.cmx \
+    library/library.cmx library/nameops.cmx kernel/names.cmx lib/options.cmx \
+    parsing/pcoq.cmx lib/pp.cmx library/states.cmx lib/system.cmx \
+    pretyping/termops.cmx lib/util.cmx toplevel/vernacinterp.cmx \
+    toplevel/vernac.cmi 
 toplevel/vernacentries.cmo: parsing/ast.cmi parsing/astterm.cmi \
     toplevel/class.cmi pretyping/classops.cmi toplevel/command.cmi \
-    kernel/conv_oracle.cmi parsing/coqast.cmi kernel/declarations.cmi \
-    library/declare.cmi toplevel/discharge.cmi kernel/environ.cmi \
-    proofs/evar_refiner.cmi pretyping/evarutil.cmi pretyping/evd.cmi \
-    parsing/extend.cmi library/global.cmi library/goptions.cmi \
-    library/impargs.cmi pretyping/inductiveops.cmi library/lib.cmi \
-    library/library.cmi toplevel/metasyntax.cmi toplevel/mltop.cmi \
-    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    parsing/coqast.cmi kernel/declarations.cmi library/declare.cmi \
+    toplevel/discharge.cmi kernel/environ.cmi proofs/evar_refiner.cmi \
+    pretyping/evarutil.cmi pretyping/evd.cmi parsing/extend.cmi \
+    library/global.cmi library/goptions.cmi library/impargs.cmi \
+    pretyping/inductiveops.cmi library/lib.cmi library/library.cmi \
+    toplevel/metasyntax.cmi toplevel/mltop.cmi library/nameops.cmi \
+    kernel/names.cmi library/nametab.cmi library/opaque.cmi lib/options.cmi \
     proofs/pfedit.cmi lib/pp.cmi lib/pp_control.cmi parsing/prettyp.cmi \
     parsing/printer.cmi proofs/proof_trees.cmi proofs/proof_type.cmi \
     toplevel/record.cmi toplevel/recordobj.cmi proofs/refiner.cmi \
@@ -1546,13 +1548,13 @@ toplevel/vernacentries.cmo: parsing/ast.cmi parsing/astterm.cmi \
     toplevel/vernacinterp.cmi toplevel/vernacentries.cmi 
 toplevel/vernacentries.cmx: parsing/ast.cmx parsing/astterm.cmx \
     toplevel/class.cmx pretyping/classops.cmx toplevel/command.cmx \
-    kernel/conv_oracle.cmx parsing/coqast.cmx kernel/declarations.cmx \
-    library/declare.cmx toplevel/discharge.cmx kernel/environ.cmx \
-    proofs/evar_refiner.cmx pretyping/evarutil.cmx pretyping/evd.cmx \
-    parsing/extend.cmx library/global.cmx library/goptions.cmx \
-    library/impargs.cmx pretyping/inductiveops.cmx library/lib.cmx \
-    library/library.cmx toplevel/metasyntax.cmx toplevel/mltop.cmx \
-    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    parsing/coqast.cmx kernel/declarations.cmx library/declare.cmx \
+    toplevel/discharge.cmx kernel/environ.cmx proofs/evar_refiner.cmx \
+    pretyping/evarutil.cmx pretyping/evd.cmx parsing/extend.cmx \
+    library/global.cmx library/goptions.cmx library/impargs.cmx \
+    pretyping/inductiveops.cmx library/lib.cmx library/library.cmx \
+    toplevel/metasyntax.cmx toplevel/mltop.cmx library/nameops.cmx \
+    kernel/names.cmx library/nametab.cmx library/opaque.cmx lib/options.cmx \
     proofs/pfedit.cmx lib/pp.cmx lib/pp_control.cmx parsing/prettyp.cmx \
     parsing/printer.cmx proofs/proof_trees.cmx proofs/proof_type.cmx \
     toplevel/record.cmx toplevel/recordobj.cmx proofs/refiner.cmx \
@@ -1572,28 +1574,6 @@ toplevel/vernacinterp.cmx: parsing/ast.cmx parsing/astterm.cmx \
     kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
     proofs/proof_type.cmx proofs/tacinterp.cmx lib/util.cmx \
     toplevel/vernacinterp.cmi 
-toplevel/vernac.cmo: parsing/ast.cmi parsing/coqast.cmi library/lib.cmi \
-    library/library.cmi library/nameops.cmi kernel/names.cmi lib/options.cmi \
-    parsing/pcoq.cmi lib/pp.cmi library/states.cmi lib/system.cmi \
-    pretyping/termops.cmi lib/util.cmi toplevel/vernacinterp.cmi \
-    toplevel/vernac.cmi 
-toplevel/vernac.cmx: parsing/ast.cmx parsing/coqast.cmx library/lib.cmx \
-    library/library.cmx library/nameops.cmx kernel/names.cmx lib/options.cmx \
-    parsing/pcoq.cmx lib/pp.cmx library/states.cmx lib/system.cmx \
-    pretyping/termops.cmx lib/util.cmx toplevel/vernacinterp.cmx \
-    toplevel/vernac.cmi 
-contrib/correctness/pcicenv.cmo: library/global.cmi kernel/names.cmi \
-    contrib/correctness/past.cmi contrib/correctness/penv.cmi \
-    contrib/correctness/pmisc.cmi contrib/correctness/pmonad.cmi \
-    contrib/correctness/prename.cmi contrib/correctness/ptype.cmi \
-    contrib/correctness/putil.cmi kernel/sign.cmi kernel/term.cmi \
-    kernel/univ.cmi contrib/correctness/pcicenv.cmi 
-contrib/correctness/pcicenv.cmx: library/global.cmx kernel/names.cmx \
-    contrib/correctness/past.cmi contrib/correctness/penv.cmx \
-    contrib/correctness/pmisc.cmx contrib/correctness/pmonad.cmx \
-    contrib/correctness/prename.cmx contrib/correctness/ptype.cmi \
-    contrib/correctness/putil.cmx kernel/sign.cmx kernel/term.cmx \
-    kernel/univ.cmx contrib/correctness/pcicenv.cmi 
 contrib/correctness/pcic.cmo: parsing/ast.cmi kernel/declarations.cmi \
     library/declare.cmi pretyping/detyping.cmi kernel/indtypes.cmi \
     kernel/names.cmi library/nametab.cmi contrib/correctness/past.cmi \
@@ -1606,6 +1586,18 @@ contrib/correctness/pcic.cmx: parsing/ast.cmx kernel/declarations.cmx \
     contrib/correctness/pmisc.cmx pretyping/rawterm.cmx toplevel/record.cmx \
     kernel/sign.cmx kernel/term.cmx pretyping/termops.cmx kernel/typeops.cmx \
     lib/util.cmx contrib/correctness/pcic.cmi 
+contrib/correctness/pcicenv.cmo: library/global.cmi kernel/names.cmi \
+    contrib/correctness/past.cmi contrib/correctness/penv.cmi \
+    contrib/correctness/pmisc.cmi contrib/correctness/pmonad.cmi \
+    contrib/correctness/prename.cmi contrib/correctness/ptype.cmi \
+    contrib/correctness/putil.cmi kernel/sign.cmi kernel/term.cmi \
+    kernel/univ.cmi contrib/correctness/pcicenv.cmi 
+contrib/correctness/pcicenv.cmx: library/global.cmx kernel/names.cmx \
+    contrib/correctness/past.cmi contrib/correctness/penv.cmx \
+    contrib/correctness/pmisc.cmx contrib/correctness/pmonad.cmx \
+    contrib/correctness/prename.cmx contrib/correctness/ptype.cmi \
+    contrib/correctness/putil.cmx kernel/sign.cmx kernel/term.cmx \
+    kernel/univ.cmx contrib/correctness/pcicenv.cmi 
 contrib/correctness/pdb.cmo: library/declare.cmi library/global.cmi \
     kernel/names.cmi library/nametab.cmi contrib/correctness/past.cmi \
     contrib/correctness/peffect.cmi contrib/correctness/penv.cmi \
@@ -1616,36 +1608,34 @@ contrib/correctness/pdb.cmx: library/declare.cmx library/global.cmx \
     contrib/correctness/peffect.cmx contrib/correctness/penv.cmx \
     contrib/correctness/perror.cmx contrib/correctness/ptype.cmi \
     kernel/term.cmx pretyping/termops.cmx contrib/correctness/pdb.cmi 
-contrib/correctness/peffect.cmo: toplevel/himsg.cmi library/nameops.cmi \
-    kernel/names.cmi contrib/correctness/pmisc.cmi lib/pp.cmi lib/util.cmi \
+contrib/correctness/peffect.cmo: toplevel/himsg.cmi kernel/names.cmi \
+    contrib/correctness/pmisc.cmi lib/pp.cmi lib/util.cmi \
     contrib/correctness/peffect.cmi 
-contrib/correctness/peffect.cmx: toplevel/himsg.cmx library/nameops.cmx \
-    kernel/names.cmx contrib/correctness/pmisc.cmx lib/pp.cmx lib/util.cmx \
+contrib/correctness/peffect.cmx: toplevel/himsg.cmx kernel/names.cmx \
+    contrib/correctness/pmisc.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 contrib/correctness/past.cmi \
+    library/libobject.cmi library/library.cmi kernel/names.cmi \
+    lib/options.cmi contrib/correctness/past.cmi \
     contrib/correctness/perror.cmi contrib/correctness/pmisc.cmi lib/pp.cmi \
     contrib/correctness/ptype.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 contrib/correctness/past.cmi \
+    library/libobject.cmx library/library.cmx kernel/names.cmx \
+    lib/options.cmx contrib/correctness/past.cmi \
     contrib/correctness/perror.cmx contrib/correctness/pmisc.cmx lib/pp.cmx \
     contrib/correctness/ptype.cmi library/summary.cmx kernel/term.cmx \
     contrib/correctness/penv.cmi 
 contrib/correctness/perror.cmo: library/declare.cmi pretyping/evd.cmi \
-    library/global.cmi toplevel/himsg.cmi library/nameops.cmi \
-    kernel/names.cmi contrib/correctness/past.cmi \
-    contrib/correctness/peffect.cmi lib/pp.cmi contrib/correctness/ptype.cmi \
-    pretyping/reductionops.cmi kernel/term.cmi lib/util.cmi \
-    contrib/correctness/perror.cmi 
+    library/global.cmi toplevel/himsg.cmi kernel/names.cmi \
+    contrib/correctness/past.cmi contrib/correctness/peffect.cmi lib/pp.cmi \
+    contrib/correctness/ptype.cmi pretyping/reductionops.cmi kernel/term.cmi \
+    lib/util.cmi contrib/correctness/perror.cmi 
 contrib/correctness/perror.cmx: library/declare.cmx pretyping/evd.cmx \
-    library/global.cmx toplevel/himsg.cmx library/nameops.cmx \
-    kernel/names.cmx contrib/correctness/past.cmi \
-    contrib/correctness/peffect.cmx lib/pp.cmx contrib/correctness/ptype.cmi \
-    pretyping/reductionops.cmx kernel/term.cmx lib/util.cmx \
-    contrib/correctness/perror.cmi 
+    library/global.cmx toplevel/himsg.cmx kernel/names.cmx \
+    contrib/correctness/past.cmi contrib/correctness/peffect.cmx lib/pp.cmx \
+    contrib/correctness/ptype.cmi 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 \
@@ -1706,39 +1696,39 @@ contrib/correctness/pred.cmo: pretyping/evd.cmi library/global.cmi \
 contrib/correctness/pred.cmx: pretyping/evd.cmx library/global.cmx \
     contrib/correctness/past.cmi contrib/correctness/pmisc.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 contrib/correctness/pmisc.cmi lib/pp.cmi lib/util.cmi \
+contrib/correctness/prename.cmo: toplevel/himsg.cmi kernel/names.cmi \
+    contrib/correctness/pmisc.cmi lib/pp.cmi lib/util.cmi \
     contrib/correctness/prename.cmi 
-contrib/correctness/prename.cmx: toplevel/himsg.cmx library/nameops.cmx \
-    kernel/names.cmx contrib/correctness/pmisc.cmx lib/pp.cmx lib/util.cmx \
+contrib/correctness/prename.cmx: toplevel/himsg.cmx kernel/names.cmx \
+    contrib/correctness/pmisc.cmx lib/pp.cmx lib/util.cmx \
     contrib/correctness/prename.cmi 
 contrib/correctness/psyntax.cmo: parsing/ast.cmi parsing/astterm.cmi \
     parsing/coqast.cmi library/declare.cmi lib/dyn.cmi pretyping/evd.cmi \
     parsing/g_zsyntax.cmi library/global.cmi toplevel/himsg.cmi \
-    library/nameops.cmi kernel/names.cmi lib/options.cmi \
-    contrib/correctness/past.cmi contrib/correctness/pcicenv.cmi \
-    parsing/pcoq.cmi contrib/correctness/pdb.cmi \
-    contrib/correctness/peffect.cmi contrib/correctness/penv.cmi \
-    contrib/correctness/pmisc.cmi contrib/correctness/pmonad.cmi lib/pp.cmi \
-    contrib/correctness/prename.cmi contrib/correctness/ptactic.cmi \
-    contrib/correctness/ptype.cmi contrib/correctness/ptyping.cmi \
-    contrib/correctness/putil.cmi kernel/reduction.cmi kernel/safe_typing.cmi \
-    proofs/tacinterp.cmi kernel/term.cmi parsing/termast.cmi lib/util.cmi \
-    toplevel/vernac.cmi toplevel/vernacentries.cmi toplevel/vernacinterp.cmi \
+    kernel/names.cmi lib/options.cmi contrib/correctness/past.cmi \
+    contrib/correctness/pcicenv.cmi parsing/pcoq.cmi \
+    contrib/correctness/pdb.cmi contrib/correctness/peffect.cmi \
+    contrib/correctness/penv.cmi contrib/correctness/pmisc.cmi \
+    contrib/correctness/pmonad.cmi lib/pp.cmi contrib/correctness/prename.cmi \
+    contrib/correctness/ptactic.cmi contrib/correctness/ptype.cmi \
+    contrib/correctness/ptyping.cmi contrib/correctness/putil.cmi \
+    kernel/reduction.cmi kernel/safe_typing.cmi proofs/tacinterp.cmi \
+    kernel/term.cmi parsing/termast.cmi lib/util.cmi toplevel/vernac.cmi \
+    toplevel/vernacentries.cmi toplevel/vernacinterp.cmi \
     contrib/correctness/psyntax.cmi 
 contrib/correctness/psyntax.cmx: parsing/ast.cmx parsing/astterm.cmx \
     parsing/coqast.cmx library/declare.cmx lib/dyn.cmx pretyping/evd.cmx \
     parsing/g_zsyntax.cmx library/global.cmx toplevel/himsg.cmx \
-    library/nameops.cmx kernel/names.cmx lib/options.cmx \
-    contrib/correctness/past.cmi contrib/correctness/pcicenv.cmx \
-    parsing/pcoq.cmx contrib/correctness/pdb.cmx \
-    contrib/correctness/peffect.cmx contrib/correctness/penv.cmx \
-    contrib/correctness/pmisc.cmx contrib/correctness/pmonad.cmx lib/pp.cmx \
-    contrib/correctness/prename.cmx contrib/correctness/ptactic.cmx \
-    contrib/correctness/ptype.cmi contrib/correctness/ptyping.cmx \
-    contrib/correctness/putil.cmx kernel/reduction.cmx kernel/safe_typing.cmx \
-    proofs/tacinterp.cmx kernel/term.cmx parsing/termast.cmx lib/util.cmx \
-    toplevel/vernac.cmx toplevel/vernacentries.cmx toplevel/vernacinterp.cmx \
+    kernel/names.cmx lib/options.cmx contrib/correctness/past.cmi \
+    contrib/correctness/pcicenv.cmx parsing/pcoq.cmx \
+    contrib/correctness/pdb.cmx contrib/correctness/peffect.cmx \
+    contrib/correctness/penv.cmx contrib/correctness/pmisc.cmx \
+    contrib/correctness/pmonad.cmx lib/pp.cmx contrib/correctness/prename.cmx \
+    contrib/correctness/ptactic.cmx contrib/correctness/ptype.cmi \
+    contrib/correctness/ptyping.cmx contrib/correctness/putil.cmx \
+    kernel/reduction.cmx kernel/safe_typing.cmx proofs/tacinterp.cmx \
+    kernel/term.cmx parsing/termast.cmx lib/util.cmx toplevel/vernac.cmx \
+    toplevel/vernacentries.cmx toplevel/vernacinterp.cmx \
     contrib/correctness/psyntax.cmi 
 contrib/correctness/ptactic.cmo: library/declare.cmi tactics/equality.cmi \
     pretyping/evd.cmi library/global.cmi kernel/names.cmi library/nametab.cmi \
@@ -1791,19 +1781,19 @@ contrib/correctness/ptyping.cmx: parsing/ast.cmx parsing/astterm.cmx \
     pretyping/reductionops.cmx kernel/term.cmx pretyping/termops.cmx \
     pretyping/typing.cmx lib/util.cmx contrib/correctness/ptyping.cmi 
 contrib/correctness/putil.cmo: parsing/coqlib.cmi kernel/environ.cmi \
-    library/global.cmi library/nameops.cmi kernel/names.cmi \
-    contrib/correctness/past.cmi pretyping/pattern.cmi \
-    contrib/correctness/peffect.cmi contrib/correctness/penv.cmi \
-    contrib/correctness/pmisc.cmi lib/pp.cmi contrib/correctness/prename.cmi \
-    parsing/printer.cmi contrib/correctness/ptype.cmi kernel/term.cmi \
-    pretyping/termops.cmi lib/util.cmi contrib/correctness/putil.cmi 
+    library/global.cmi kernel/names.cmi contrib/correctness/past.cmi \
+    pretyping/pattern.cmi contrib/correctness/peffect.cmi \
+    contrib/correctness/penv.cmi contrib/correctness/pmisc.cmi lib/pp.cmi \
+    contrib/correctness/prename.cmi parsing/printer.cmi \
+    contrib/correctness/ptype.cmi kernel/term.cmi pretyping/termops.cmi \
+    lib/util.cmi contrib/correctness/putil.cmi 
 contrib/correctness/putil.cmx: parsing/coqlib.cmx kernel/environ.cmx \
-    library/global.cmx library/nameops.cmx kernel/names.cmx \
-    contrib/correctness/past.cmi pretyping/pattern.cmx \
-    contrib/correctness/peffect.cmx contrib/correctness/penv.cmx \
-    contrib/correctness/pmisc.cmx lib/pp.cmx contrib/correctness/prename.cmx \
-    parsing/printer.cmx contrib/correctness/ptype.cmi kernel/term.cmx \
-    pretyping/termops.cmx lib/util.cmx contrib/correctness/putil.cmi 
+    library/global.cmx kernel/names.cmx contrib/correctness/past.cmi \
+    pretyping/pattern.cmx contrib/correctness/peffect.cmx \
+    contrib/correctness/penv.cmx contrib/correctness/pmisc.cmx lib/pp.cmx \
+    contrib/correctness/prename.cmx parsing/printer.cmx \
+    contrib/correctness/ptype.cmi kernel/term.cmx pretyping/termops.cmx \
+    lib/util.cmx contrib/correctness/putil.cmi 
 contrib/correctness/pwp.cmo: kernel/environ.cmi library/global.cmi \
     kernel/names.cmi library/nametab.cmi contrib/correctness/past.cmi \
     contrib/correctness/peffect.cmi contrib/correctness/penv.cmi \
@@ -1838,18 +1828,16 @@ contrib/extraction/extract_env.cmo: parsing/astterm.cmi \
     contrib/extraction/common.cmi pretyping/evd.cmi \
     contrib/extraction/extraction.cmi library/global.cmi library/lib.cmi \
     library/libobject.cmi library/library.cmi contrib/extraction/miniml.cmi \
-    contrib/extraction/mlutil.cmi library/nameops.cmi kernel/names.cmi \
-    library/nametab.cmi lib/pp.cmi contrib/extraction/table.cmi \
-    kernel/term.cmi lib/util.cmi toplevel/vernacinterp.cmi \
-    contrib/extraction/extract_env.cmi 
+    contrib/extraction/mlutil.cmi kernel/names.cmi library/nametab.cmi \
+    lib/pp.cmi contrib/extraction/table.cmi kernel/term.cmi lib/util.cmi \
+    toplevel/vernacinterp.cmi contrib/extraction/extract_env.cmi 
 contrib/extraction/extract_env.cmx: parsing/astterm.cmx \
     contrib/extraction/common.cmx pretyping/evd.cmx \
     contrib/extraction/extraction.cmx library/global.cmx library/lib.cmx \
     library/libobject.cmx library/library.cmx contrib/extraction/miniml.cmi \
-    contrib/extraction/mlutil.cmx library/nameops.cmx kernel/names.cmx \
-    library/nametab.cmx lib/pp.cmx contrib/extraction/table.cmx \
-    kernel/term.cmx lib/util.cmx toplevel/vernacinterp.cmx \
-    contrib/extraction/extract_env.cmi 
+    contrib/extraction/mlutil.cmx kernel/names.cmx library/nametab.cmx \
+    lib/pp.cmx contrib/extraction/table.cmx kernel/term.cmx lib/util.cmx \
+    toplevel/vernacinterp.cmx contrib/extraction/extract_env.cmi 
 contrib/extraction/extraction.cmo: kernel/closure.cmi kernel/declarations.cmi \
     kernel/environ.cmi pretyping/evd.cmi library/global.cmi lib/gmap.cmi \
     kernel/inductive.cmi pretyping/instantiate.cmi \
@@ -2046,14 +2034,6 @@ contrib/interface/pbp.cmx: parsing/coqlib.cmx contrib/interface/ctast.cmx \
     kernel/reduction.cmx proofs/tacinterp.cmx proofs/tacmach.cmx \
     tactics/tacticals.cmx tactics/tactics.cmx kernel/term.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: parsing/ast.cmi parsing/astterm.cmi \
     proofs/clenv.cmi parsing/coqast.cmi kernel/declarations.cmi \
     kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
@@ -2074,6 +2054,14 @@ contrib/interface/showproof.cmx: parsing/ast.cmx parsing/astterm.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/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/translate.cmo: contrib/interface/ascent.cmi parsing/ast.cmi \
     contrib/interface/ctast.cmo kernel/environ.cmi pretyping/evarutil.cmi \
     pretyping/evd.cmi library/libobject.cmi library/library.cmi \
@@ -2170,6 +2158,8 @@ contrib/romega/refl_omega.cmx: parsing/ast.cmx tactics/auto.cmx \
     parsing/printer.cmx proofs/proof_type.cmx kernel/reduction.cmx \
     kernel/sign.cmx proofs/tacmach.cmx tactics/tacticals.cmx \
     tactics/tactics.cmx kernel/term.cmx lib/util.cmx 
+contrib/xml/xml.cmo: contrib/xml/xml.cmi 
+contrib/xml/xml.cmx: contrib/xml/xml.cmi 
 contrib/xml/xmlcommand.cmo: kernel/declarations.cmi library/declare.cmi \
     kernel/environ.cmi pretyping/evd.cmi library/global.cmi library/lib.cmi \
     library/libobject.cmi library/library.cmi library/nameops.cmi \
@@ -2190,8 +2180,6 @@ contrib/xml/xmlentries.cmo: lib/util.cmi toplevel/vernacinterp.cmi \
     contrib/xml/xmlcommand.cmi 
 contrib/xml/xmlentries.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 
 tactics/tauto.cmo: parsing/grammar.cma kernel/names.cmo parsing/ast.cmo parsing/g_tactic.cmo parsing/g_ltac.cmo parsing/g_constr.cmo
 contrib/correctness/psyntax.cmo: parsing/grammar.cma
 contrib/field/field.cmo: parsing/grammar.cma kernel/names.cmo parsing/ast.cmo parsing/g_tactic.cmo parsing/g_ltac.cmo parsing/g_constr.cmo