depend

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5728 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

7 files changed, 377 insertions, 203 deletions

diff --git a/.depend b/.depend
index 5b12a5faa..bf99d6fa8 100644
--- a/.depend
+++ b/.depend
@@ -428,8 +428,8 @@ asmcomp/asmlink.cmi: asmcomp/compilenv.cmi
 asmcomp/clambda.cmi: parsing/asttypes.cmi typing/ident.cmi \
     bytecomp/lambda.cmi 
 asmcomp/closure.cmi: asmcomp/clambda.cmi bytecomp/lambda.cmi 
-asmcomp/cmmgen.cmi: asmcomp/clambda.cmi asmcomp/cmm.cmi 
 asmcomp/cmm.cmi: typing/ident.cmi 
+asmcomp/cmmgen.cmi: asmcomp/clambda.cmi asmcomp/cmm.cmi 
 asmcomp/codegen.cmi: asmcomp/cmm.cmi 
 asmcomp/comballoc.cmi: asmcomp/mach.cmi 
 asmcomp/compilenv.cmi: asmcomp/clambda.cmi typing/ident.cmi 
@@ -443,8 +443,8 @@ asmcomp/printlinear.cmi: asmcomp/linearize.cmi
 asmcomp/printmach.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
 asmcomp/proc.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
 asmcomp/reg.cmi: asmcomp/cmm.cmi 
-asmcomp/reloadgen.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
 asmcomp/reload.cmi: asmcomp/mach.cmi 
+asmcomp/reloadgen.cmi: asmcomp/mach.cmi asmcomp/reg.cmi 
 asmcomp/schedgen.cmi: asmcomp/linearize.cmi asmcomp/mach.cmi 
 asmcomp/scheduling.cmi: asmcomp/linearize.cmi 
 asmcomp/selectgen.cmi: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
@@ -452,8 +452,8 @@ asmcomp/selectgen.cmi: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
 asmcomp/selection.cmi: asmcomp/cmm.cmi asmcomp/mach.cmi 
 asmcomp/spill.cmi: asmcomp/mach.cmi 
 asmcomp/split.cmi: asmcomp/mach.cmi 
-asmcomp/arch.cmo: utils/misc.cmi 
-asmcomp/arch.cmx: utils/misc.cmx 
+asmcomp/arch.cmo: utils/config.cmi utils/misc.cmi 
+asmcomp/arch.cmx: utils/config.cmx utils/misc.cmx 
 asmcomp/asmgen.cmo: utils/clflags.cmo asmcomp/closure.cmi asmcomp/cmm.cmi \
     asmcomp/cmmgen.cmi asmcomp/coloring.cmi asmcomp/comballoc.cmi \
     utils/config.cmi asmcomp/emit.cmi asmcomp/emitaux.cmi asmcomp/interf.cmi \
@@ -508,6 +508,8 @@ asmcomp/closure.cmx: parsing/asttypes.cmi asmcomp/clambda.cmx \
     utils/clflags.cmx asmcomp/compilenv.cmx typing/ident.cmx \
     bytecomp/lambda.cmx utils/misc.cmx typing/primitive.cmx \
     bytecomp/switch.cmx utils/tbl.cmx asmcomp/closure.cmi 
+asmcomp/cmm.cmo: asmcomp/arch.cmo typing/ident.cmi asmcomp/cmm.cmi 
+asmcomp/cmm.cmx: asmcomp/arch.cmx typing/ident.cmx asmcomp/cmm.cmi 
 asmcomp/cmmgen.cmo: asmcomp/arch.cmo parsing/asttypes.cmi asmcomp/clambda.cmi \
     utils/clflags.cmo asmcomp/cmm.cmi asmcomp/compilenv.cmi utils/config.cmi \
     typing/ident.cmi bytecomp/lambda.cmi utils/misc.cmi typing/primitive.cmi \
@@ -516,8 +518,6 @@ asmcomp/cmmgen.cmx: asmcomp/arch.cmx parsing/asttypes.cmi asmcomp/clambda.cmx \
     utils/clflags.cmx asmcomp/cmm.cmx asmcomp/compilenv.cmx utils/config.cmx \
     typing/ident.cmx bytecomp/lambda.cmx utils/misc.cmx typing/primitive.cmx \
     asmcomp/proc.cmx bytecomp/switch.cmx typing/types.cmx asmcomp/cmmgen.cmi 
