maj

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

2 files changed, 98 insertions, 89 deletions

diff --git a/.depend b/.depend
index ccc5e1c4de..371e2ea233 100644
--- a/.depend
+++ b/.depend
@@ -19,9 +19,10 @@ interp/modintern.cmi: kernel/declarations.cmi kernel/entries.cmi \
     kernel/environ.cmi interp/topconstr.cmi 
 interp/ppextend.cmi: kernel/names.cmi lib/pp.cmi 
 interp/reserve.cmi: kernel/names.cmi pretyping/rawterm.cmi 
-interp/symbols.cmi: lib/bignat.cmi library/libnames.cmi kernel/names.cmi \
-    library/nametab.cmi lib/pp.cmi interp/ppextend.cmi pretyping/rawterm.cmi \
-    interp/topconstr.cmi lib/util.cmi 
+interp/symbols.cmi: lib/bignat.cmi pretyping/classops.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi lib/pp.cmi \
+    interp/ppextend.cmi pretyping/rawterm.cmi interp/topconstr.cmi \
+    lib/util.cmi 
 interp/syntax_def.cmi: kernel/names.cmi pretyping/rawterm.cmi \
     interp/topconstr.cmi 
 interp/topconstr.cmi: lib/bignat.cmi lib/dyn.cmi library/libnames.cmi \
@@ -324,9 +325,9 @@ toplevel/vernacentries.cmi: kernel/environ.cmi pretyping/evd.cmi \
 toplevel/vernacinterp.cmi: proofs/tacexpr.cmo 
 translate/ppconstrnew.cmi: parsing/coqast.cmi kernel/environ.cmi \
     parsing/extend.cmi interp/genarg.cmi library/libnames.cmi \
-    kernel/names.cmi parsing/pcoq.cmi lib/pp.cmi interp/ppextend.cmi \
-    pretyping/rawterm.cmi proofs/tacexpr.cmo kernel/term.cmi \
-    interp/topconstr.cmi lib/util.cmi 
+    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 lib/pp.cmi \
     proofs/proof_type.cmi proofs/tacexpr.cmo interp/topconstr.cmi 
 translate/ppvernacnew.cmi: parsing/ast.cmi parsing/coqast.cmi \
@@ -532,41 +533,45 @@ ide/undo.cmo: ide/ideutils.cmi ide/undo.cmi
 ide/undo.cmx: ide/ideutils.cmx ide/undo.cmi 
 interp/constrextern.cmo: pretyping/classops.cmi library/declare.cmi \
     pretyping/detyping.cmi kernel/environ.cmi library/impargs.cmi \
-    kernel/inductive.cmi library/libnames.cmi library/nameops.cmi \
-    kernel/names.cmi library/nametab.cmi lib/options.cmi \
-    pretyping/pattern.cmi lib/pp.cmi pretyping/rawterm.cmi interp/reserve.cmi \
-    kernel/sign.cmi interp/symbols.cmi kernel/term.cmi pretyping/termops.cmi \
+    kernel/inductive.cmi library/lib.cmi library/libnames.cmi \
+    library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
+    pretyping/pattern.cmi lib/pp.cmi pretyping/rawterm.cmi \
+    pretyping/recordops.cmi interp/reserve.cmi kernel/sign.cmi \
+    interp/symbols.cmi kernel/term.cmi pretyping/termops.cmi \
     interp/topconstr.cmi kernel/univ.cmi lib/util.cmi interp/constrextern.cmi 
 interp/constrextern.cmx: pretyping/classops.cmx library/declare.cmx \
     pretyping/detyping.cmx kernel/environ.cmx library/impargs.cmx \
