diff --git a/bootstrap.ml b/bootstrap.ml
index 39b26f86..c0513ecb 100644
--- a/bootstrap.ml
+++ b/bootstrap.ml
@@ -29,8 +29,7 @@ end
 
 (* Directories with library names *)
 let dirs =
-  [ "src/stdune/caml/result" , Some "Result"
-  ; "src/stdune/caml"        , Some "Caml"
+  [ "src/stdune/caml"        , Some "Caml"
   ; "src/stdune"             , Some "Stdune"
   ; "src/fiber"              , Some "Fiber"
   ; "src/xdg"                , Some "Xdg"
diff --git a/src/fiber/fiber.mli b/src/fiber/fiber.mli
index 79f51897..9bbf1b0d 100644
--- a/src/fiber/fiber.mli
+++ b/src/fiber/fiber.mli
@@ -1,5 +1,7 @@
 (** Concurrency library *)
 
+open Stdune
+
 (** {1 Generals} *)
 
 (** Type of fiber. A fiber represent a suspended computation. Note that using the same
diff --git a/src/stdune/caml/caml.ml b/src/stdune/caml/caml.ml
index 07ae9124..a050ef96 100644
--- a/src/stdune/caml/caml.ml
+++ b/src/stdune/caml/caml.ml
@@ -1,5 +1,6 @@
 module Filename = Filename
 module String   = String
+module Result   = Result
 
 type ('a, 'error) result = ('a, 'error) Result.t =
   | Ok    of 'a
diff --git a/src/stdune/caml/jbuild b/src/stdune/caml/jbuild
index 5b311c16..1886d286 100644
--- a/src/stdune/caml/jbuild
+++ b/src/stdune/caml/jbuild
@@ -1,4 +1,3 @@
 (library
  ((name caml)
-  (synopsis "Wrapped version of the OCaml stdlib")
-  (libraries (result))))
+  (synopsis "Wrapped version of the OCaml stdlib")))
diff --git a/src/stdune/caml/result/result.ml b/src/stdune/caml/result.ml
similarity index 100%
rename from src/stdune/caml/result/result.ml
rename to src/stdune/caml/result.ml
diff --git a/src/stdune/caml/result/result.mli b/src/stdune/caml/result.mli
similarity index 100%
rename from src/stdune/caml/result/result.mli
rename to src/stdune/caml/result.mli
diff --git a/src/stdune/caml/result/jbuild b/src/stdune/caml/result/jbuild
deleted file mode 100644
index 25a2841a..00000000
--- a/src/stdune/caml/result/jbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-(jbuild_version 1)
-
-(library
- ((name     result)
-  (synopsis "Result type library")))
diff --git a/src/stdune/caml/result/result_compat.ml b/src/stdune/caml/result_compat.ml
similarity index 100%
rename from src/stdune/caml/result/result_compat.ml
rename to src/stdune/caml/result_compat.ml
diff --git a/vendor/cmdliner/src/jbuild b/vendor/cmdliner/src/jbuild
index 7f7146a9..6198726d 100644
--- a/vendor/cmdliner/src/jbuild
+++ b/vendor/cmdliner/src/jbuild
@@ -2,5 +2,5 @@
 
 (library
  ((name jbuilder_cmdliner)
-  (libraries (result))
-  (flags (-w -3-6-27-32-33-35-50))))
+  (libraries (caml))
+  (flags (-w -3-6-27-32-33-35-50 -open Caml))))