diff --git a/.gitignore b/.gitignore
index 5cec38960f9f..0493fcfd49d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ META
 /config.log
 /config.status
 /configure~
+/runtime/caml/config.h.in~
 /flexlink.opt
 /libtool
 /ocamlc.opt
diff --git a/aclocal.m4 b/aclocal.m4
index 75d27a0b66eb..fc1aeb7865db 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -88,7 +88,7 @@ AC_DEFUN([OCAML_SIGNAL_HANDLERS_SEMANTICS], [
   AC_CHECK_FUNC([sigaction], [has_sigaction=true], [has_sigaction=false])
   AC_CHECK_FUNC([sigprocmask], [has_sigprocmask=true], [has_sigprocmask=false])
   AS_IF([$has_sigaction && $has_sigprocmask],
-    [AC_DEFINE([POSIX_SIGNALS], [1])
+    [AC_DEFINE([POSIX_SIGNALS], [1], [TODO])
       AC_MSG_NOTICE([POSIX signal handling found.])],
     [AC_MSG_NOTICE([assuming signals have the System V semantics.])
     ]
@@ -112,7 +112,7 @@ AC_DEFUN([OCAML_CC_SUPPORTS_TREE_VECTORIZE], [
     ])
   ])
   AS_IF([test "x$ocaml_cv_prog_cc_tree_vectorize" = xyes],
-    [AC_DEFINE([SUPPORTS_TREE_VECTORIZE], [1])])
+    [AC_DEFINE([SUPPORTS_TREE_VECTORIZE], [1], [TODO])])
 ])
 
 # Save C compiler related variables
@@ -217,7 +217,7 @@ camlPervasives__loop_1128:
   AS_CASE([$ocaml_cv_prog_as_cfi_directives],
     [yes],
       [asm_cfi_supported=true
-      AC_DEFINE([ASM_CFI_SUPPORTED], [1])],
+      AC_DEFINE([ASM_CFI_SUPPORTED], [1], [TODO])],
     [no|disabled], [asm_cfi_supported=false],
     [AC_MSG_ERROR([exiting])])
 ])
@@ -284,8 +284,8 @@ AC_DEFUN([OCAML_MMAP_SUPPORTS_HUGE_PAGES], [
       [ocaml_cv_func_mmap_huge_pages=no],
       [ocaml_cv_func_mmap_huge_pages='no assumed'])])
   AS_IF([test "x$ocaml_cv_prog_cc_func_mmap_huge_pages" = xyes],
-    [AC_DEFINE([HAS_HUGE_PAGES], [1])
-    AC_DEFINE_UNQUOTED([HUGE_PAGE_SIZE], [(4 * 1024 * 1024)])])
+    [AC_DEFINE([HAS_HUGE_PAGES], [1], [TODO])
+    AC_DEFINE_UNQUOTED([HUGE_PAGE_SIZE], [(4 * 1024 * 1024)], [TODO])])
 ])
 
 AC_DEFUN([OCAML_CHECK_LIBUNWIND], [
@@ -294,7 +294,7 @@ AC_DEFUN([OCAML_CHECK_LIBUNWIND], [
   CPPFLAGS="$CPPFLAGS $libunwind_cppflags"
   LDFLAGS="$LDFLAGS $libunwind_ldflags"
   AC_CHECK_HEADER([libunwind.h],
-    [AC_DEFINE([HAS_LIBUNWIND], [1])
+    [AC_DEFINE([HAS_LIBUNWIND], [1], [TODO])
     libunwind_available=true],
     [libunwind_available=false])
   LDFLAGS="$SAVED_LDFLAGS"
diff --git a/configure b/configure
index 90d8e9f1f263..6eb6405c9cfc 100755
--- a/configure
+++ b/configure
@@ -3414,14 +3414,18 @@ OCAML_VERSION_EXTRA=dev0-2024-08-25
 
 OCAML_VERSION_SHORT=5.4
 
+
 printf "%s\n" "#define MAGIC_NUMBER_PREFIX \"Caml1999\"" >>confdefs.h
 
+
 printf "%s\n" "#define MAGIC_NUMBER_VERSION \"035\"" >>confdefs.h
 
+
 printf "%s\n" "#define EXEC_MAGIC_LENGTH 12" >>confdefs.h
 
 MAGIC_LENGTH=12
 
+
 printf "%s\n" "#define EXEC_FORMAT \"X\"" >>confdefs.h
 
 EXEC_MAGIC_NUMBER=Caml1999X035
@@ -3606,11 +3610,11 @@ ac_config_files="$ac_config_files utils/config.common.ml"
 
 ac_config_files="$ac_config_files utils/config.generated.ml"
 
-ac_config_headers="$ac_config_headers runtime/caml/exec.h"
+ac_config_headers="$ac_config_headers runtime/caml/config.h"
+
 
-ac_config_headers="$ac_config_headers runtime/caml/m.h"
 
-ac_config_headers="$ac_config_headers runtime/caml/s.h"
+ac_config_headers="$ac_config_headers runtime/caml/exec.h"
 
 ac_config_headers="$ac_config_headers runtime/caml/version.h"
 
@@ -3624,18 +3628,25 @@ ac_config_files="$ac_config_files stdlib/META"
 
 
 # Definitions related to the version of OCaml
+
 printf "%s\n" "#define OCAML_VERSION_MAJOR 5" >>confdefs.h
 
+
 printf "%s\n" "#define OCAML_VERSION_MINOR 4" >>confdefs.h
 
+
 printf "%s\n" "#define OCAML_VERSION_PATCHLEVEL 0" >>confdefs.h
 
+
 printf "%s\n" "#define OCAML_VERSION_ADDITIONAL \"dev0-2024-08-25\"" >>confdefs.h
 
-  printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev0-2024-08-25\"" >>confdefs.h
+
+printf "%s\n" "#define OCAML_VERSION_EXTRA \"dev0-2024-08-25\"" >>confdefs.h
+
 
 printf "%s\n" "#define OCAML_VERSION 50400" >>confdefs.h
 
+
 printf "%s\n" "#define OCAML_VERSION_STRING \"5.4.0+dev0-2024-08-25\"" >>confdefs.h
 
 
@@ -17282,7 +17293,8 @@ then :
 elif test "x$ac_cv_sizeof_long_p" = "x8"
 then :
   bits=64; arch64=true
-    printf "%s\n" "#define ARCH_SIXTYFOUR 1" >>confdefs.h
+
+printf "%s\n" "#define ARCH_SIXTYFOUR 1" >>confdefs.h
 
 else $as_nop
   as_fn_error $? "Neither 32 nor 64 bits architecture." "$LINENO" 5
@@ -17647,7 +17659,8 @@ then :
     if test "$ac_cv_alignof_double" -gt 4
 then :
   align_double=true
-       printf "%s\n" "#define ARCH_ALIGN_DOUBLE 1" >>confdefs.h
+
+printf "%s\n" "#define ARCH_ALIGN_DOUBLE 1" >>confdefs.h
 
 fi
      if test "x$ac_cv_sizeof_long" = "x8" &&
@@ -17663,7 +17676,8 @@ fi
 fi
       if $align_int64
 then :
-  printf "%s\n" "#define ARCH_ALIGN_INT64 1" >>confdefs.h
+
+printf "%s\n" "#define ARCH_ALIGN_INT64 1" >>confdefs.h
 
 fi
      ;;
@@ -17799,7 +17813,8 @@ case $target in #(
   *-apple-darwin*|*-mingw32*|*-pc-windows) :
      ;; #(
   *) :
-    printf "%s\n" "#define HAS_FULL_THREAD_VARIABLES 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_FULL_THREAD_VARIABLES 1" >>confdefs.h
 
  ;;
 esac
@@ -18290,6 +18305,7 @@ case $enable_native_toplevel,$natdynlink in #(
     install_ocamlnat=false ;;
 esac
 
+
 printf "%s\n" "#define OCAML_OS_TYPE \"$ostype\"" >>confdefs.h
 
 target_os_type="$ostype"
@@ -18611,7 +18627,8 @@ esac
 if test "$with_pic"
 then :
   fpic=true
-  printf "%s\n" "#define CAML_WITH_FPIC 1" >>confdefs.h
+
+printf "%s\n" "#define CAML_WITH_FPIC 1" >>confdefs.h
 
   internal_cflags="$internal_cflags $sharedlib_cflags"
   default_aspp="$default_aspp $sharedlib_cflags"
@@ -18754,7 +18771,8 @@ fi
 
   if $has_sigaction && $has_sigprocmask
 then :
-  printf "%s\n" "#define POSIX_SIGNALS 1" >>confdefs.h
+
+printf "%s\n" "#define POSIX_SIGNALS 1" >>confdefs.h
 
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: POSIX signal handling found." >&5
 printf "%s\n" "$as_me: POSIX signal handling found." >&6;}
@@ -18788,7 +18806,8 @@ done
 
 if $has_c99_float_ops
 then :
-  printf "%s\n" "#define HAS_C99_FLOAT_OPS 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_C99_FLOAT_OPS 1" >>confdefs.h
 
   # Check whether round works (known bug in mingw-w64)
 
@@ -19007,7 +19026,8 @@ then :
   printf "%s\n" "#define HAVE_CLOCK_GETTIME_NSEC_NP 1" >>confdefs.h
 
         has_monotonic_clock=true
-        printf "%s\n" "#define HAS_CLOCK_GETTIME_NSEC_NP 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_CLOCK_GETTIME_NSEC_NP 1" >>confdefs.h
 
 
 else $as_nop
@@ -19038,7 +19058,8 @@ if ac_fn_c_try_cpp "$LINENO"
 then :
 
       has_monotonic_clock=true
-      printf "%s\n" "#define HAS_POSIX_MONOTONIC_CLOCK 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_POSIX_MONOTONIC_CLOCK 1" >>confdefs.h
 
 
 else $as_nop
@@ -19406,7 +19427,8 @@ fi
   ac_fn_c_check_header_compile "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default"
 if test "x$ac_cv_header_libunwind_h" = xyes
 then :
-  printf "%s\n" "#define HAS_LIBUNWIND 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_LIBUNWIND 1" >>confdefs.h
 
     libunwind_available=true
 else $as_nop
@@ -19891,7 +19913,8 @@ fi
 # of HAS_UTIME on Windows but this will probably need to be clarified
 case $target in #(
   *-*-mingw32*|*-pc-windows) :
-    printf "%s\n" "#define HAS_UTIME 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_UTIME 1" >>confdefs.h
  ;; #(
   *) :
     ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
