diff --git a/ocaml/.depend b/ocaml/.depend
index 56bec8f6943..3b2fc96dcdb 100644
--- a/ocaml/.depend
+++ b/ocaml/.depend
@@ -789,6 +789,7 @@ typing/env.cmo : \
     utils/load_path.cmi \
     utils/lazy_backtrack.cmi \
     utils/language_extension.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     typing/datarepr.cmi \
     utils/compilation_unit.cmi \
@@ -815,6 +816,7 @@ typing/env.cmx : \
     utils/load_path.cmx \
     utils/lazy_backtrack.cmx \
     utils/language_extension.cmx \
+    typing/jkind.cmx \
     typing/ident.cmx \
     typing/datarepr.cmx \
     utils/compilation_unit.cmx \
@@ -836,6 +838,7 @@ typing/env.cmi : \
     parsing/longident.cmi \
     parsing/location.cmi \
     utils/load_path.cmi \
+    typing/jkind.cmi \
     utils/import_info.cmi \
     typing/ident.cmi \
     utils/compilation_unit.cmi \
@@ -1298,6 +1301,7 @@ typing/primitive.cmo : \
     typing/outcometree.cmi \
     utils/misc.cmi \
     parsing/location.cmi \
+    typing/jkind.cmi \
     parsing/attr_helper.cmi \
     typing/primitive.cmi
 typing/primitive.cmx : \
@@ -1305,6 +1309,7 @@ typing/primitive.cmx : \
     typing/outcometree.cmi \
     utils/misc.cmx \
     parsing/location.cmx \
+    typing/jkind.cmx \
     parsing/attr_helper.cmx \
     typing/primitive.cmi
 typing/primitive.cmi : \
@@ -2027,6 +2032,7 @@ typing/typemod.cmi : \
     parsing/parsetree.cmi \
     parsing/longident.cmi \
     parsing/location.cmi \
+    typing/jkind.cmi \
     typing/includemod.cmi \
     typing/ident.cmi \
     typing/env.cmi \
@@ -2076,6 +2082,7 @@ typing/typeopt.cmi : \
     typing/path.cmi \
     parsing/location.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/env.cmi
 typing/types.cmo : \
     typing/shape.cmi \
@@ -2596,11 +2603,11 @@ asmcomp/afl_instrument.cmi : \
     lambda/debuginfo.cmi \
     asmcomp/cmm.cmi
 asmcomp/arch.cmo : \
-    lambda/debuginfo.cmi \
-    utils/config.cmi
+    utils/config.cmi \
+    utils/clflags.cmi
 asmcomp/arch.cmx : \
-    lambda/debuginfo.cmx \
-    utils/config.cmx
+    utils/config.cmx \
+    utils/clflags.cmx
 asmcomp/asmgen.cmo : \
     lambda/translmod.cmi \
     asmcomp/split.cmi \
@@ -2955,6 +2962,7 @@ asmcomp/cmmgen.cmo : \
     typing/primitive.cmi \
     utils/misc.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     lambda/debuginfo.cmi \
     utils/config.cmi \
     middle_end/compilenv.cmi \
@@ -2975,6 +2983,7 @@ asmcomp/cmmgen.cmx : \
     typing/primitive.cmx \
     utils/misc.cmx \
     lambda/lambda.cmx \
+    typing/jkind.cmx \
     lambda/debuginfo.cmx \
     utils/config.cmx \
     middle_end/compilenv.cmx \
@@ -3064,8 +3073,15 @@ asmcomp/deadcode.cmx : \
 asmcomp/deadcode.cmi : \
     asmcomp/mach.cmi
 asmcomp/emit.cmo : \
+    asmcomp/x86_proc.cmi \
+    asmcomp/x86_masm.cmi \
+    asmcomp/x86_gas.cmi \
+    asmcomp/x86_dsl.cmi \
+    asmcomp/x86_ast.cmi \
     asmcomp/reg.cmi \
     asmcomp/proc.cmi \
+    asmcomp/printmach.cmi \
+    utils/numbers.cmi \
     utils/misc.cmi \
     asmcomp/mach.cmi \
     asmcomp/linear.cmi \
@@ -3073,6 +3089,7 @@ asmcomp/emit.cmo : \
     asmcomp/emitenv.cmi \
     asmcomp/emitaux.cmi \
     utils/domainstate.cmi \
+    lambda/debuginfo.cmi \
     utils/config.cmi \
     asmcomp/cmm_helpers.cmi \
     asmcomp/cmm.cmi \
@@ -3081,8 +3098,15 @@ asmcomp/emit.cmo : \
     asmcomp/arch.cmo \
     asmcomp/emit.cmi
 asmcomp/emit.cmx : \
+    asmcomp/x86_proc.cmx \
+    asmcomp/x86_masm.cmx \
+    asmcomp/x86_gas.cmx \
+    asmcomp/x86_dsl.cmx \
+    asmcomp/x86_ast.cmi \
     asmcomp/reg.cmx \
     asmcomp/proc.cmx \
