diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build
index b2b23acad4..748000e008 100644
--- a/src/core/initrd/meson.build
+++ b/src/core/initrd/meson.build
@@ -19,6 +19,7 @@ executable(
     libnmi_core,
     libnm_core_aux_intern,
     libnm_core_impl,
+    libnm_crypto,
     libnm_platform,
     libnm_base,
     libnm_systemd_shared,
diff --git a/src/core/meson.build b/src/core/meson.build
index 25ce29f1c1..ea23e17f55 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -207,6 +207,7 @@ executable(
     libNetworkManagerBase,
     libnm_core_aux_intern,
     libnm_core_impl,
+    libnm_crypto,
     libnm_systemd_core,
     libnm_platform,
     libnm_systemd_shared,
@@ -250,6 +251,7 @@ if enable_tests
       libNetworkManagerTest,
       libnm_core_aux_intern,
       libnm_core_impl,
+      libnm_crypto,
       libnm_platform,
       libnm_base,
       libnm_systemd_shared,
@@ -301,6 +303,7 @@ NetworkManager_all_sym = executable(
     libNetworkManagerBase,
     libnm_core_aux_intern,
     libnm_core_impl,
+    libnm_crypto,
     libnm_platform,
     libnm_base,
     libnm_log_core,
@@ -340,6 +343,7 @@ NetworkManager = executable(
     libNetworkManagerBase,
     libnm_core_aux_intern,
     libnm_core_impl,
+    libnm_crypto,
     libnm_platform,
     libnm_base,
     libnm_udev_aux,
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index 7b03e00968..d3aee24178 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -91,6 +91,7 @@ libnm = shared_library(
     libnm_client_impl,
     libnm_core_aux_intern,
     libnm_core_impl,
+    libnm_crypto,
     libnm_base,
     libnm_udev_aux,
     libnm_systemd_shared,
diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build
index 213de05b15..3ee2983a6f 100644
--- a/src/libnm-client-impl/tests/meson.build
+++ b/src/libnm-client-impl/tests/meson.build
@@ -25,6 +25,7 @@ foreach test_unit: test_units
       libnm_client_test,
       libnm_core_aux_intern,
       libnm_core_impl,
+      libnm_crypto,
       libnm_base,
       libnm_udev_aux,
       libnm_systemd_shared,
diff --git a/src/libnm-core-impl/meson.build b/src/libnm-core-impl/meson.build
index b1a08962f2..2b76961659 100644
--- a/src/libnm-core-impl/meson.build
+++ b/src/libnm-core-impl/meson.build
@@ -112,7 +112,4 @@ libnm_core_impl = static_library(
     libnm_core_public_dep,
     uuid_dep,
   ],
-  link_with: [
-    libnm_crypto,
-  ],
 )
diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build
index afc2898fc3..d498c430b6 100644
--- a/src/libnm-core-impl/tests/meson.build
+++ b/src/libnm-core-impl/tests/meson.build
@@ -30,6 +30,7 @@ foreach test_unit: test_units
     link_with: [
       libnm_core_aux_intern,
       libnm_core_impl,
+      libnm_crypto,
       libnm_base,
       libnm_log_null,
       libnm_systemd_shared,