-asmcomp/cmm.cmo: asmcomp/arch.cmo typing/ident.cmi asmcomp/cmm.cmi 
-asmcomp/cmm.cmx: asmcomp/arch.cmx typing/ident.cmx asmcomp/cmm.cmi 
 asmcomp/codegen.cmo: asmcomp/cmm.cmi asmcomp/coloring.cmi asmcomp/emit.cmi \
     asmcomp/interf.cmi asmcomp/linearize.cmi asmcomp/liveness.cmi \
     asmcomp/printcmm.cmi asmcomp/printlinear.cmi asmcomp/printmach.cmi \
@@ -538,16 +538,16 @@ asmcomp/compilenv.cmo: asmcomp/clambda.cmi utils/config.cmi typing/env.cmi \
     typing/ident.cmi utils/misc.cmi asmcomp/compilenv.cmi 
 asmcomp/compilenv.cmx: asmcomp/clambda.cmx utils/config.cmx typing/env.cmx \
     typing/ident.cmx utils/misc.cmx asmcomp/compilenv.cmi 
+asmcomp/emit.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/compilenv.cmi \
+    utils/config.cmi asmcomp/emitaux.cmi asmcomp/linearize.cmi \
+    parsing/location.cmi asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
+    asmcomp/reg.cmi asmcomp/emit.cmi 
+asmcomp/emit.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/compilenv.cmx \
+    utils/config.cmx asmcomp/emitaux.cmx asmcomp/linearize.cmx \
+    parsing/location.cmx asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
+    asmcomp/reg.cmx asmcomp/emit.cmi 
 asmcomp/emitaux.cmo: asmcomp/emitaux.cmi 
 asmcomp/emitaux.cmx: asmcomp/emitaux.cmi 
-asmcomp/emit.cmo: asmcomp/arch.cmo utils/clflags.cmo asmcomp/cmm.cmi \
-    asmcomp/compilenv.cmi utils/config.cmi asmcomp/emitaux.cmi \
-    asmcomp/linearize.cmi parsing/location.cmi asmcomp/mach.cmi \
-    utils/misc.cmi asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/emit.cmi 
-asmcomp/emit.cmx: asmcomp/arch.cmx utils/clflags.cmx asmcomp/cmm.cmx \
-    asmcomp/compilenv.cmx utils/config.cmx asmcomp/emitaux.cmx \
-    asmcomp/linearize.cmx parsing/location.cmx asmcomp/mach.cmx \
-    utils/misc.cmx asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/emit.cmi 
 asmcomp/interf.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
     asmcomp/reg.cmi asmcomp/interf.cmi 
 asmcomp/interf.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
@@ -584,20 +584,20 @@ asmcomp/proc.cmx: asmcomp/arch.cmx utils/ccomp.cmx utils/clflags.cmx \
     asmcomp/reg.cmx asmcomp/proc.cmi 
 asmcomp/reg.cmo: asmcomp/cmm.cmi asmcomp/reg.cmi 
 asmcomp/reg.cmx: asmcomp/cmm.cmx asmcomp/reg.cmi 
+asmcomp/reload.cmo: asmcomp/reloadgen.cmi asmcomp/reload.cmi 
+asmcomp/reload.cmx: asmcomp/reloadgen.cmx asmcomp/reload.cmi 
 asmcomp/reloadgen.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi \
     asmcomp/reloadgen.cmi 
 asmcomp/reloadgen.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx \
     asmcomp/reloadgen.cmi 
-asmcomp/reload.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
-    asmcomp/reg.cmi asmcomp/reloadgen.cmi asmcomp/reload.cmi 
-asmcomp/reload.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
-    asmcomp/reg.cmx asmcomp/reloadgen.cmx asmcomp/reload.cmi 
 asmcomp/schedgen.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/linearize.cmi \
     asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi asmcomp/schedgen.cmi 
 asmcomp/schedgen.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/linearize.cmx \
     asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx asmcomp/schedgen.cmi 