+    asmcomp/printmach.cmx \
+    utils/numbers.cmx \
     utils/misc.cmx \
     asmcomp/mach.cmx \
     asmcomp/linear.cmx \
@@ -3090,6 +3114,7 @@ asmcomp/emit.cmx : \
     asmcomp/emitenv.cmi \
     asmcomp/emitaux.cmx \
     utils/domainstate.cmx \
+    lambda/debuginfo.cmx \
     utils/config.cmx \
     asmcomp/cmm_helpers.cmx \
     asmcomp/cmm.cmx \
@@ -3332,21 +3357,21 @@ asmcomp/printmach.cmi : \
     asmcomp/reg.cmi \
     asmcomp/mach.cmi
 asmcomp/proc.cmo : \
+    asmcomp/x86_proc.cmi \
     asmcomp/reg.cmi \
     utils/misc.cmi \
     asmcomp/mach.cmi \
     utils/config.cmi \
     asmcomp/cmm.cmi \
-    utils/ccomp.cmi \
     asmcomp/arch.cmo \
     asmcomp/proc.cmi
 asmcomp/proc.cmx : \
+    asmcomp/x86_proc.cmx \
     asmcomp/reg.cmx \
     utils/misc.cmx \
     asmcomp/mach.cmx \
     utils/config.cmx \
     asmcomp/cmm.cmx \
-    utils/ccomp.cmx \
     asmcomp/arch.cmx \
     asmcomp/proc.cmi
 asmcomp/proc.cmi : \
@@ -3369,10 +3394,18 @@ asmcomp/reg.cmi : \
 asmcomp/reload.cmo : \
     asmcomp/reloadgen.cmi \
     asmcomp/reg.cmi \
+    asmcomp/mach.cmi \
+    asmcomp/cmm.cmi \
+    utils/clflags.cmi \
+    asmcomp/arch.cmo \
     asmcomp/reload.cmi
 asmcomp/reload.cmx : \
     asmcomp/reloadgen.cmx \
     asmcomp/reg.cmx \
+    asmcomp/mach.cmx \
+    asmcomp/cmm.cmx \
+    utils/clflags.cmx \
+    asmcomp/arch.cmx \
     asmcomp/reload.cmi
 asmcomp/reload.cmi : \
     asmcomp/mach.cmi
@@ -3461,7 +3494,7 @@ asmcomp/selectgen.cmi : \
     asmcomp/arch.cmo
 asmcomp/selection.cmo : \
     asmcomp/selectgen.cmi \
-    asmcomp/reg.cmi \
+    asmcomp/proc.cmi \
     asmcomp/mach.cmi \
     asmcomp/cmm.cmi \
     utils/clflags.cmi \
@@ -3469,7 +3502,7 @@ asmcomp/selection.cmo : \
     asmcomp/selection.cmi
 asmcomp/selection.cmx : \
     asmcomp/selectgen.cmx \
-    asmcomp/reg.cmx \
+    asmcomp/proc.cmx \
     asmcomp/mach.cmx \
     asmcomp/cmm.cmx \
     utils/clflags.cmx \
@@ -3689,6 +3722,7 @@ middle_end/convert_primitives.cmo : \
     typing/primitive.cmi \
     utils/misc.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     middle_end/clambda_primitives.cmi \
     middle_end/convert_primitives.cmi
 middle_end/convert_primitives.cmx : \
@@ -3696,6 +3730,7 @@ middle_end/convert_primitives.cmx : \
     typing/primitive.cmx \
     utils/misc.cmx \
     lambda/lambda.cmx \
+    typing/jkind.cmx \
     middle_end/clambda_primitives.cmx \
     middle_end/convert_primitives.cmi
 middle_end/convert_primitives.cmi : \
@@ -3904,6 +3939,7 @@ lambda/matching.cmi : \
     typing/typedtree.cmi \
     parsing/location.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     lambda/debuginfo.cmi
 lambda/printlambda.cmo : \
@@ -3992,6 +4028,7 @@ lambda/transl_array_comprehension.cmo : \
     utils/misc.cmi \
     lambda/matching.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     typing/env.cmi \
     lambda/debuginfo.cmi \
@@ -4005,6 +4042,7 @@ lambda/transl_array_comprehension.cmx : \
     utils/misc.cmx \
     lambda/matching.cmx \
     lambda/lambda.cmx \
+    typing/jkind.cmx \
     typing/ident.cmx \
     typing/env.cmx \
     lambda/debuginfo.cmx \
@@ -4013,6 +4051,7 @@ lambda/transl_array_comprehension.cmx : \
 lambda/transl_array_comprehension.cmi : \
     typing/typedtree.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     lambda/debuginfo.cmi
 lambda/transl_comprehension_utils.cmo : \
     typing/primitive.cmi \
@@ -4034,6 +4073,7 @@ lambda/transl_list_comprehension.cmo : \
     lambda/transl_comprehension_utils.cmi \
     lambda/matching.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     parsing/asttypes.cmi \
     lambda/transl_list_comprehension.cmi
