diff --git a/src/shared/meson.build b/src/shared/meson.build
index 0529d35d26..d4cd5ca431 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -199,6 +199,7 @@ shared_sources = files(
         'socket-netlink.c',
         'specifier.c',
         'ssl-util.c',
+        'storage-util.c',
         'switch-root.c',
         'swtpm-util.c',
         'tar-util.c',
diff --git a/src/storage/storage-util.c b/src/shared/storage-util.c
similarity index 100%
rename from src/storage/storage-util.c
rename to src/shared/storage-util.c
diff --git a/src/storage/storage-util.h b/src/shared/storage-util.h
similarity index 100%
rename from src/storage/storage-util.h
rename to src/shared/storage-util.h
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 21456141de..bcd68e612d 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -4,18 +4,15 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-storage-block',
                 'sources' : files('storage-block.c'),
-                'extract' : files('storage-util.c')
         },
         libexec_template + {
                 'name' : 'systemd-storage-fs',
                 'sources' : files('storage-fs.c'),
-                'objects' : ['systemd-storage-block'],
         },
         executable_template + {
                 'name' : 'storagectl',
                 'public' : true,
                 'sources' : files('storagectl.c'),
-                'objects' : ['systemd-storage-block'],
         },
 ]