-asmcomp/scheduling.cmo: asmcomp/schedgen.cmi asmcomp/scheduling.cmi 
-asmcomp/scheduling.cmx: asmcomp/schedgen.cmx asmcomp/scheduling.cmi 
+asmcomp/scheduling.cmo: asmcomp/arch.cmo asmcomp/mach.cmi \
+    asmcomp/schedgen.cmi asmcomp/scheduling.cmi 
+asmcomp/scheduling.cmx: asmcomp/arch.cmx asmcomp/mach.cmx \
+    asmcomp/schedgen.cmx asmcomp/scheduling.cmi 
 asmcomp/selectgen.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
     asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi asmcomp/reg.cmi \
     utils/tbl.cmi asmcomp/selectgen.cmi 
@@ -605,10 +605,10 @@ asmcomp/selectgen.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx typing/ident.cmx \
     asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx asmcomp/reg.cmx \
     utils/tbl.cmx asmcomp/selectgen.cmi 
 asmcomp/selection.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
-    utils/misc.cmi asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/selectgen.cmi \
+    utils/misc.cmi asmcomp/reg.cmi asmcomp/selectgen.cmi \
     asmcomp/selection.cmi 
 asmcomp/selection.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
-    utils/misc.cmx asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/selectgen.cmx \
+    utils/misc.cmx asmcomp/reg.cmx asmcomp/selectgen.cmx \
     asmcomp/selection.cmi 
 asmcomp/spill.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
     asmcomp/reg.cmi asmcomp/spill.cmi 
@@ -648,8 +648,6 @@ driver/errors.cmx: bytecomp/bytelibrarian.cmx bytecomp/bytelink.cmx \
     typing/typeclass.cmx typing/typecore.cmx typing/typedecl.cmx \
     typing/typemod.cmx typing/typetexp.cmx utils/warnings.cmx \
     driver/errors.cmi 
-driver/main_args.cmo: driver/main_args.cmi 
-driver/main_args.cmx: driver/main_args.cmi 
 driver/main.cmo: bytecomp/bytelibrarian.cmi bytecomp/bytelink.cmi \
     bytecomp/bytepackager.cmi utils/clflags.cmo driver/compile.cmi \
     utils/config.cmi driver/errors.cmi driver/main_args.cmi utils/misc.cmi \
@@ -658,6 +656,8 @@ driver/main.cmx: bytecomp/bytelibrarian.cmx bytecomp/bytelink.cmx \
     bytecomp/bytepackager.cmx utils/clflags.cmx driver/compile.cmx \
     utils/config.cmx driver/errors.cmx driver/main_args.cmx utils/misc.cmx \
     utils/warnings.cmx driver/main.cmi 
+driver/main_args.cmo: driver/main_args.cmi 
+driver/main_args.cmx: driver/main_args.cmi 
 driver/optcompile.cmo: asmcomp/asmgen.cmi utils/ccomp.cmi utils/clflags.cmo \
     asmcomp/compilenv.cmi utils/config.cmi typing/env.cmi typing/ident.cmi \
     utils/misc.cmi parsing/parse.cmi driver/pparse.cmi parsing/printast.cmi \
diff --git a/lex/.depend b/lex/.depend
index 3ec916f0a..b21bfd936 100644
--- a/lex/.depend
+++ b/lex/.depend
@@ -2,8 +2,8 @@ common.cmi: lexgen.cmi syntax.cmi
 compact.cmi: lexgen.cmi 
 lexer.cmi: parser.cmi 
 lexgen.cmi: syntax.cmi 
-outputbis.cmi: common.cmi lexgen.cmi syntax.cmi 
 output.cmi: common.cmi compact.cmi lexgen.cmi syntax.cmi 
+outputbis.cmi: common.cmi lexgen.cmi syntax.cmi 
 parser.cmi: syntax.cmi 
 syntax.cmi: cset.cmi 
 common.cmo: lexgen.cmi syntax.cmi common.cmi 
@@ -20,10 +20,10 @@ main.cmo: common.cmi compact.cmi lexer.cmi lexgen.cmi output.cmi \
     outputbis.cmi parser.cmi syntax.cmi 
 main.cmx: common.cmx compact.cmx lexer.cmx lexgen.cmx output.cmx \
     outputbis.cmx parser.cmx syntax.cmx 
-outputbis.cmo: common.cmi lexgen.cmi syntax.cmi outputbis.cmi 
-outputbis.cmx: common.cmx lexgen.cmx syntax.cmx outputbis.cmi 
 output.cmo: common.cmi compact.cmi lexgen.cmi syntax.cmi output.cmi 
 output.cmx: common.cmx compact.cmx lexgen.cmx syntax.cmx output.cmi 
