diff --git a/otherlibs/dynlink/dune b/otherlibs/dynlink/dune
index bd31a1411b2..444587cc15f 100644
--- a/otherlibs/dynlink/dune
+++ b/otherlibs/dynlink/dune
@@ -226,128 +226,132 @@
 
 (rule
   (targets dynlink.cma)
-  (deps dynlink_internal.cma)
+  (deps
+    ; Note: Be sure to keep these arguments in dependency order!
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Int_replace_polymorphic_compare.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Binutils.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Local_store.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Build_path_prefix_map.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Config.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Misc.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Warnings.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Arg_helper.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Identifiable.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Numbers.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Profile.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Clflags.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Terminfo.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Location.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ident.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Longident.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Builtin_attributes.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Compilation_unit.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Linkage_name.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Symbol.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Type_immediacy.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Path.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Attr_helper.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Primitive.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Types.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Syntaxerr.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Bytesections.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Cmi_format.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Debuginfo.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Btype.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Consistbl.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Datarepr.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Load_path.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Persistent_env.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Docstrings.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ast_helper.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Predef.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ast_mapper.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Subst.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Env.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Lambda.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Dll.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Instruct.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Meta.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Runtimedef.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Symtable.cmo
+    .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Opcodes.cmo
+    .dynlink_internal.objs/byte/dynlink_types.cmo
+    .dynlink_internal.objs/byte/dynlink_platform_intf.cmo
+    .dynlink_internal.objs/byte/dynlink_common.cmo
+    .dynlink_internal.objs/byte/dynlink.cmo
+  )
   (action
     (run %{ocamlc}
       -g -a
       -ccopt %{read:natdynlinkops}
       -o dynlink.cma
-      ; NOTE: Be sure to keep these arguments in dependency order!
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Int_replace_polymorphic_compare.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Binutils.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Local_store.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Build_path_prefix_map.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Config.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Misc.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Warnings.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Arg_helper.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Identifiable.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Numbers.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Profile.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Clflags.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Terminfo.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Location.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ident.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Longident.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Builtin_attributes.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Compilation_unit.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Linkage_name.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Symbol.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Type_immediacy.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Path.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Attr_helper.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Primitive.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Types.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Syntaxerr.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Bytesections.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Cmi_format.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Debuginfo.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Btype.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Consistbl.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Datarepr.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Load_path.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Persistent_env.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Docstrings.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ast_helper.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Predef.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Ast_mapper.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Subst.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Env.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Lambda.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Dll.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Instruct.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Meta.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Runtimedef.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Symtable.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Opcodes.cmo
-      .dynlink_internal.objs/byte/dynlink_types.cmo
-      .dynlink_internal.objs/byte/dynlink_platform_intf.cmo
-      .dynlink_internal.objs/byte/dynlink_common.cmo
-      .dynlink_internal.objs/byte/dynlink.cmo
+      %{deps}
     )
   )
 )
 
 (rule
   (targets dynlink.cmxa dynlink.a)
-  (deps dynlink_internal.cmxa)
+  (deps
+    ; NOTE: Be sure to keep these arguments in dependency order!
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Int_replace_polymorphic_compare.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Binutils.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Local_store.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Build_path_prefix_map.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Config.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Misc.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Warnings.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Arg_helper.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Identifiable.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Numbers.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Profile.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Clflags.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Terminfo.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Location.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ident.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Longident.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Builtin_attributes.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Compilation_unit.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Linkage_name.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Symbol.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Type_immediacy.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Path.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Attr_helper.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Primitive.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Types.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Syntaxerr.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Bytesections.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Cmi_format.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Debuginfo.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Btype.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Consistbl.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Datarepr.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Load_path.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Persistent_env.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Docstrings.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ast_helper.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Predef.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ast_mapper.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Subst.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Env.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Lambda.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Dll.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Instruct.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Meta.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Runtimedef.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Symtable.cmx
+    .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Opcodes.cmx
+    .dynlink_internal.objs/native/dynlink_types.cmx
+    .dynlink_internal.objs/native/dynlink_platform_intf.cmx
+    .dynlink_internal.objs/native/dynlink_common.cmx
+    .dynlink_internal.objs/native/dynlink.cmx
+  )
   (action
     (run %{ocamlopt}
       -g -a
       -ccopt %{read:natdynlinkops}
       -o dynlink.cmxa
-      ; NOTE: Be sure to keep these arguments in dependency order!
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Int_replace_polymorphic_compare.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Binutils.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Local_store.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Build_path_prefix_map.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Config.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Misc.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Warnings.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Arg_helper.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Identifiable.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Numbers.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Profile.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Clflags.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Terminfo.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Location.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ident.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Longident.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Builtin_attributes.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Compilation_unit.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Linkage_name.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Symbol.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Type_immediacy.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Path.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Attr_helper.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Primitive.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Types.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Syntaxerr.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Bytesections.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Cmi_format.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Debuginfo.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Btype.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Consistbl.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Datarepr.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Load_path.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Persistent_env.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Docstrings.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ast_helper.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Predef.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Ast_mapper.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Subst.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Env.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Lambda.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Dll.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Instruct.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Meta.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Runtimedef.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Symtable.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Opcodes.cmx
-      .dynlink_internal.objs/native/dynlink_types.cmx
-      .dynlink_internal.objs/native/dynlink_platform_intf.cmx
-      .dynlink_internal.objs/native/dynlink_common.cmx
-      .dynlink_internal.objs/native/dynlink.cmx
+      %{deps}
     )
   )
 )
diff --git a/runtime/caml/dune b/runtime/caml/dune
index 703a504497d..830ce097a62 100644
--- a/runtime/caml/dune
+++ b/runtime/caml/dune
@@ -23,7 +23,7 @@
 
 (rule
   (targets opnames.h)
-  (deps instruct.h)
+  (deps instruct.h ../Makefile)
   (action (run make -s -C .. caml/opnames.h)))
 
 (rule
diff --git a/tools/dune b/tools/dune
index b78cd5c6cf8..d25fb6db321 100644
--- a/tools/dune
+++ b/tools/dune
@@ -61,7 +61,10 @@
 (rule
   (targets ocamlmklibconfig.ml)
   (deps
+    ../Makefile.build_config
+    ../Makefile.common
     ../Makefile.config
+    ../Makefile.config_if_required
     ../Makefile
     Makefile
     .depend)