@@ -19903,7 +19926,8 @@ then :
   ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime"
 if test "x$ac_cv_func_utime" = xyes
 then :
-  printf "%s\n" "#define HAS_UTIME 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_UTIME 1" >>confdefs.h
 
 fi
 
@@ -19919,7 +19943,8 @@ then :
   ac_fn_c_check_func "$LINENO" "fchown" "ac_cv_func_fchown"
 if test "x$ac_cv_func_fchown" = xyes
 then :
-  printf "%s\n" "#define HAS_FCHMOD 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_FCHMOD 1" >>confdefs.h
 
 fi
 
@@ -19932,7 +19957,8 @@ then :
   ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
 if test "x$ac_cv_func_ftruncate" = xyes
 then :
-  printf "%s\n" "#define HAS_TRUNCATE 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_TRUNCATE 1" >>confdefs.h
 
 fi
 
@@ -19950,7 +19976,8 @@ then :
 "
 if test "x$ac_cv_type_fd_set" = xyes
 then :
-  printf "%s\n" "#define HAS_SELECT 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_SELECT 1" >>confdefs.h
 
 fi
 
@@ -19966,7 +19993,8 @@ then :
   ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat"
 if test "x$ac_cv_func_lstat" = xyes
 then :
-  printf "%s\n" "#define HAS_SYMLINK 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_SYMLINK 1" >>confdefs.h
 
 fi
 
@@ -19995,7 +20023,8 @@ then :
   ac_fn_c_check_func "$LINENO" "tcflow" "ac_cv_func_tcflow"
 if test "x$ac_cv_func_tcflow" = xyes
 then :
-  printf "%s\n" "#define HAS_TERMIOS 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_TERMIOS 1" >>confdefs.h
 
 fi
 
@@ -20015,7 +20044,8 @@ fi
 # (should be debugged later)
 case $target in #(
   *-*-mingw32*|*-pc-windows) :
-    printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+
+printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
  ;; #(
   *) :
     ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
@@ -20065,7 +20095,8 @@ then :
   ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
 if test "x$ac_cv_func_unsetenv" = xyes
 then :
-  printf "%s\n" "#define HAS_SETENV_UNSETENV 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_SETENV_UNSETENV 1" >>confdefs.h
 
 fi
 
@@ -20077,7 +20108,8 @@ fi
 # (should be debugged later)
 case $target in #(
   *-pc-windows) :
-    printf "%s\n" "#define HAS_LOCALE_H 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_LOCALE_H 1" >>confdefs.h
  ;; #(
   *) :
     ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
@@ -20092,7 +20124,8 @@ then :
   ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale"
 if test "x$ac_cv_func_uselocale" = xyes
 then :
-  printf "%s\n" "#define HAS_LOCALE_H 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_LOCALE_H 1" >>confdefs.h
 
 fi
 
@@ -20116,7 +20149,8 @@ then :
   ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale"
 if test "x$ac_cv_func_uselocale" = xyes
 then :
-  printf "%s\n" "#define HAS_XLOCALE_H 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_XLOCALE_H 1" >>confdefs.h
 
 fi
 
@@ -20132,7 +20166,8 @@ fi
 # (should be debugged later)
 case $target in #(
   *-pc-windows) :
-    printf "%s\n" "#define HAVE_STRTOD_L 1" >>confdefs.h
+
+printf "%s\n" "#define HAVE_STRTOD_L 1" >>confdefs.h
  ;; #(
   *) :
     ac_fn_c_check_func "$LINENO" "strtod_l" "ac_cv_func_strtod_l"
@@ -20209,7 +20244,8 @@ if $supports_shared_libraries
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Dynamic loading of shared libraries is supported." >&5
 printf "%s\n" "$as_me: Dynamic loading of shared libraries is supported." >&6;}
-  printf "%s\n" "#define SUPPORT_DYNAMIC_LINKING 1" >>confdefs.h
+
+printf "%s\n" "#define SUPPORT_DYNAMIC_LINKING 1" >>confdefs.h
 
 else $as_nop
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Dynamic loading of shared libraries is not supported." >&5
@@ -20227,7 +20263,8 @@ then :
   ac_fn_c_check_func "$LINENO" "munmap" "ac_cv_func_munmap"
 if test "x$ac_cv_func_munmap" = xyes
 then :