+outputbis.cmo: common.cmi lexgen.cmi syntax.cmi outputbis.cmi 
+outputbis.cmx: common.cmx lexgen.cmx syntax.cmx outputbis.cmi 
 parser.cmo: cset.cmi syntax.cmi parser.cmi 
 parser.cmx: cset.cmx syntax.cmx parser.cmi 
 syntax.cmo: cset.cmi syntax.cmi 
diff --git a/ocamldoc/.depend b/ocamldoc/.depend
index ddd3515a5..8af1586b2 100644
--- a/ocamldoc/.depend
+++ b/ocamldoc/.depend
@@ -1,3 +1,11 @@
+odoc.cmo: ../utils/clflags.cmo ../utils/config.cmi ../utils/misc.cmi \
+    odoc_analyse.cmi odoc_args.cmi odoc_crc.cmo odoc_dot.cmo odoc_global.cmi \
+    odoc_html.cmo odoc_info.cmi odoc_latex.cmo odoc_man.cmo odoc_messages.cmo \
+    odoc_texi.cmo ../typing/typedtree.cmi 
+odoc.cmx: ../utils/clflags.cmx ../utils/config.cmx ../utils/misc.cmx \
+    odoc_analyse.cmx odoc_args.cmx odoc_crc.cmx odoc_dot.cmx odoc_global.cmx \
+    odoc_html.cmx odoc_info.cmx odoc_latex.cmx odoc_man.cmx odoc_messages.cmx \
+    odoc_texi.cmx ../typing/typedtree.cmx 
 odoc_analyse.cmo: ../utils/ccomp.cmi ../utils/clflags.cmo ../utils/config.cmi \
     ../typing/ctype.cmi ../typing/env.cmi ../typing/includemod.cmi \
     ../parsing/lexer.cmi ../parsing/location.cmi ../utils/misc.cmi \
@@ -44,14 +52,14 @@ odoc_class.cmo: odoc_name.cmi odoc_parameter.cmo odoc_types.cmi \
     odoc_value.cmo ../typing/types.cmi 
 odoc_class.cmx: odoc_name.cmx odoc_parameter.cmx odoc_types.cmx \
     odoc_value.cmx ../typing/types.cmx 
-odoc_comments_global.cmo: odoc_comments_global.cmi 
-odoc_comments_global.cmx: odoc_comments_global.cmi 
 odoc_comments.cmo: odoc_comments_global.cmi odoc_global.cmi odoc_lexer.cmo \
     odoc_messages.cmo odoc_parser.cmi odoc_see_lexer.cmo odoc_text.cmi \
     odoc_types.cmi odoc_comments.cmi 
 odoc_comments.cmx: odoc_comments_global.cmx odoc_global.cmx odoc_lexer.cmx \
     odoc_messages.cmx odoc_parser.cmx odoc_see_lexer.cmx odoc_text.cmx \
     odoc_types.cmx odoc_comments.cmi 
+odoc_comments_global.cmo: odoc_comments_global.cmi 
+odoc_comments_global.cmx: odoc_comments_global.cmi 
 odoc_cross.cmo: odoc_class.cmo odoc_exception.cmo odoc_messages.cmo \
     odoc_misc.cmi odoc_module.cmo odoc_name.cmi odoc_parameter.cmo \
     odoc_search.cmi odoc_type.cmo odoc_types.cmi odoc_value.cmo \
@@ -118,14 +126,6 @@ odoc_misc.cmx: ../typing/btype.cmx ../typing/ctype.cmx ../typing/ident.cmx \
     ../parsing/longident.cmx odoc_messages.cmx odoc_types.cmx \
     ../typing/path.cmx ../typing/printtyp.cmx ../typing/types.cmx \
     odoc_misc.cmi 