@@ -4043,12 +4083,14 @@ lambda/transl_list_comprehension.cmx : \
     lambda/transl_comprehension_utils.cmx \
     lambda/matching.cmx \
     lambda/lambda.cmx \
+    typing/jkind.cmx \
     typing/ident.cmx \
     parsing/asttypes.cmi \
     lambda/transl_list_comprehension.cmi
 lambda/transl_list_comprehension.cmi : \
     typing/typedtree.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     lambda/debuginfo.cmi
 lambda/translattribute.cmo : \
     utils/warnings.cmi \
@@ -4091,6 +4133,7 @@ lambda/translclass.cmo : \
     lambda/matching.cmi \
     parsing/location.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     typing/env.cmi \
     lambda/debuginfo.cmi \
@@ -4108,6 +4151,7 @@ lambda/translclass.cmx : \
     lambda/matching.cmx \
     parsing/location.cmx \
     lambda/lambda.cmx \
+    typing/jkind.cmx \
     typing/ident.cmx \
     typing/env.cmx \
     lambda/debuginfo.cmx \
@@ -4200,6 +4244,7 @@ lambda/translcore.cmi : \
     parsing/longident.cmi \
     parsing/location.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     typing/env.cmi \
     lambda/debuginfo.cmi \
@@ -4318,6 +4363,7 @@ lambda/translprim.cmo : \
     lambda/matching.cmi \
     parsing/location.cmi \
     lambda/lambda.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     typing/env.cmi \
     lambda/debuginfo.cmi \
@@ -4339,6 +4385,7 @@ lambda/translprim.cmx : \
     lambda/matching.cmx \
     parsing/location.cmx \
     lambda/lambda.cmx \
+    typing/jkind.cmx \
     typing/ident.cmx \
     typing/env.cmx \
     lambda/debuginfo.cmx \
@@ -6924,6 +6971,7 @@ toplevel/topcommon.cmi : \
     typing/outcometree.cmi \
     parsing/longident.cmi \
     parsing/location.cmi \
+    typing/jkind.cmi \
     typing/ident.cmi \
     toplevel/genprintval.cmi \
     typing/env.cmi \
diff --git a/ocaml/asmcomp/cmmgen.ml b/ocaml/asmcomp/cmmgen.ml
index 9399f665a5e..1d20b8db7f8 100644
--- a/ocaml/asmcomp/cmmgen.ml
+++ b/ocaml/asmcomp/cmmgen.ml
@@ -340,13 +340,13 @@ let join_unboxed_number_kind ~strict k1 k2 =
 (* [exttype_of_sort] and [machtype_of_sort] should be kept in sync with
    [Typeopt.layout_of_const_sort]. *)
 (* CR layouts v5: Void case should probably be typ_void *)
-let exttype_of_sort (s : Layouts.Sort.const) =
+let exttype_of_sort (s : Jkind.Sort.const) =
   match s with
   | Value -> XInt
   | Float64 -> XFloat
   | Void -> Misc.fatal_error "Cmmgen.exttype_of_sort: void encountered"
 
-let machtype_of_sort (s : Layouts.Sort.const) =
+let machtype_of_sort (s : Jkind.Sort.const) =
   match s with
   | Value -> typ_val
   | Float64 -> typ_float
diff --git a/ocaml/boot/ocamlc b/ocaml/boot/ocamlc
index 0d8a7385902..a1e00553e38 100755
Binary files a/ocaml/boot/ocamlc and b/ocaml/boot/ocamlc differ
diff --git a/ocaml/boot/ocamllex b/ocaml/boot/ocamllex
index ba4dd62a955..8b3aa5f3d6b 100755
Binary files a/ocaml/boot/ocamllex and b/ocaml/boot/ocamllex differ
diff --git a/ocaml/middle_end/convert_primitives.ml b/ocaml/middle_end/convert_primitives.ml
index 90982571b0c..3d51461f03a 100644
--- a/ocaml/middle_end/convert_primitives.ml
+++ b/ocaml/middle_end/convert_primitives.ml
@@ -159,8 +159,8 @@ let convert (prim : Lambda.primitive) : Clambda_primitives.primitive =
       ~effects:Only_generative_effects
       ~coeffects:Has_coeffects
       ~native_name:"caml_obj_dup"
-      ~native_repr_args:[P.Prim_global, P.Same_as_ocaml_repr Layouts.Sort.Value]
-      ~native_repr_res:(P.Prim_global, P.Same_as_ocaml_repr Layouts.Sort.Value))
+      ~native_repr_args:[P.Prim_global, P.Same_as_ocaml_repr Jkind.Sort.Value]
+      ~native_repr_res:(P.Prim_global, P.Same_as_ocaml_repr Jkind.Sort.Value))
   | Punbox_float -> Punbox_float
   | Pbox_float m -> Pbox_float m
   | Punbox_int bi -> Punbox_int bi