-    kernel/inductive.cmx library/libnames.cmx library/nameops.cmx \
-    kernel/names.cmx library/nametab.cmx lib/options.cmx \
-    pretyping/pattern.cmx lib/pp.cmx pretyping/rawterm.cmx interp/reserve.cmx \
-    kernel/sign.cmx interp/symbols.cmx kernel/term.cmx pretyping/termops.cmx \
+    kernel/inductive.cmx library/lib.cmx library/libnames.cmx \
+    library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
+    pretyping/pattern.cmx lib/pp.cmx pretyping/rawterm.cmx \
+    pretyping/recordops.cmx interp/reserve.cmx kernel/sign.cmx \
+    interp/symbols.cmx kernel/term.cmx pretyping/termops.cmx \
     interp/topconstr.cmx kernel/univ.cmx lib/util.cmx interp/constrextern.cmi 
 interp/constrintern.cmo: lib/bignat.cmi library/declare.cmi \
     kernel/environ.cmi pretyping/evd.cmi library/global.cmi \
     library/impargs.cmi library/libnames.cmi library/nameops.cmi \
     kernel/names.cmi library/nametab.cmi lib/options.cmi \
     pretyping/pattern.cmi lib/pp.cmi pretyping/pretype_errors.cmi \
-    pretyping/pretyping.cmi pretyping/rawterm.cmi interp/reserve.cmi \
-    pretyping/retyping.cmi kernel/sign.cmi interp/symbols.cmi \
-    interp/syntax_def.cmi kernel/term.cmi pretyping/termops.cmi \
-    interp/topconstr.cmi lib/util.cmi interp/constrintern.cmi 
+    pretyping/pretyping.cmi pretyping/rawterm.cmi pretyping/recordops.cmi \
+    interp/reserve.cmi pretyping/retyping.cmi kernel/sign.cmi \
+    interp/symbols.cmi interp/syntax_def.cmi kernel/term.cmi \
+    pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
+    interp/constrintern.cmi 
 interp/constrintern.cmx: lib/bignat.cmx library/declare.cmx \
     kernel/environ.cmx pretyping/evd.cmx library/global.cmx \
     library/impargs.cmx library/libnames.cmx library/nameops.cmx \
     kernel/names.cmx library/nametab.cmx lib/options.cmx \
     pretyping/pattern.cmx lib/pp.cmx pretyping/pretype_errors.cmx \
-    pretyping/pretyping.cmx pretyping/rawterm.cmx interp/reserve.cmx \
-    pretyping/retyping.cmx kernel/sign.cmx interp/symbols.cmx \
-    interp/syntax_def.cmx kernel/term.cmx pretyping/termops.cmx \
-    interp/topconstr.cmx lib/util.cmx interp/constrintern.cmi 
-interp/coqlib.cmo: library/declare.cmi library/libnames.cmi \
-    library/nameops.cmi kernel/names.cmi library/nametab.cmi \
+    pretyping/pretyping.cmx pretyping/rawterm.cmx pretyping/recordops.cmx \
+    interp/reserve.cmx pretyping/retyping.cmx kernel/sign.cmx \
+    interp/symbols.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/declare.cmi \
+    library/libnames.cmi kernel/names.cmi library/nametab.cmi \
     pretyping/pattern.cmi kernel/term.cmi lib/util.cmi interp/coqlib.cmi 
-interp/coqlib.cmx: library/declare.cmx library/libnames.cmx \
-    library/nameops.cmx kernel/names.cmx library/nametab.cmx \
+interp/coqlib.cmx: interp/constrextern.cmx library/declare.cmx \
+    library/libnames.cmx kernel/names.cmx library/nametab.cmx \
     pretyping/pattern.cmx kernel/term.cmx lib/util.cmx interp/coqlib.cmi 
 interp/genarg.cmo: pretyping/evd.cmi kernel/names.cmi library/nametab.cmi \
     pretyping/rawterm.cmi kernel/term.cmi interp/topconstr.cmi lib/util.cmi \
@@ -592,16 +597,18 @@ interp/reserve.cmo: library/lib.cmi library/libobject.cmi library/nameops.cmi \
 interp/reserve.cmx: library/lib.cmx library/libobject.cmx library/nameops.cmx \
     kernel/names.cmx pretyping/rawterm.cmx library/summary.cmx lib/util.cmx \
     interp/reserve.cmi 