-odoc.cmo: ../utils/clflags.cmo ../utils/config.cmi ../utils/misc.cmi \
-    odoc_analyse.cmi odoc_args.cmi odoc_crc.cmo odoc_dot.cmo odoc_global.cmi \
-    odoc_html.cmo odoc_info.cmi odoc_latex.cmo odoc_man.cmo odoc_messages.cmo \
-    odoc_texi.cmo ../typing/typedtree.cmi 
-odoc.cmx: ../utils/clflags.cmx ../utils/config.cmx ../utils/misc.cmx \
-    odoc_analyse.cmx odoc_args.cmx odoc_crc.cmx odoc_dot.cmx odoc_global.cmx \
-    odoc_html.cmx odoc_info.cmx odoc_latex.cmx odoc_man.cmx odoc_messages.cmx \
-    odoc_texi.cmx ../typing/typedtree.cmx 
 odoc_module.cmo: odoc_class.cmo odoc_exception.cmo odoc_name.cmi \
     odoc_parameter.cmo odoc_type.cmo odoc_types.cmi odoc_value.cmo \
     ../typing/types.cmi 
@@ -180,10 +180,10 @@ odoc_str.cmx: odoc_exception.cmx odoc_messages.cmx odoc_misc.cmx \
     odoc_name.cmx odoc_type.cmx odoc_value.cmx odoc_str.cmi 
 odoc_texi.cmo: odoc_info.cmi odoc_messages.cmo odoc_to_text.cmo 
 odoc_texi.cmx: odoc_info.cmx odoc_messages.cmx odoc_to_text.cmx 
-odoc_text_lexer.cmo: odoc_text_parser.cmi 
-odoc_text_lexer.cmx: odoc_text_parser.cmx 
 odoc_text.cmo: odoc_text_lexer.cmo odoc_text_parser.cmi odoc_text.cmi 
 odoc_text.cmx: odoc_text_lexer.cmx odoc_text_parser.cmx odoc_text.cmi 
+odoc_text_lexer.cmo: odoc_text_parser.cmi 
+odoc_text_lexer.cmx: odoc_text_parser.cmx 
 odoc_text_parser.cmo: odoc_types.cmi odoc_text_parser.cmi 
 odoc_text_parser.cmx: odoc_types.cmx odoc_text_parser.cmi 
 odoc_to_text.cmo: odoc_info.cmi odoc_messages.cmo 
diff --git a/otherlibs/graph/.depend b/otherlibs/graph/.depend
index cfd5a8eff..70ab5db6f 100644
--- a/otherlibs/graph/.depend
+++ b/otherlibs/graph/.depend
@@ -1,23 +1,74 @@
-color.o: color.c libgraph.h ../../config/s.h ../../byterun/misc.h
-draw.o: draw.c libgraph.h ../../config/s.h ../../byterun/misc.h
-dump_img.o: dump_img.c libgraph.h ../../config/s.h ../../byterun/misc.h \
-  image.h ../../byterun/gc.h ../../byterun/major_gc.h \
+color.o: color.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h /usr/X11R6/include/X11/Xatom.h
+draw.o: draw.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h
+dump_img.o: dump_img.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h image.h ../../byterun/alloc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
   ../../byterun/freelist.h ../../byterun/minor_gc.h
-events.o: events.c libgraph.h ../../config/s.h ../../byterun/misc.h
-fill.o: fill.c libgraph.h ../../config/s.h ../../byterun/misc.h \
+events.o: events.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+  ../../byterun/signals.h
+fill.o: fill.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
   ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h
-image.o: image.c libgraph.h ../../config/s.h ../../byterun/misc.h image.h
-make_img.o: make_img.c libgraph.h ../../config/s.h ../../byterun/misc.h \
-  image.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h
-open.o: open.c libgraph.h ../../config/s.h ../../byterun/misc.h \
+image.o: image.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h image.h ../../byterun/alloc.h \
+  ../../byterun/custom.h
+make_img.o: make_img.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h image.h ../../byterun/memory.h \
+  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h
+open.o: open.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+  ../../byterun/callback.h ../../byterun/fail.h ../../byterun/memory.h \
   ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h
-point_col.o: point_col.c libgraph.h ../../config/s.h ../../byterun/misc.h
-sound.o: sound.c libgraph.h ../../config/s.h ../../byterun/misc.h
-subwindow.o: subwindow.c libgraph.h ../../config/s.h ../../byterun/misc.h
-text.o: text.c libgraph.h ../../config/s.h ../../byterun/misc.h
+point_col.o: point_col.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h
+sound.o: sound.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h
+subwindow.o: subwindow.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h
+text.o: text.c libgraph.h /usr/X11R6/include/X11/Xlib.h \
+  /usr/X11R6/include/X11/X.h /usr/X11R6/include/X11/Xfuncproto.h \
+  /usr/X11R6/include/X11/Xosdefs.h /usr/X11R6/include/X11/Xutil.h \
+  ../../byterun/mlvalues.h ../../byterun/config.h ../../config/m.h \
+  ../../config/s.h ../../byterun/misc.h ../../byterun/alloc.h
 graphics.cmo: graphics.cmi 
 graphics.cmx: graphics.cmi 
 graphicsX11.cmo: graphics.cmi graphicsX11.cmi 
