diff --git a/meson.build b/meson.build
index 368a461ab..8d59d9c96 100644
--- a/meson.build
+++ b/meson.build
@@ -392,6 +392,7 @@ endif
 
 if enable_database
   sources += [
+    'src/storage/StorageState.cxx',
     'src/queue/PlaylistUpdate.cxx',
     'src/command/StorageCommands.cxx',
     'src/command/DatabaseCommands.cxx',
diff --git a/python/build/meson.py b/python/build/meson.py
index 2ad2904bb..d86c48e6a 100644
--- a/python/build/meson.py
+++ b/python/build/meson.py
@@ -82,8 +82,8 @@ endian = '{endian}'
 def configure(toolchain, src, build, args=()):
     cross_file = make_cross_file(toolchain)
     configure = [
-        'meson',
-        src, build,
+        'meson', 'setup',
+        build, src,
 
         '--prefix', toolchain.install_prefix,
 
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 2fbddeb7d..cc214548c 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -17,7 +17,6 @@ storage_glue = static_library(
   'CompositeStorage.cxx',
   'MemoryDirectoryReader.cxx',
   'Configured.cxx',
-  'StorageState.cxx',
   include_directories: inc,
   dependencies: [
     boost_dep,
@@ -31,4 +30,3 @@ storage_glue_dep = declare_dependency(
     storage_plugins_dep,
   ],
 )
-
diff --git a/test/meson.build b/test/meson.build
index 4d650ffe8..5ef4d6f0a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -271,7 +271,8 @@ if enable_database
       dependencies: [
         log_dep,
         tag_dep,
-        storage_glue_dep,
+        fs_dep,
+        storage_plugins_dep,
         gtest_dep,
       ],
     ),
diff --git a/test/test_translate_song.cxx b/test/test_translate_song.cxx
index 6619066d6..962ae550f 100644
--- a/test/test_translate_song.cxx
+++ b/test/test_translate_song.cxx
@@ -14,6 +14,7 @@
 #include "ls.hxx"
 #include "Log.hxx"
 #include "db/DatabaseSong.hxx"
+#include "storage/Registry.hxx"
 #include "storage/StorageInterface.hxx"
 #include "storage/plugins/LocalStorage.hxx"
 #include "Mapper.hxx"
@@ -36,6 +37,13 @@ uri_supported_scheme(const char *uri) noexcept
 	return strncmp(uri, "http://", 7) == 0;
 }
 
+const StoragePlugin *
+GetStoragePluginByUri(const char *) noexcept
+{
+	// dummy symbol
+	return nullptr;
+}
+
 static constexpr auto music_directory = PATH_LITERAL("/music");
 static Storage *storage;