-interp/symbols.cmo: lib/bignat.cmi lib/gmapl.cmi library/lib.cmi \
-    library/libnames.cmi library/libobject.cmi library/library.cmi \
-    kernel/names.cmi library/nametab.cmi lib/options.cmi lib/pp.cmi \
-    interp/ppextend.cmi pretyping/rawterm.cmi library/summary.cmi \
-    interp/topconstr.cmi lib/util.cmi interp/symbols.cmi 
-interp/symbols.cmx: lib/bignat.cmx lib/gmapl.cmx library/lib.cmx \
-    library/libnames.cmx library/libobject.cmx library/library.cmx \
-    kernel/names.cmx library/nametab.cmx lib/options.cmx lib/pp.cmx \
-    interp/ppextend.cmx pretyping/rawterm.cmx library/summary.cmx \
-    interp/topconstr.cmx lib/util.cmx interp/symbols.cmi 
+interp/symbols.cmo: lib/bignat.cmi pretyping/classops.cmi library/global.cmi \
+    lib/gmap.cmi lib/gmapl.cmi library/lib.cmi library/libnames.cmi \
+    library/libobject.cmi library/library.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/symbols.cmi 
+interp/symbols.cmx: lib/bignat.cmx pretyping/classops.cmx library/global.cmx \
+    lib/gmap.cmx lib/gmapl.cmx library/lib.cmx library/libnames.cmx \
+    library/libobject.cmx library/library.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/symbols.cmi 
 interp/syntax_def.cmo: library/lib.cmi library/libnames.cmi \
     library/libobject.cmi library/nameops.cmi kernel/names.cmi \
     library/nametab.cmi lib/pp.cmi library/summary.cmi interp/symbols.cmi \
@@ -746,8 +753,6 @@ kernel/univ.cmx: lib/hashcons.cmx kernel/names.cmx lib/pp.cmx lib/util.cmx \
     kernel/univ.cmi 
 lib/bignat.cmo: lib/pp.cmi lib/bignat.cmi 
 lib/bignat.cmx: lib/pp.cmx lib/bignat.cmi 
-lib/bij.cmo: lib/gmap.cmi lib/bij.cmi 
-lib/bij.cmx: lib/gmap.cmx lib/bij.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 
@@ -874,9 +879,9 @@ library/library.cmx: library/declaremods.cmx library/lib.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: kernel/names.cmi lib/options.cmi lib/pp.cmi lib/util.cmi \
+library/nameops.cmo: kernel/names.cmi lib/pp.cmi lib/util.cmi \
     library/nameops.cmi 
-library/nameops.cmx: kernel/names.cmx lib/options.cmx lib/pp.cmx lib/util.cmx \
+library/nameops.cmx: kernel/names.cmx lib/pp.cmx lib/util.cmx \
     library/nameops.cmi 
 library/nametab.cmo: kernel/declarations.cmi library/libnames.cmi \
     library/nameops.cmi kernel/names.cmi lib/pp.cmi library/summary.cmi \
@@ -1605,13 +1610,15 @@ proofs/tacmach.cmx: interp/constrintern.cmx library/declare.cmx \
     pretyping/tacred.cmx kernel/term.cmx pretyping/termops.cmx \
     pretyping/typing.cmx lib/util.cmx proofs/tacmach.cmi 
 proofs/tactic_debug.cmo: parsing/ast.cmi interp/constrextern.cmi \