-  printf "%s\n" "#define HAS_MMAP 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_MMAP 1" >>confdefs.h
 
 fi
 
@@ -20548,10 +20585,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 case $ac_cv_func_which_gethostbyname_r in #(
   six) :
-    printf "%s\n" "#define HAS_GETHOSTBYNAME_R 6" >>confdefs.h
+
+printf "%s\n" "#define HAS_GETHOSTBYNAME_R 6" >>confdefs.h
  ;; #(
   five) :
-    printf "%s\n" "#define HAS_GETHOSTBYNAME_R 5" >>confdefs.h
+
+printf "%s\n" "#define HAS_GETHOSTBYNAME_R 5" >>confdefs.h
  ;; #(
   three) :
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCaml does not support this variant" >&5
@@ -20736,10 +20775,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 case $ac_cv_func_which_gethostbyaddr_r in #(
   eight) :
-    printf "%s\n" "#define HAS_GETHOSTBYADDR_R 8" >>confdefs.h
+
+printf "%s\n" "#define HAS_GETHOSTBYADDR_R 8" >>confdefs.h
  ;; #(
   seven) :
-    printf "%s\n" "#define HAS_GETHOSTBYADDR_R 7" >>confdefs.h
+
+printf "%s\n" "#define HAS_GETHOSTBYADDR_R 7" >>confdefs.h
  ;; #(
   *) :
      ;;
@@ -20774,7 +20815,8 @@ then :
   ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp"
 if test "x$ac_cv_func_posix_spawnp" = xyes
 then :
-  printf "%s\n" "#define HAS_POSIX_SPAWN 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_POSIX_SPAWN 1" >>confdefs.h
 
 fi
 
@@ -21242,7 +21284,8 @@ then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: compressed compilation artefacts supported" >&5
 printf "%s\n" "$as_me: compressed compilation artefacts supported" >&6;}
    internal_cppflags="$internal_cppflags $zstd_flags"
-   printf "%s\n" "#define HAS_ZSTD 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_ZSTD 1" >>confdefs.h
 
 else $as_nop
   case "$with_zstd" in #(
@@ -22134,7 +22177,8 @@ if ac_fn_c_try_link "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
 printf "%s\n" "GNU" >&6; }
-  printf "%s\n" "#define HAS_GNU_GETAFFINITY_NP 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_GNU_GETAFFINITY_NP 1" >>confdefs.h
 
 else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22158,7 +22202,8 @@ if ac_fn_c_try_link "$LINENO"
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: BSD" >&5
 printf "%s\n" "BSD" >&6; }
-    printf "%s\n" "#define HAS_BSD_GETAFFINITY_NP 1" >>confdefs.h
+
+printf "%s\n" "#define HAS_BSD_GETAFFINITY_NP 1" >>confdefs.h
 
 else $as_nop
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: pthread_getaffinity_np not found" >&5
@@ -22392,7 +22437,8 @@ printf "%s\n" "$ocaml_cv_prog_as_cfi_directives" >&6; }
   case $ocaml_cv_prog_as_cfi_directives in #(
   yes) :
     asm_cfi_supported=true
-      printf "%s\n" "#define ASM_CFI_SUPPORTED 1" >>confdefs.h
+
+printf "%s\n" "#define ASM_CFI_SUPPORTED 1" >>confdefs.h
  ;; #(
   no|disabled) :
     asm_cfi_supported=false ;; #(
@@ -22413,7 +22459,8 @@ then :
   clang-*|gcc-*) :
     common_cflags="$common_cflags -g  -fno-omit-frame-pointer"
          frame_pointers=true
-         printf "%s\n" "#define WITH_FRAME_POINTERS 1" >>confdefs.h
+
+printf "%s\n" "#define WITH_FRAME_POINTERS 1" >>confdefs.h
 
          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using frame pointers" >&5
 printf "%s\n" "$as_me: using frame pointers" >&6;} ;; #(
@@ -22503,13 +22550,16 @@ fi
 printf "%s\n" "$ocaml_cv_func_mmap_huge_pages" >&6; }
   if test "x$ocaml_cv_prog_cc_func_mmap_huge_pages" = xyes
 then :
-  printf "%s\n" "#define HAS_HUGE_PAGES 1" >>confdefs.h
 
-    printf "%s\n" "#define HUGE_PAGE_SIZE (4 * 1024 * 1024)" >>confdefs.h
+printf "%s\n" "#define HAS_HUGE_PAGES 1" >>confdefs.h
+
+
+printf "%s\n" "#define HUGE_PAGE_SIZE (4 * 1024 * 1024)" >>confdefs.h
 
 fi
 
 
+
 printf "%s\n" "#define HEADER_RESERVED_BITS $reserved_header_bits" >>confdefs.h
 
 
@@ -22706,7 +22756,8 @@ if test x"$enable_flat_float_array" = "xno"
 then :
   flat_float_array=false
 else $as_nop
-  printf "%s\n" "#define FLAT_FLOAT_ARRAY 1" >>confdefs.h
+
+printf "%s\n" "#define FLAT_FLOAT_ARRAY 1" >>confdefs.h
 
   flat_float_array=true
 fi
@@ -22820,7 +22871,8 @@ printf "%s\n" "$as_me: Function sections are not supported
     function_sections=true;
             oc_native_compflags='-function-sections'
             internal_cflags="$internal_cflags -ffunction-sections";
-            printf "%s\n" "#define FUNCTION_SECTIONS 1" >>confdefs.h
+
+printf "%s\n" "#define FUNCTION_SECTIONS 1" >>confdefs.h
  ;; #(
   *) :
     function_sections=false;
@@ -24108,9 +24160,8 @@ do
     "otherlibs/dynlink/dynlink_config.ml") CONFIG_FILES="$CONFIG_FILES otherlibs/dynlink/dynlink_config.ml" ;;
     "utils/config.common.ml") CONFIG_FILES="$CONFIG_FILES utils/config.common.ml" ;;
     "utils/config.generated.ml") CONFIG_FILES="$CONFIG_FILES utils/config.generated.ml" ;;
+    "runtime/caml/config.h") CONFIG_HEADERS="$CONFIG_HEADERS runtime/caml/config.h" ;;
     "runtime/caml/exec.h") CONFIG_HEADERS="$CONFIG_HEADERS runtime/caml/exec.h" ;;
-    "runtime/caml/m.h") CONFIG_HEADERS="$CONFIG_HEADERS runtime/caml/m.h" ;;
-    "runtime/caml/s.h") CONFIG_HEADERS="$CONFIG_HEADERS runtime/caml/s.h" ;;
     "runtime/caml/version.h") CONFIG_HEADERS="$CONFIG_HEADERS runtime/caml/version.h" ;;
     "compilerlibs/META") CONFIG_FILES="$CONFIG_FILES compilerlibs/META" ;;
     "otherlibs/dynlink/META") CONFIG_FILES="$CONFIG_FILES otherlibs/dynlink/META" ;;
diff --git a/configure.ac b/configure.ac
index 240622252cc6..d8fa71dfbe8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,11 +105,11 @@ AC_SUBST([OCAML_VERSION_MINOR], [OCAML__VERSION_MINOR])
 AC_SUBST([OCAML_VERSION_PATCHLEVEL], [OCAML__VERSION_PATCHLEVEL])
 AC_SUBST([OCAML_VERSION_EXTRA], [OCAML__VERSION_EXTRA])
 AC_SUBST([OCAML_VERSION_SHORT], [OCAML__VERSION_SHORT])
