diff --git a/opam-core.opam b/opam-core.opam
index e9ab6da90b8..4e919c1df45 100644
--- a/opam-core.opam
+++ b/opam-core.opam
@@ -29,7 +29,6 @@ depends: [
   "dune" {>= "2.8.0"}
   "sha" {>= "1.13"}
   "jsonm"
-  "swhid_core"
   "uutf"
   (("host-system-mingw" {os = "win32" & os-distribution != "cygwinports"} &
     "conf-mingw-w64-gcc-i686" {os = "win32" & os-distribution != "cygwinports"} &
diff --git a/opam-format.opam b/opam-format.opam
index a8e3f6a3481..6e9e24c6014 100644
--- a/opam-format.opam
+++ b/opam-format.opam
@@ -32,5 +32,6 @@ depends: [
   "opam-core" {= version}
   "opam-file-format" {>= "2.1.4"}
   "re" {>= "1.9.0"}
+  "swhid_core" {>= "0.1"}
   "dune" {>= "2.8.0"}
 ]
diff --git a/src/core/dune b/src/core/dune
index 89beb7e47ea..7636dcda9e2 100644
--- a/src/core/dune
+++ b/src/core/dune
@@ -3,7 +3,7 @@
   (public_name opam-core)
   (synopsis    "OCaml Package Manager core internal stdlib")
   ; TODO: Remove (re_export ...) when CI uses the OCaml version that includes https://github.com/ocaml/ocaml/pull/11989
-  (libraries   re (re_export ocamlgraph) unix sha jsonm swhid_core uutf)
+  (libraries   re (re_export ocamlgraph) unix sha jsonm uutf)
   (flags       (:standard
                (:include ../ocaml-flags-standard.sexp)
                (:include ../ocaml-flags-configure.sexp)
diff --git a/src/format/dune b/src/format/dune
index 975870b1e82..984bb64c02f 100644
--- a/src/format/dune
+++ b/src/format/dune
@@ -3,7 +3,7 @@
   (public_name opam-format)
   (synopsis    "OCaml Package Manager file format handling library")
   ; TODO: Remove (re_export ...) when CI uses the OCaml version that includes https://github.com/ocaml/ocaml/pull/11989
-  (libraries   (re_export opam-core) (re_export opam-file-format) re)
+  (libraries   (re_export opam-core) (re_export opam-file-format) re swhid_core)
   (modules_without_implementation OpamTypes)
   (flags       (:standard
                (:include ../ocaml-flags-standard.sexp)
diff --git a/src/core/opamSWHID.ml b/src/format/opamSWHID.ml
similarity index 100%
rename from src/core/opamSWHID.ml
rename to src/format/opamSWHID.ml
diff --git a/src/core/opamSWHID.mli b/src/format/opamSWHID.mli
similarity index 100%
rename from src/core/opamSWHID.mli
rename to src/format/opamSWHID.mli