-    kernel/names.cmi lib/pp.cmi parsing/pptactic.cmi parsing/printer.cmi \
-    proofs/proof_trees.cmi proofs/tacexpr.cmo proofs/tacmach.cmi \
-    pretyping/termops.cmi proofs/tactic_debug.cmi 
+    library/global.cmi proofs/logic.cmi kernel/names.cmi lib/options.cmi \
+    lib/pp.cmi parsing/pptactic.cmi translate/pptacticnew.cmi \
+    parsing/printer.cmi proofs/proof_trees.cmi proofs/tacexpr.cmo \
+    proofs/tacmach.cmi pretyping/termops.cmi proofs/tactic_debug.cmi 
 proofs/tactic_debug.cmx: parsing/ast.cmx interp/constrextern.cmx \
-    kernel/names.cmx lib/pp.cmx parsing/pptactic.cmx parsing/printer.cmx \
-    proofs/proof_trees.cmx proofs/tacexpr.cmx proofs/tacmach.cmx \
-    pretyping/termops.cmx proofs/tactic_debug.cmi 
+    library/global.cmx proofs/logic.cmx kernel/names.cmx lib/options.cmx \
+    lib/pp.cmx parsing/pptactic.cmx translate/pptacticnew.cmx \
+    parsing/printer.cmx proofs/proof_trees.cmx proofs/tacexpr.cmx \
+    proofs/tacmach.cmx pretyping/termops.cmx proofs/tactic_debug.cmi 
 scripts/coqc.cmo: config/coq_config.cmi toplevel/usage.cmi 
 scripts/coqc.cmx: config/coq_config.cmx toplevel/usage.cmx 
 scripts/coqmktop.cmo: config/coq_config.cmi scripts/tolink.cmo 
@@ -2056,10 +2063,11 @@ toplevel/command.cmo: toplevel/class.cmi interp/constrintern.cmi \
     library/nameops.cmi kernel/names.cmi library/nametab.cmi lib/options.cmi \
     proofs/pfedit.cmi lib/pp.cmi pretyping/pretyping.cmi parsing/printer.cmi \
     proofs/proof_type.cmi kernel/reduction.cmi pretyping/retyping.cmi \
-    kernel/safe_typing.cmi library/states.cmi interp/syntax_def.cmi \
-    proofs/tacmach.cmi pretyping/tacred.cmi kernel/term.cmi \
-    pretyping/termops.cmi interp/topconstr.cmi kernel/typeops.cmi \
-    lib/util.cmi toplevel/vernacexpr.cmo toplevel/command.cmi 
+    kernel/safe_typing.cmi library/states.cmi interp/symbols.cmi \
+    interp/syntax_def.cmi proofs/tacmach.cmi pretyping/tacred.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/constrintern.cmx \
     library/decl_kinds.cmx kernel/declarations.cmx library/declare.cmx \
     kernel/entries.cmx kernel/environ.cmx pretyping/evarutil.cmx \
@@ -2070,10 +2078,11 @@ toplevel/command.cmx: toplevel/class.cmx interp/constrintern.cmx \
     library/nameops.cmx kernel/names.cmx library/nametab.cmx lib/options.cmx \
     proofs/pfedit.cmx lib/pp.cmx pretyping/pretyping.cmx parsing/printer.cmx \
     proofs/proof_type.cmx kernel/reduction.cmx pretyping/retyping.cmx \
-    kernel/safe_typing.cmx library/states.cmx interp/syntax_def.cmx \
-    proofs/tacmach.cmx pretyping/tacred.cmx kernel/term.cmx \
-    pretyping/termops.cmx interp/topconstr.cmx kernel/typeops.cmx \
-    lib/util.cmx toplevel/vernacexpr.cmx toplevel/command.cmi 
+    kernel/safe_typing.cmx library/states.cmx interp/symbols.cmx \
+    interp/syntax_def.cmx proofs/tacmach.cmx pretyping/tacred.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 \
@@ -2308,46 +2317,46 @@ translate/ppconstrnew.cmx: parsing/ast.cmx lib/bignat.cmx \
     interp/ppextend.cmx pretyping/rawterm.cmx interp/reserve.cmx \
     interp/symbols.cmx kernel/term.cmx pretyping/termops.cmx \
     interp/topconstr.cmx lib/util.cmx translate/ppconstrnew.cmi 