-AC_DEFINE([MAGIC_NUMBER_PREFIX], ["][MAGIC_NUMBER__PREFIX]["])
-AC_DEFINE([MAGIC_NUMBER_VERSION], ["][MAGIC_NUMBER__VERSION]["])
-AC_DEFINE([EXEC_MAGIC_LENGTH], [MAGIC_NUMBER__LENGTH])
+AC_DEFINE([MAGIC_NUMBER_PREFIX], ["][MAGIC_NUMBER__PREFIX]["], [TODO])
+AC_DEFINE([MAGIC_NUMBER_VERSION], ["][MAGIC_NUMBER__VERSION]["], [TODO])
+AC_DEFINE([EXEC_MAGIC_LENGTH], [MAGIC_NUMBER__LENGTH], [TODO])
 AC_SUBST([MAGIC_LENGTH], [MAGIC_NUMBER__LENGTH])
-AC_DEFINE([EXEC_FORMAT], ["][EXEC__FORMAT]["])
+AC_DEFINE([EXEC_FORMAT], ["][EXEC__FORMAT]["], [TODO])
 AC_SUBST([EXEC_MAGIC_NUMBER], [EXEC__MAGIC_NUMBER])
 AC_SUBST([CMI_MAGIC_NUMBER], [CMI__MAGIC_NUMBER])
 AC_SUBST([CMO_MAGIC_NUMBER], [CMO__MAGIC_NUMBER])
@@ -274,9 +274,13 @@ AC_CONFIG_FILES([ocamltest/ocamltest_config.ml])
 AC_CONFIG_FILES([otherlibs/dynlink/dynlink_config.ml])
 AC_CONFIG_FILES([utils/config.common.ml])
 AC_CONFIG_FILES([utils/config.generated.ml])
+AC_CONFIG_HEADERS([runtime/caml/config.h])
+AH_TOP([#ifndef CAML_CONFIG_H
+#define CAML_CONFIG_H])
+AH_BOTTOM([#include "conf_post.h"
+
+#endif /* CAML_CONFIG_H */])
 AC_CONFIG_HEADERS([runtime/caml/exec.h])
-AC_CONFIG_HEADERS([runtime/caml/m.h])
-AC_CONFIG_HEADERS([runtime/caml/s.h])
 AC_CONFIG_HEADERS([runtime/caml/version.h])
 AC_CONFIG_FILES([compilerlibs/META])
 AC_CONFIG_FILES([otherlibs/dynlink/META])
@@ -284,14 +288,14 @@ AC_CONFIG_FILES([otherlibs/runtime_events/META])
 AC_CONFIG_FILES([stdlib/META])
 
 # Definitions related to the version of OCaml
-AC_DEFINE([OCAML_VERSION_MAJOR], [OCAML__VERSION_MAJOR])
-AC_DEFINE([OCAML_VERSION_MINOR], [OCAML__VERSION_MINOR])
-AC_DEFINE([OCAML_VERSION_PATCHLEVEL], [OCAML__VERSION_PATCHLEVEL])
+AC_DEFINE([OCAML_VERSION_MAJOR], [OCAML__VERSION_MAJOR], [TODO])
+AC_DEFINE([OCAML_VERSION_MINOR], [OCAML__VERSION_MINOR], [TODO])
+AC_DEFINE([OCAML_VERSION_PATCHLEVEL], [OCAML__VERSION_PATCHLEVEL], [TODO])
 m4_if([OCAML__VERSION_EXTRA],[], [],
-  [AC_DEFINE([OCAML_VERSION_ADDITIONAL], ["][OCAML__VERSION_EXTRA]["])
-  AC_DEFINE([OCAML_VERSION_EXTRA], ["][OCAML__VERSION_EXTRA]["])])
-AC_DEFINE([OCAML_VERSION], [OCAML__VERSION_NUMBER])
-AC_DEFINE([OCAML_VERSION_STRING], ["][OCAML__VERSION]["])
+  [AC_DEFINE([OCAML_VERSION_ADDITIONAL], ["][OCAML__VERSION_EXTRA]["], [TODO])
+  AC_DEFINE([OCAML_VERSION_EXTRA], ["][OCAML__VERSION_EXTRA]["], [TODO])])
+AC_DEFINE([OCAML_VERSION], [OCAML__VERSION_NUMBER], [TODO])
+AC_DEFINE([OCAML_VERSION_STRING], ["][OCAML__VERSION]["], [TODO])
 
 # Works out how many "o"s are needed in quoted strings
 AC_CONFIG_COMMANDS_PRE(OCAML_QUOTED_STRING_ID)
@@ -1262,7 +1266,7 @@ AS_IF(
     [bits=32; arch64=false],
   [test "x$ac_cv_sizeof_long_p" = "x8" ],
     [bits=64; arch64=true
-    AC_DEFINE([ARCH_SIXTYFOUR], [1])],
+    AC_DEFINE([ARCH_SIXTYFOUR], [1], [TODO])],
   [AC_MSG_ERROR([Neither 32 nor 64 bits architecture.])]
 )
 
@@ -1296,14 +1300,14 @@ AS_IF([! $arch64],
     [i686], [],
     [AS_IF([test "$ac_cv_alignof_double" -gt 4],
       [align_double=true
-       AC_DEFINE([ARCH_ALIGN_DOUBLE], [1])])
+      AC_DEFINE([ARCH_ALIGN_DOUBLE], [1], [TODO])])
      AS_IF([test "x$ac_cv_sizeof_long" = "x8" &&
             test "$ac_cv_alignof_long" -gt 4],
       [align_int64=true],
       [AS_IF([test "x$ac_cv_sizeof_long_long" = "x8" &&
               test "$ac_cv_alignof_long_long" -gt 4],
       [align_int64=true])])
-      AS_IF([$align_int64], [AC_DEFINE([ARCH_ALIGN_INT64], [1])])
+      AS_IF([$align_int64], [AC_DEFINE([ARCH_ALIGN_INT64], [1], [TODO])])
     ])])
 
 AC_CHECK_TYPES([max_align_t], [], [], [[#include <stddef.h>]])
@@ -1323,7 +1327,7 @@ OCAML_CC_C11_ATOMIC_CFLAGS([$cclibs])
 
 AS_CASE([$target],
   [*-apple-darwin*|*-mingw32*|*-pc-windows], [],
-  [AC_DEFINE([HAS_FULL_THREAD_VARIABLES], [1])]
+  [AC_DEFINE([HAS_FULL_THREAD_VARIABLES], [1], [TODO])]
 )
 
 # Shared library support
@@ -1611,7 +1615,7 @@ AS_CASE([$enable_native_toplevel,$natdynlink],
     [install_ocamlnat=true],
   [install_ocamlnat=false])
 
-AC_DEFINE_UNQUOTED([OCAML_OS_TYPE], ["$ostype"])
+AC_DEFINE_UNQUOTED([OCAML_OS_TYPE], ["$ostype"], [TODO])
 target_os_type="$ostype"
 
 AS_IF([$cross_compiler],
@@ -1703,7 +1707,7 @@ AS_CASE([$as_target,$ocaml_cc_vendor],
 
 AS_IF([test "$with_pic"],
   [fpic=true
-  AC_DEFINE([CAML_WITH_FPIC], [1])
+  AC_DEFINE([CAML_WITH_FPIC], [1], [TODO])
   internal_cflags="$internal_cflags $sharedlib_cflags"
   default_aspp="$default_aspp $sharedlib_cflags"],
   [fpic=false])
@@ -1737,7 +1741,7 @@ AC_CHECK_FUNCS(m4_normalize([expm1 log1p hypot fma exp2 log2 cbrt acosh asinh
   atanh erf erfc trunc round copysign]), [], [has_c99_float_ops=false])
 
 AS_IF([$has_c99_float_ops],
-  [AC_DEFINE([HAS_C99_FLOAT_OPS], [1])
+[AC_DEFINE([HAS_C99_FLOAT_OPS], [1], [TODO])
   # Check whether round works (known bug in mingw-w64)
   OCAML_C99_CHECK_ROUND
   # Check whether fma works (regressed in mingw-w64 8.0.0; and present but
@@ -1760,7 +1764,7 @@ AS_CASE([$target],
     AC_CHECK_FUNCS([clock_gettime_nsec_np],
       [
         has_monotonic_clock=true
-        AC_DEFINE([HAS_CLOCK_GETTIME_NSEC_NP], [1])
+        AC_DEFINE([HAS_CLOCK_GETTIME_NSEC_NP], [1], [TODO])
       ],
       [has_monotonic_clock=false])],
   [AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
@@ -1773,7 +1777,7 @@ AS_CASE([$target],
     ]])],
     [
       has_monotonic_clock=true
-      AC_DEFINE([HAS_POSIX_MONOTONIC_CLOCK], [1])
+      AC_DEFINE([HAS_POSIX_MONOTONIC_CLOCK], [1], [TODO])
     ],
     [has_monotonic_clock=false])
   ]
@@ -2043,28 +2047,28 @@ AS_IF([$have_ipv6],
 # seem to detect it properly on Windows so we hardcode the definition
 # of HAS_UTIME on Windows but this will probably need to be clarified
 AS_CASE([$target],
-  [*-*-mingw32*|*-pc-windows], [AC_DEFINE([HAS_UTIME], [1])],
+  [*-*-mingw32*|*-pc-windows], [AC_DEFINE([HAS_UTIME], [1], [TODO])],
   [AC_CHECK_HEADER([sys/types.h],
     [AC_CHECK_HEADER([utime.h],
-      [AC_CHECK_FUNC([utime], [AC_DEFINE([HAS_UTIME], [1])])])])])
+      [AC_CHECK_FUNC([utime], [AC_DEFINE([HAS_UTIME], [1], [TODO])])])])])
 
 AC_CHECK_FUNC([fchmod],
-  [AC_CHECK_FUNC([fchown], [AC_DEFINE([HAS_FCHMOD], [1])])])
+  [AC_CHECK_FUNC([fchown], [AC_DEFINE([HAS_FCHMOD], [1], [TODO])])])
 
 AC_CHECK_FUNC([truncate],
-  [AC_CHECK_FUNC([ftruncate], [AC_DEFINE([HAS_TRUNCATE], [1])])])
+  [AC_CHECK_FUNC([ftruncate], [AC_DEFINE([HAS_TRUNCATE], [1], [TODO])])])
 
 ## select
 AC_CHECK_FUNC([select],
   [AC_CHECK_TYPE([fd_set],
-    [AC_DEFINE([HAS_SELECT], [1])], [], [
+    [AC_DEFINE([HAS_SELECT], [1], [TODO])], [], [
 #include <sys/types.h>
 #include <sys/select.h>
   ])])
 
 AC_CHECK_FUNC([symlink],
   [AC_CHECK_FUNC([readlink],
-    [AC_CHECK_FUNC([lstat], [AC_DEFINE([HAS_SYMLINK], [1])])])])
+    [AC_CHECK_FUNC([lstat], [AC_DEFINE([HAS_SYMLINK], [1], [TODO])])])])
 
 ## termios
 