diff --git a/otherlibs/str/.depend b/otherlibs/str/.depend
index 70671c2f8..c93656bae 100644
--- a/otherlibs/str/.depend
+++ b/otherlibs/str/.depend
@@ -1,5 +1,7 @@
-strstubs.o: strstubs.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h
+strstubs.o: strstubs.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/fail.h
 str.cmo: str.cmi 
 str.cmx: str.cmi 
diff --git a/otherlibs/unix/.depend b/otherlibs/unix/.depend
index 781fd1fdf..cb4704c71 100644
--- a/otherlibs/unix/.depend
+++ b/otherlibs/unix/.depend
@@ -1,162 +1,283 @@
-accept.o: accept.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h socketaddr.h
-access.o: access.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-addrofstr.o: addrofstr.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h socketaddr.h
-alarm.o: alarm.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-bind.o: bind.c ../../config/s.h ../../byterun/misc.h unixsupport.h \
+accept.o: accept.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
   socketaddr.h
-chdir.o: chdir.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-chmod.o: chmod.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-chown.o: chown.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-chroot.o: chroot.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-close.o: close.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-closedir.o: closedir.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-connect.o: connect.c ../../config/s.h ../../byterun/misc.h unixsupport.h \
+access.o: access.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+addrofstr.o: addrofstr.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/fail.h unixsupport.h socketaddr.h
+alarm.o: alarm.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+bind.o: bind.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h \
   socketaddr.h
-cst2constr.o: cst2constr.c ../../config/s.h ../../byterun/misc.h \
-  cst2constr.h
-cstringv.o: cstringv.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-dup2.o: dup2.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-dup.o: dup.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-envir.o: envir.c ../../config/s.h ../../byterun/misc.h
-errmsg.o: errmsg.c ../../config/s.h ../../byterun/misc.h
-execv.o: execv.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-execve.o: execve.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-execvp.o: execvp.c ../../config/s.h ../../byterun/misc.h \
+chdir.o: chdir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+chmod.o: chmod.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+chown.o: chown.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+chroot.o: chroot.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+close.o: close.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+closedir.o: closedir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+connect.o: connect.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/signals.h unixsupport.h socketaddr.h
+cst2constr.o: cst2constr.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/fail.h cst2constr.h
+cstringv.o: cstringv.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+dup.o: dup.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+dup2.o: dup2.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+envir.o: envir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h
+errmsg.o: errmsg.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h
+execv.o: execv.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+execve.o: execve.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+execvp.o: execvp.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+exit.o: exit.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+fchmod.o: fchmod.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+fchown.o: fchown.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+fcntl.o: fcntl.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+fork.o: fork.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+ftruncate.o: ftruncate.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/io.h unixsupport.h
+getcwd.o: getcwd.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+getegid.o: getegid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+geteuid.o: geteuid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+getgid.o: getgid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+getgr.o: getgr.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/fail.h ../../byterun/alloc.h ../../byterun/memory.h \
   ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h unixsupport.h
-exit.o: exit.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-fchmod.o: fchmod.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-fchown.o: fchown.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-fcntl.o: fcntl.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-fork.o: fork.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-ftruncate.o: ftruncate.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-getcwd.o: getcwd.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-getegid.o: getegid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-geteuid.o: geteuid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-getgid.o: getgid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-getgr.o: getgr.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+getgroups.o: getgroups.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+gethost.o: gethost.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-getgroups.o: getgroups.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-gethost.o: gethost.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h socketaddr.h
-gethostname.o: gethostname.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-getlogin.o: getlogin.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-getpeername.o: getpeername.c ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/minor_gc.h ../../byterun/fail.h ../../byterun/signals.h \
   unixsupport.h socketaddr.h