-translate/pptacticnew.cmo: kernel/closure.cmi lib/dyn.cmi \
-    parsing/egrammar.cmi kernel/environ.cmi parsing/extend.cmi \
-    interp/genarg.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 \
-    pretyping/termops.cmi interp/topconstr.cmi lib/util.cmi \
-    translate/pptacticnew.cmi 
-translate/pptacticnew.cmx: kernel/closure.cmx lib/dyn.cmx \
-    parsing/egrammar.cmx kernel/environ.cmx parsing/extend.cmx \
-    interp/genarg.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 \
-    pretyping/termops.cmx interp/topconstr.cmx lib/util.cmx \
-    translate/pptacticnew.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 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 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 \
     parsing/egrammar.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 \
-    toplevel/metasyntax.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 \
-    interp/reserve.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 
+    library/impargs.cmi library/libnames.cmi toplevel/metasyntax.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 interp/reserve.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 \
     parsing/egrammar.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 \
-    toplevel/metasyntax.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 \
-    interp/reserve.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 
+    library/impargs.cmx library/libnames.cmx toplevel/metasyntax.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 interp/reserve.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 contrib/cc/ccalgo.cmi 
 contrib/cc/ccalgo.cmx: kernel/names.cmx kernel/term.cmx contrib/cc/ccalgo.cmi 
 contrib/cc/ccproof.cmo: contrib/cc/ccalgo.cmi kernel/names.cmi \
@@ -3234,8 +3243,8 @@ contrib/omega/g_omega.cmo: toplevel/cerrors.cmi contrib/omega/coq_omega.cmo \
 contrib/omega/g_omega.cmx: toplevel/cerrors.cmx contrib/omega/coq_omega.cmx \
     parsing/egrammar.cmx parsing/pcoq.cmx lib/pp.cmx parsing/pptactic.cmx \
     proofs/refiner.cmx 
-contrib/omega/omega.cmo: lib/util.cmi 
-contrib/omega/omega.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 parsing/pcoq.cmi lib/pp.cmi parsing/pptactic.cmi \
     contrib/ring/quote.cmo proofs/refiner.cmi 
diff --git a/.depend.coq b/.depend.coq
index 756d90e343..8e9049fad0 100644
--- a/.depend.coq
+++ b/.depend.coq
@@ -64,7 +64,7 @@ theories/Init/LogicSyntax.vo: theories/Init/LogicSyntax.v theories/Init/Notation
 theories/Init/SpecifSyntax.vo: theories/Init/SpecifSyntax.v theories/Init/Notations.vo theories/Init/Datatypes.vo theories/Init/Specif.vo
 theories/Init/Logic_Type.vo: theories/Init/Logic_Type.v theories/Init/Logic.vo theories/Init/LogicSyntax.vo
 theories/Init/Wf.vo: theories/Init/Wf.v theories/Init/Logic.vo theories/Init/LogicSyntax.vo
-theories/Init/Logic_TypeSyntax.vo: theories/Init/Logic_TypeSyntax.v theories/Init/Logic_Type.vo
+theories/Init/Logic_TypeSyntax.vo: theories/Init/Logic_TypeSyntax.v theories/Init/Notations.vo theories/Init/Logic_Type.vo
 theories/Init/Prelude.vo: theories/Init/Prelude.v theories/Init/Notations.vo theories/Init/Datatypes.vo theories/Init/DatatypesSyntax.vo theories/Init/Logic.vo theories/Init/LogicSyntax.vo theories/Init/Specif.vo theories/Init/SpecifSyntax.vo theories/Init/Peano.vo theories/Init/PeanoSyntax.vo theories/Init/Wf.vo
 theories/Logic/Hurkens.vo: theories/Logic/Hurkens.v
 theories/Logic/ProofIrrelevance.vo: theories/Logic/ProofIrrelevance.v theories/Logic/Hurkens.vo