@@ -2073,13 +2077,13 @@ AC_CHECK_HEADER([termios.h],
     [AC_CHECK_FUNC([tcsetattr],
       [AC_CHECK_FUNC([tcsendbreak],
         [AC_CHECK_FUNC([tcflush],
-          [AC_CHECK_FUNC([tcflow], [AC_DEFINE([HAS_TERMIOS], [1])])])])])])])
+          [AC_CHECK_FUNC([tcflow], [AC_DEFINE([HAS_TERMIOS], [1], [TODO])])])])])])])
 
 ## gethostname
 # Note: detection fails on Windows so hardcoding the result
 # (should be debugged later)
 AS_CASE([$target],
-  [*-*-mingw32*|*-pc-windows], [AC_DEFINE([HAVE_GETHOSTNAME], [1])],
+  [*-*-mingw32*|*-pc-windows], [AC_DEFINE([HAVE_GETHOSTNAME], [1], [TODO])],
   [AC_CHECK_FUNCS([gethostname])])
 
 ## uname
@@ -2096,28 +2100,28 @@ AS_CASE([$target],
 ## setenv and unsetenv
 
 AC_CHECK_FUNC([setenv],
-  [AC_CHECK_FUNC([unsetenv], [AC_DEFINE([HAS_SETENV_UNSETENV], [1])])])
+  [AC_CHECK_FUNC([unsetenv], [AC_DEFINE([HAS_SETENV_UNSETENV], [1], [TODO])])])
 
 ## newlocale() and <locale.h>
 # Note: the detection fails on msvc so we hardcode the result
 # (should be debugged later)
 AS_CASE([$target],
-  [*-pc-windows], [AC_DEFINE([HAS_LOCALE_H], [1])],
+  [*-pc-windows], [AC_DEFINE([HAS_LOCALE_H], [1], [TODO])],
   [AC_CHECK_HEADER([locale.h],
     [AC_CHECK_FUNC([newlocale],
       [AC_CHECK_FUNC([freelocale],
-        [AC_CHECK_FUNC([uselocale], [AC_DEFINE([HAS_LOCALE_H], [1])])])])])])
+        [AC_CHECK_FUNC([uselocale], [AC_DEFINE([HAS_LOCALE_H], [1], [TODO])])])])])])
 
 AC_CHECK_HEADER([xlocale.h],
   [AC_CHECK_FUNC([newlocale],
     [AC_CHECK_FUNC([freelocale],
-      [AC_CHECK_FUNC([uselocale], [AC_DEFINE([HAS_XLOCALE_H], [1])])])])])
+      [AC_CHECK_FUNC([uselocale], [AC_DEFINE([HAS_XLOCALE_H], [1], [TODO])])])])])
 
 ## strtod_l
 # Note: not detected on MSVC so hardcoding the result
 # (should be debugged later)
 AS_CASE([$target],
-  [*-pc-windows], [AC_DEFINE([HAVE_STRTOD_L], [1])],
+  [*-pc-windows], [AC_DEFINE([HAVE_STRTOD_L], [1], [TODO])],
   [AC_CHECK_FUNCS([strtod_l])])
 
 ## shared library support
