diff --git a/src/input/meson.build b/src/input/meson.build
index bee8859c59..8050d17aa3 100644
--- a/src/input/meson.build
+++ b/src/input/meson.build
@@ -5,10 +5,6 @@ input_api = static_library(
   'Error.cxx',
   'InputPlugin.cxx',
   'InputStream.cxx',
-  'ThreadInputStream.cxx',
-  'AsyncInputStream.cxx',
-  'ProxyInputStream.cxx',
-  'LastInputStream.cxx',
   include_directories: inc,
   dependencies: [
     thread_dep,
@@ -19,6 +15,31 @@ input_api = static_library(
 input_api_dep = declare_dependency(
   link_with: input_api,
   dependencies: [
+    thread_dep,
+  ],
+)
+
+input_basic = static_library(
+  'input_basic',
+  'AsyncInputStream.cxx',
+  'LastInputStream.cxx',
+  'ProxyInputStream.cxx',
+  'RewindInputStream.cxx',
+  'TextInputStream.cxx',
+  'ThreadInputStream.cxx',
+  include_directories: inc,
+  dependencies: [
+    input_api_dep,
+    thread_dep,
+    event_dep,
+  ],
+)
+
+input_basic_dep = declare_dependency(
+  link_with: input_basic,
+  dependencies: [
+    input_api_dep,
+    thread_dep,
     event_dep,
   ],
 )
@@ -34,8 +55,6 @@ input_glue = static_library(
   'LocalOpen.cxx',
   'ScanTags.cxx',
   'Reader.cxx',
-  'TextInputStream.cxx',
-  'RewindInputStream.cxx',
   'BufferingInputStream.cxx',
   'BufferedInputStream.cxx',
   'MaybeBufferedInputStream.cxx',
@@ -45,6 +64,8 @@ input_glue = static_library(
   'cache/Stream.cxx',
   include_directories: inc,
   dependencies: [
+    input_api_dep,
+    input_basic_dep,
     log_dep,
   ],
 )
@@ -52,6 +73,8 @@ input_glue = static_library(
 input_glue_dep = declare_dependency(
   link_with: input_glue,
   dependencies: [
+    input_api_dep,
+    input_basic_dep,
     input_plugins_dep,
     fs_dep,
     config_dep,
diff --git a/src/input/plugins/meson.build b/src/input/plugins/meson.build
index fdd4ed309b..2ba5bf10c3 100644
--- a/src/input/plugins/meson.build
+++ b/src/input/plugins/meson.build
@@ -68,6 +68,8 @@ input_plugins = static_library(
   input_plugins_sources,
   include_directories: inc,
   dependencies: [
+    input_api_dep,
+    input_basic_dep,
     log_dep,
     alsa_dep,
     curl_dep,
diff --git a/src/playlist/plugins/meson.build b/src/playlist/plugins/meson.build
index b174a5eaa8..37faf1385a 100644
--- a/src/playlist/plugins/meson.build
+++ b/src/playlist/plugins/meson.build
@@ -8,7 +8,7 @@ playlist_plugins_deps = [
   log_dep,
   expat_dep,
   flac_dep,
-  input_api_dep,
+  input_basic_dep,
   config_dep,
 ]