-getpid.o: getpid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-getppid.o: getppid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-getproto.o: getproto.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-getpw.o: getpw.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+gethostname.o: gethostname.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
+getlogin.o: getlogin.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+getpeername.o: getpeername.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h unixsupport.h socketaddr.h
+getpid.o: getpid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+getppid.o: getppid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+getproto.o: getproto.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h
+getpw.o: getpw.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h
+getserv.o: getserv.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h
+getsockname.o: getsockname.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h unixsupport.h socketaddr.h
+gettimeofday.o: gettimeofday.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
+getuid.o: getuid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+gmtime.o: gmtime.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h unixsupport.h
-getserv.o: getserv.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-getsockname.o: getsockname.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h socketaddr.h
-gettimeofday.o: gettimeofday.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-getuid.o: getuid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-gmtime.o: gmtime.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-itimer.o: itimer.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-kill.o: kill.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-link.o: link.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-listen.o: listen.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-lockf.o: lockf.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-lseek.o: lseek.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-mkdir.o: mkdir.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-mkfifo.o: mkfifo.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-nice.o: nice.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-open.o: open.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+itimer.o: itimer.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h unixsupport.h
-opendir.o: opendir.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-pipe.o: pipe.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-putenv.o: putenv.c ../../config/s.h ../../byterun/gc.h \
+kill.o: kill.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/fail.h unixsupport.h ../../byterun/signals.h
+link.o: link.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+listen.o: listen.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+lockf.o: lockf.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+lseek.o: lseek.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/io.h unixsupport.h
+mkdir.o: mkdir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+mkfifo.o: mkfifo.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+nice.o: nice.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+open.o: open.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
+  ../../byterun/major_gc.h ../../byterun/freelist.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+opendir.o: opendir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+pipe.o: pipe.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+putenv.o: putenv.c ../../byterun/memory.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/gc.h \
   ../../byterun/mlvalues.h ../../byterun/misc.h ../../byterun/major_gc.h \
   ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
-read.o: read.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+read.o: read.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/signals.h unixsupport.h
+readdir.o: readdir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/fail.h ../../byterun/alloc.h unixsupport.h
+readlink.o: readlink.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+rename.o: rename.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+rewinddir.o: rewinddir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+rmdir.o: rmdir.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+select.o: select.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-readdir.o: readdir.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-readlink.o: readlink.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-rename.o: rename.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-rewinddir.o: rewinddir.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-rmdir.o: rmdir.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-select.o: select.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-sendrecv.o: sendrecv.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h socketaddr.h
-setgid.o: setgid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-setsid.o: setsid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-setuid.o: setuid.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-shutdown.o: shutdown.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-signals.o: signals.c ../../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-sleep.o: sleep.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-socketaddr.o: socketaddr.c ../../config/s.h ../../byterun/misc.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h socketaddr.h
-socket.o: socket.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-socketpair.o: socketpair.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-sockopt.o: sockopt.c ../../config/s.h ../../byterun/misc.h unixsupport.h \
-  socketaddr.h
-stat.o: stat.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+sendrecv.o: sendrecv.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h cst2constr.h
-strofaddr.o: strofaddr.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h socketaddr.h
-symlink.o: symlink.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-termios.o: termios.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-time.o: time.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-times.o: times.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+  socketaddr.h
+setgid.o: setgid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+setsid.o: setsid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+setuid.o: setuid.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+shutdown.o: shutdown.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+signals.o: signals.c ../../byterun/alloc.h ../../byterun/misc.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
-truncate.o: truncate.c ../../config/s.h ../../byterun/misc.h \
-  unixsupport.h
-umask.o: umask.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-unixsupport.o: unixsupport.c ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+sleep.o: sleep.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/signals.h unixsupport.h
+socket.o: socket.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+socketaddr.o: socketaddr.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/memory.h \
   ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h cst2constr.h
-unlink.o: unlink.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-utimes.o: utimes.c ../../config/s.h ../../byterun/misc.h unixsupport.h
-wait.o: wait.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+  ../../byterun/minor_gc.h unixsupport.h socketaddr.h
+socketpair.o: socketpair.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h unixsupport.h
+sockopt.o: sockopt.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h socketaddr.h
+stat.o: stat.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/alloc.h \
+  unixsupport.h cst2constr.h ../../byterun/io.h
+strofaddr.o: strofaddr.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h socketaddr.h
+symlink.o: symlink.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+termios.o: termios.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+time.o: time.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h unixsupport.h
+times.o: times.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
   ../../byterun/minor_gc.h unixsupport.h