@@ -2134,14 +2138,14 @@ AS_IF([$supports_shared_libraries],
 
 AS_IF([$supports_shared_libraries],
   [AC_MSG_NOTICE([Dynamic loading of shared libraries is supported.])
-  AC_DEFINE([SUPPORT_DYNAMIC_LINKING], [1])],
+  AC_DEFINE([SUPPORT_DYNAMIC_LINKING], [1], [TODO])],
   [AC_MSG_NOTICE([Dynamic loading of shared libraries is not supported.])])
 
 ## mmap
 
 AC_CHECK_HEADER([sys/mman.h],
   [AC_CHECK_FUNC([mmap],
-    [AC_CHECK_FUNC([munmap], [AC_DEFINE([HAS_MMAP], [1])])])])
+    [AC_CHECK_FUNC([munmap], [AC_DEFINE([HAS_MMAP], [1], [TODO])])])])
 
 ## -fdebug-prefix-map support by the C compiler
 AS_CASE([$ocaml_cc_vendor,$target],
@@ -2170,8 +2174,8 @@ AS_IF([$stat_has_ns_precision],
 AX_FUNC_WHICH_GETHOSTBYNAME_R
 
 AS_CASE([$ac_cv_func_which_gethostbyname_r],
-  [six], [AC_DEFINE([HAS_GETHOSTBYNAME_R],[6])],
-  [five], [AC_DEFINE([HAS_GETHOSTBYNAME_R],[5])],
+  [six], [AC_DEFINE([HAS_GETHOSTBYNAME_R],[6], [TODO])],
+  [five], [AC_DEFINE([HAS_GETHOSTBYNAME_R],[5], [TODO])],
   [three], [AC_MSG_WARN([OCaml does not support this variant])])
 
 # Number of arguments of gethostbyaddr_r
@@ -2179,8 +2183,8 @@ AS_CASE([$ac_cv_func_which_gethostbyname_r],
 AX_FUNC_WHICH_GETHOSTBYADDR_R
 
 AS_CASE([$ac_cv_func_which_gethostbyaddr_r],
-  [eight], [AC_DEFINE([HAS_GETHOSTBYADDR_R],[8])],
-  [seven], [AC_DEFINE([HAS_GETHOSTBYADDR_R],[7])])
+  [eight], [AC_DEFINE([HAS_GETHOSTBYADDR_R],[8], [TODO])],
+  [seven], [AC_DEFINE([HAS_GETHOSTBYADDR_R],[7], [TODO])])
 
 ## shmat
 AC_CHECK_HEADERS([sys/shm.h], [AC_CHECK_FUNCS([shmat])])
@@ -2189,7 +2193,7 @@ AC_CHECK_HEADERS([sys/shm.h], [AC_CHECK_FUNCS([shmat])])
 
 AC_CHECK_HEADER([spawn.h],
   [AC_CHECK_FUNC([posix_spawn],
-    [AC_CHECK_FUNC([posix_spawnp], [AC_DEFINE([HAS_POSIX_SPAWN], [1])])])])
+    [AC_CHECK_FUNC([posix_spawnp], [AC_DEFINE([HAS_POSIX_SPAWN], [1], [TODO])])])])
 
 AS_IF([$cross_compiler],
   [AC_PATH_TARGET_TOOL([PKG_CONFIG], [pkg-config], [false])],
@@ -2261,7 +2265,7 @@ int main(void) {
 AS_IF([test x"$zstd_status" = "xok"],
   [AC_MSG_NOTICE([compressed compilation artefacts supported])
    internal_cppflags="$internal_cppflags $zstd_flags"
-   AC_DEFINE([HAS_ZSTD], [1])],
+   AC_DEFINE([HAS_ZSTD], [1], [TODO])],
   [AS_CASE(["$with_zstd"],
      [no],
        [],
@@ -2326,7 +2330,7 @@ AC_LINK_IFELSE(
       CPU_COUNT(&cs);
       pthread_getaffinity_np(pthread_self(), sizeof(cs), &cs);]])],
   [AC_MSG_RESULT([GNU])
-  AC_DEFINE([HAS_GNU_GETAFFINITY_NP], [1])],
+  AC_DEFINE([HAS_GNU_GETAFFINITY_NP], [1], [TODO])],
   [AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
       [[#include <pthread.h>
@@ -2338,7 +2342,7 @@ AC_LINK_IFELSE(
         CPU_COUNT(&cs);
         pthread_getaffinity_np(pthread_self(), sizeof(cs), &cs);]])],
     [AC_MSG_RESULT([BSD])
-    AC_DEFINE([HAS_BSD_GETAFFINITY_NP], [1])],
+    AC_DEFINE([HAS_BSD_GETAFFINITY_NP], [1], [TODO])],
     [AC_MSG_RESULT([pthread_getaffinity_np not found])])])
 
 ## SetThreadDescription
@@ -2384,7 +2388,7 @@ AS_IF([test x"$enable_frame_pointers" = "xyes"],
         [clang-*|gcc-*],
          [common_cflags="$common_cflags -g  -fno-omit-frame-pointer"
          frame_pointers=true
-         AC_DEFINE([WITH_FRAME_POINTERS], [1])
+         AC_DEFINE([WITH_FRAME_POINTERS], [1], [TODO])
          AC_MSG_NOTICE([using frame pointers])],
          [AC_MSG_ERROR([frame pointers not supported on this platform])]
       )],
@@ -2396,7 +2400,7 @@ AS_IF([test x"$enable_frame_pointers" = "xyes"],
 ## Check for mmap support for huge pages and contiguous heap
 OCAML_MMAP_SUPPORTS_HUGE_PAGES
 
-AC_DEFINE_UNQUOTED([HEADER_RESERVED_BITS], [$reserved_header_bits])
+AC_DEFINE_UNQUOTED([HEADER_RESERVED_BITS], [$reserved_header_bits], [TODO])
 
 AS_IF([test x"$enable_installing_bytecode_programs" = "xno"],
   [install_bytecode_programs=false],
@@ -2475,7 +2479,7 @@ AS_IF([test x"$enable_cmm_invariants" = "xyes"],
 
 AS_IF([test x"$enable_flat_float_array" = "xno"],
   [flat_float_array=false],
-  [AC_DEFINE([FLAT_FLOAT_ARRAY], [1])
+  [AC_DEFINE([FLAT_FLOAT_ARRAY], [1], [TODO])
   flat_float_array=true])
 
 OCAML_MMAP_SUPPORTS_MAP_STACK
@@ -2515,7 +2519,7 @@ AS_IF([test x"$enable_function_sections" = "xno"],
             [function_sections=true;
             oc_native_compflags='-function-sections'
             internal_cflags="$internal_cflags -ffunction-sections";
-            AC_DEFINE([FUNCTION_SECTIONS], [1])],
+            AC_DEFINE([FUNCTION_SECTIONS], [1], [TODO])],
           [function_sections=false;
           AC_MSG_NOTICE([Function sections are not supported by
           $ocaml_cc_vendor.])])])],
@@ -2598,9 +2602,8 @@ AS_CASE([$target],
     [have_broken_printf=true])
 
 AS_IF([${have_broken_printf}],
-  [AC_DEFINE([HAVE_BROKEN_PRINTF], [1],
-    [m4_normalize([Define if floats are printed as "Infinity" and "Inf" instead
-    of the expected "inf".])])])
+  [AC_DEFINE([HAVE_BROKEN_PRINTF], [1], [Define if floats are printed as
+    "Infinity" and "Inf" instead of the expected "inf".])])
 
 AS_IF([$have_ipv6],
   [AC_DEFINE([HAVE_IPV6], [1], [Define if IPv6 is supported.])])
diff --git a/runtime/caml/config.h b/runtime/caml/conf_post.h
similarity index 98%
rename from runtime/caml/config.h
rename to runtime/caml/conf_post.h
index ab8db87b9b49..2b0f4fc04394 100644
--- a/runtime/caml/config.h
+++ b/runtime/caml/conf_post.h
@@ -13,11 +13,6 @@
 /*                                                                        */
 /**************************************************************************/
 