-write.o: write.c ../../config/s.h ../../byterun/misc.h ../../byterun/gc.h \
+truncate.o: truncate.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/io.h unixsupport.h
+umask.o: umask.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+unixsupport.o: unixsupport.c ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../config/m.h ../../config/s.h \
+  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/callback.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/fail.h \
+  unixsupport.h cst2constr.h
+unlink.o: unlink.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+utimes.o: utimes.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h unixsupport.h
+wait.o: wait.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/alloc.h ../../byterun/memory.h ../../byterun/gc.h \
   ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+write.o: write.c ../../byterun/mlvalues.h ../../byterun/config.h \
+  ../../config/m.h ../../config/s.h ../../byterun/misc.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/signals.h unixsupport.h
 unixLabels.cmi: unix.cmi 
-unixLabels.cmo: unix.cmi unixLabels.cmi 
-unixLabels.cmx: unix.cmx unixLabels.cmi 
 unix.cmo: unix.cmi 
 unix.cmx: unix.cmi 
+unixLabels.cmo: unix.cmi unixLabels.cmi 
+unixLabels.cmx: unix.cmx unixLabels.cmi 
diff --git a/stdlib/.depend b/stdlib/.depend
index bc6566560..c19afaa8d 100644
--- a/stdlib/.depend
+++ b/stdlib/.depend
@@ -8,10 +8,10 @@ random.cmi: int32.cmi int64.cmi nativeint.cmi
 weak.cmi: hashtbl.cmi 
 arg.cmo: array.cmi buffer.cmi list.cmi printf.cmi string.cmi sys.cmi arg.cmi 
 arg.cmx: array.cmx buffer.cmx list.cmx printf.cmx string.cmx sys.cmx arg.cmi 
-arrayLabels.cmo: array.cmi arrayLabels.cmi 
-arrayLabels.cmx: array.cmx arrayLabels.cmi 
 array.cmo: array.cmi 
 array.cmx: array.cmi 
+arrayLabels.cmo: array.cmi arrayLabels.cmi 
+arrayLabels.cmx: array.cmx arrayLabels.cmi 
 buffer.cmo: string.cmi sys.cmi buffer.cmi 
 buffer.cmx: string.cmx sys.cmx buffer.cmi 
 callback.cmo: obj.cmi callback.cmi 
@@ -46,10 +46,10 @@ lazy.cmo: obj.cmi lazy.cmi
 lazy.cmx: obj.cmx lazy.cmi 
 lexing.cmo: array.cmi string.cmi sys.cmi lexing.cmi 
 lexing.cmx: array.cmx string.cmx sys.cmx lexing.cmi 
-listLabels.cmo: list.cmi listLabels.cmi 
-listLabels.cmx: list.cmx listLabels.cmi 
 list.cmo: list.cmi 
 list.cmx: list.cmi 
+listLabels.cmo: list.cmi listLabels.cmi 
+listLabels.cmx: list.cmx listLabels.cmi 
 map.cmo: map.cmi 
 map.cmx: map.cmi 
 marshal.cmo: string.cmi marshal.cmi 
@@ -90,10 +90,10 @@ stdLabels.cmo: arrayLabels.cmi listLabels.cmi stringLabels.cmi stdLabels.cmi
 stdLabels.cmx: arrayLabels.cmx listLabels.cmx stringLabels.cmx stdLabels.cmi 
 stream.cmo: list.cmi obj.cmi string.cmi stream.cmi 
 stream.cmx: list.cmx obj.cmx string.cmx stream.cmi 
-stringLabels.cmo: string.cmi stringLabels.cmi 
-stringLabels.cmx: string.cmx stringLabels.cmi 
 string.cmo: char.cmi list.cmi pervasives.cmi string.cmi 
 string.cmx: char.cmx list.cmx pervasives.cmx string.cmi 
+stringLabels.cmo: string.cmi stringLabels.cmi 
+stringLabels.cmx: string.cmx stringLabels.cmi 
 sys.cmo: sys.cmi 
 sys.cmx: sys.cmi 
 weak.cmo: array.cmi hashtbl.cmi obj.cmi sys.cmi weak.cmi