-#ifndef CAML_CONFIG_H
-#define CAML_CONFIG_H
-
-#include "m.h"
-#include "s.h"
 #include "compatibility.h"
 
 /* CAML_NAME_SPACE was introduced in OCaml 3.08 to declare compatibility with
@@ -262,5 +257,3 @@ typedef uint64_t uintnat;
 #elif (!defined(NATIVE_CODE))
    #define Cache_line_bsize 64
 #endif
-
-#endif /* CAML_CONFIG_H */
diff --git a/runtime/caml/config.h.in b/runtime/caml/config.h.in
new file mode 100644
index 000000000000..10d44e9a30fe
--- /dev/null
+++ b/runtime/caml/config.h.in
@@ -0,0 +1,543 @@
+/* runtime/caml/config.h.in.  Generated from configure.ac by autoheader.  */
+
+#ifndef CAML_CONFIG_H
+#define CAML_CONFIG_H
+
+/* The normal alignment of 'double', in bytes. */
+#undef ALIGNOF_DOUBLE
+
+/* The normal alignment of 'long', in bytes. */
+#undef ALIGNOF_LONG
+
+/* The normal alignment of 'long long', in bytes. */
+#undef ALIGNOF_LONG_LONG
+
+/* TODO */
+#undef ARCH_ALIGN_DOUBLE
+
+/* TODO */
+#undef ARCH_ALIGN_INT64
+
+/* TODO */
+#undef ARCH_SIXTYFOUR
+
+/* TODO */
+#undef ASM_CFI_SUPPORTED
+
+/* TODO */
+#undef CAML_WITH_FPIC
+
+/* TODO */
+#undef EXEC_FORMAT
+
+/* TODO */
+#undef EXEC_MAGIC_LENGTH
+
+/* TODO */
+#undef FLAT_FLOAT_ARRAY
+
+/* TODO */
+#undef FUNCTION_SECTIONS
+
+/* TODO */
+#undef HAS_BSD_GETAFFINITY_NP
+
+/* TODO */
+#undef HAS_C99_FLOAT_OPS
+
+/* TODO */
+#undef HAS_CLOCK_GETTIME_NSEC_NP
+
+/* TODO */
+#undef HAS_FCHMOD
+
+/* TODO */
+#undef HAS_FULL_THREAD_VARIABLES
+
+/* TODO */
+#undef HAS_GETHOSTBYADDR_R
+
+/* TODO */
+#undef HAS_GETHOSTBYNAME_R
+
+/* TODO */
+#undef HAS_GNU_GETAFFINITY_NP
+
+/* TODO */
+#undef HAS_HUGE_PAGES
+
+/* TODO */
+#undef HAS_LIBUNWIND
+
+/* TODO */
+#undef HAS_LOCALE_H
+
+/* TODO */
+#undef HAS_MMAP
+
+/* TODO */
+#undef HAS_POSIX_MONOTONIC_CLOCK
+
+/* TODO */
+#undef HAS_POSIX_SPAWN
+
+/* TODO */
+#undef HAS_SELECT
+
+/* TODO */
+#undef HAS_SETENV_UNSETENV
+
+/* TODO */
+#undef HAS_SYMLINK
+
+/* TODO */
+#undef HAS_TERMIOS
+
+/* TODO */
+#undef HAS_TRUNCATE
+
+/* TODO */
+#undef HAS_UTIME
+
+/* TODO */
+#undef HAS_XLOCALE_H
+
+/* TODO */
+#undef HAS_ZSTD
+
+/* Define to 1 if you have the 'accept' function. */
+#undef HAVE_ACCEPT
+
+/* Define to 1 if you have the 'accept4' function. */
+#undef HAVE_ACCEPT4
+
+/* Define to 1 if you have the 'acosh' function. */
+#undef HAVE_ACOSH
+
+/* Define to 1 if you have the <afunix.h> header file. */
+#undef HAVE_AFUNIX_H
+
+/* Define HAVE_ARCH_CODE32 if, on a 64-bit machine, code pointers fit in 32
+   bits, i.e. the code segment resides in the low 4G of the addressing space.
+   HAVE_ARCH_CODE32 is ignored on 32-bit machines. */
+#undef HAVE_ARCH_CODE32
+
+/* Define to 1 if you have the 'asinh' function. */
+#undef HAVE_ASINH
+
+/* Define to 1 if you have the 'atanh' function. */
+#undef HAVE_ATANH
+
+/* Define to 1 if you have the 'bind' function. */
+#undef HAVE_BIND
+
+/* Define if floats are printed as "Infinity" and "Inf" instead of the
+   expected "inf". */
+#undef HAVE_BROKEN_PRINTF
+
+/* Define to 1 if you have the 'cbrt' function. */
+#undef HAVE_CBRT
+
+/* Define to 1 if you have the 'clock_gettime_nsec_np' function. */
+#undef HAVE_CLOCK_GETTIME_NSEC_NP
+
+/* Define to 1 if you have the 'connect' function. */
+#undef HAVE_CONNECT
+
+/* Define to 1 if you have the 'copysign' function. */
+#undef HAVE_COPYSIGN
+
+/* Define to 1 if you have the declaration of 'SetThreadDescription', and to 0
+   if you don't. */
+#undef HAVE_DECL_SETTHREADDESCRIPTION
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the 'dup3' function. */
+#undef HAVE_DUP3
+
+/* Define to 1 if you have the 'erf' function. */
+#undef HAVE_ERF
+
+/* Define to 1 if you have the 'erfc' function. */
+#undef HAVE_ERFC
+
+/* Define to 1 if you have the 'execvpe' function. */
+#undef HAVE_EXECVPE
+
+/* Define to 1 if you have the 'exp2' function. */
+#undef HAVE_EXP2
+
+/* Define to 1 if you have the 'expm1' function. */
+#undef HAVE_EXPM1
+
+/* Define to 1 if you have the 'fma' function. */
+#undef HAVE_FMA
+
+/* Define to 1 if you have the seven-argument form of gethostbyaddr_r(). */
+#undef HAVE_FUNC_GETHOSTBYADDR_R_7
+
+/* Define to 1 if you have the eight-argument form of gethostbyaddr_r(). */
+#undef HAVE_FUNC_GETHOSTBYADDR_R_8
+
+/* Define to 1 if you have the three-argument form of gethostbyname_r(). */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_3
+
+/* Define to 1 if you have the five-argument form of gethostbyname_r(). */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_5
+
+/* Define to 1 if you have the six-argument form of gethostbyname_r(). */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_6
+
+/* Define to 1 if you have the 'getaddrinfo' function. */
+#undef HAVE_GETADDRINFO
+
+/* Define to 1 if you have the 'getauxval' function. */
+#undef HAVE_GETAUXVAL
+
+/* Define to 1 if you have the 'getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the 'getentropy' function. */
+#undef HAVE_GETENTROPY
+
+/* Define to 1 if you have the 'getgroups' function. */
+#undef HAVE_GETGROUPS
+
+/* Define to 1 if you have some form of gethostbyaddr_r(). */
+#undef HAVE_GETHOSTBYADDR_R
+
+/* Define to 1 if you have some form of gethostbyname_r(). */
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Define to 1 if you have the 'gethostname' function. */
+#undef HAVE_GETHOSTNAME
+
+/* Define to 1 if you have the 'getnameinfo' function. */
+#undef HAVE_GETNAMEINFO
+
+/* Define to 1 if you have the 'getrusage' function. */
+#undef HAVE_GETRUSAGE
+
+/* Define to 1 if you have the 'gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the 'hypot' function. */
+#undef HAVE_HYPOT
+
+/* Define to 1 if you have the 'inet_aton' function. */
+#undef HAVE_INET_ATON
+
+/* Define to 1 if you have the 'inet_ntop' function. */
+#undef HAVE_INET_NTOP
+
+/* Define to 1 if you have the 'inet_pton' function. */
+#undef HAVE_INET_PTON
+
+/* Define to 1 if you have the 'initgroups' function. */
+#undef HAVE_INITGROUPS
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if IPv6 is supported. */
+#undef HAVE_IPV6
+
+/* Define to 1 if you have the 'issetugid' function. */
+#undef HAVE_ISSETUGID
+
+/* Define if the C compiler supports the labels as values extension. */
+#undef HAVE_LABELS_AS_VALUES
+
+/* Define to 1 if you have the <linux/futex.h> header file. */
+#undef HAVE_LINUX_FUTEX_H
+
+/* Define to 1 if you have the 'listen' function. */
+#undef HAVE_LISTEN
+
+/* Define to 1 if you have the 'lockf' function. */
+#undef HAVE_LOCKF
+
+/* Define to 1 if you have the 'log1p' function. */
+#undef HAVE_LOG1P
+
+/* Define to 1 if you have the 'log2' function. */
+#undef HAVE_LOG2
+
+/* Define to 1 if the system has the type 'max_align_t'. */
+#undef HAVE_MAX_ALIGN_T
+
+/* Define to 1 if you have the 'mkfifo' function. */
+#undef HAVE_MKFIFO
+
+/* Define to 1 if you have the 'mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have the 'mktime' function. */
+#undef HAVE_MKTIME
+
+/* Define to 1 if you have the 'nanosleep' function. */
+#undef HAVE_NANOSLEEP
+
+/* Define if you have nice(). */
+#undef HAVE_NICE
+
+/* Define to 1 if you have the 'pipe2' function. */
+#undef HAVE_PIPE2
+
+/* Define to 1 if you have the 'prctl' function. */
+#undef HAVE_PRCTL
+
+/* Define to 1 if you have the <pthread_np.h> header file. */
+#undef HAVE_PTHREAD_NP_H
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#undef HAVE_PTHREAD_PRIO_INHERIT
+
+/* Define to 1 if you have the 'pthread_setname_np' function. */
+#undef HAVE_PTHREAD_SETNAME_NP
+
+/* Define to 1 if you have the 'pthread_set_name_np' function. */
+#undef HAVE_PTHREAD_SET_NAME_NP
+
+/* Define to 1 if you have the 'putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if you have the 'pwrite' function. */
+#undef HAVE_PWRITE
+
+/* Define to 1 if you have the 'realpath' function. */
+#undef HAVE_REALPATH
+
+/* Define to 1 if you have the 'rewinddir' function. */
+#undef HAVE_REWINDDIR
+
+/* Define to 1 if you have the 'round' function. */
+#undef HAVE_ROUND
+
+/* Define to 1 if you have the 'secure_getenv' function. */
+#undef HAVE_SECURE_GETENV
+
+/* Define to 1 if you have the 'setgroups' function. */
+#undef HAVE_SETGROUPS
+
+/* Define to 1 if you have the 'setitimer' function. */
+#undef HAVE_SETITIMER
+
+/* Define to 1 if you have the 'setsid' function. */
+#undef HAVE_SETSID
+
+/* Define to 1 if you have the 'SetThreadDescription' function. */
+#undef HAVE_SETTHREADDESCRIPTION
+
+/* Define to 1 if you have the 'shmat' function. */
+#undef HAVE_SHMAT
+
+/* Define to 1 if you have the 'socket' function. */
+#undef HAVE_SOCKET
+
+/* Define to 1 if you have the 'socketpair' function. */
+#undef HAVE_SOCKETPAIR
+
+/* Define if you have BSD sockets. */
+#undef HAVE_SOCKETS
+
+/* Define to 1 if the system has the type 'socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the 'strtod_l' function. */
+#undef HAVE_STRTOD_L
+
+/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_ATIMENSEC
+
+/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
+
+/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
+
+/* Define to 1 if you have the 'system' function. */
+#undef HAVE_SYSTEM
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#undef HAVE_SYS_SELECT_H
+
+/* Define to 1 if you have the <sys/shm.h> header file. */
+#undef HAVE_SYS_SHM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the 'times' function. */
+#undef HAVE_TIMES
+
+/* Define to 1 if you have the 'trunc' function. */
+#undef HAVE_TRUNC
+
+/* Define to 1 if you have the 'uname' function. */
+#undef HAVE_UNAME
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the 'utimes' function. */
+#undef HAVE_UTIMES
+
+/* Define to 1 if you have the 'wait4' function. */
+#undef HAVE_WAIT4
+
+/* Define to 1 if you have the 'waitpid' function. */
+#undef HAVE_WAITPID
+
+/* Define to 1 if 'fma' works. The newlib library (intentionally) simply
+   contains return x * y + z. This workaround is also used for
+   https://sourceforge.net/p/mingw-w64/bugs/848/ */
+#undef HAVE_WORKING_FMA
+
+/* Define to 1 if 'round' works. This workaround exists primarily for
+   https://sourceforge.net/p/mingw-w64/bugs/573/ */
+#undef HAVE_WORKING_ROUND
+
+/* Define to 1 if you have the '__secure_getenv' function. */
+#undef HAVE___SECURE_GETENV
+
+/* TODO */
+#undef HEADER_RESERVED_BITS
+
+/* TODO */
+#undef HUGE_PAGE_SIZE
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* TODO */
+#undef MAGIC_NUMBER_PREFIX
+
+/* TODO */
+#undef MAGIC_NUMBER_VERSION
+
+/* TODO */
+#undef OCAML_OS_TYPE
+
+/* TODO */
+#undef OCAML_VERSION
+
+/* TODO */
+#undef OCAML_VERSION_ADDITIONAL
+
+/* TODO */
+#undef OCAML_VERSION_EXTRA
+
+/* TODO */
+#undef OCAML_VERSION_MAJOR
+
+/* TODO */
+#undef OCAML_VERSION_MINOR
+
+/* TODO */
+#undef OCAML_VERSION_PATCHLEVEL
+
+/* TODO */
+#undef OCAML_VERSION_STRING
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* TODO */
+#undef POSIX_SIGNALS
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* The size of 'int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of 'long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of 'long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of 'long *', as computed by sizeof. */
+#undef SIZEOF_LONG_P
+
+/* The size of 'short', as computed by sizeof. */
+#undef SIZEOF_SHORT
+
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#undef STDC_HEADERS
+
+/* TODO */
+#undef SUPPORTS_TREE_VECTORIZE
+
+/* TODO */
+#undef SUPPORT_DYNAMIC_LINKING
+
+/* Define to use mmap MAP_STACK. */
+#undef USE_MMAP_MAP_STACK
+
+/* TODO */
+#undef WITH_FRAME_POINTERS
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 'long int' if <sys/types.h> does not define. */
+#undef off_t
+
+#include "conf_post.h"
+
+#endif /* CAML_CONFIG_H */