diff --git a/assets/meson.build b/assets/meson.build
index 90689915..3fab1f6f 100644
--- a/assets/meson.build
+++ b/assets/meson.build
@@ -11,9 +11,11 @@ endif
 
 embedded_assets_f = files(embedded_assets)
 
+embedded_assets_sources = []
+
 count = 0
 foreach file : embedded_assets_f
-    global_sources += custom_target(embedded_assets[count],
+    embedded_assets_sources += custom_target(embedded_assets[count],
     input: file,
     output: '@0@.xxd'.format(embedded_assets[count]),
     command: [
@@ -26,6 +28,8 @@ foreach file : embedded_assets_f
     count += 1
 endforeach
 
+global_dependencies += declare_dependency(sources: embedded_assets_sources)
+
 if is_libretro
     global_sources += custom_target(
         'GMGSx',
diff --git a/meson.build b/meson.build
index dfbe50cf..1f64e419 100644
--- a/meson.build
+++ b/meson.build
@@ -28,8 +28,8 @@ if is_libretro and (host_cpu_family == 'ppc' or host_cpu_family == 'ppc64') and
     error('LTO is required when building for PowerPC architectures. Please pass either `-Db_lto=true` or `-Druby_lto=true` to Meson.')
 endif
 
-global_sources = [vcs_tag(command: ['git', 'rev-parse', '--short=7', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h')]
-global_dependencies = []
+global_sources = []
+global_dependencies = [declare_dependency(sources: vcs_tag(command: ['git', 'rev-parse', '--short=7', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h'))]
 global_include_dirs = []
 global_args = []
 global_cpp_args = []
diff --git a/shader/meson.build b/shader/meson.build
index adae8842..d139451c 100644
--- a/shader/meson.build
+++ b/shader/meson.build
@@ -36,9 +36,11 @@ endif
 
 embedded_shaders_f = files(embedded_shaders)
 
+embedded_shaders_dep_sources = []
+
 count = 0
 foreach file : embedded_shaders_f
-    global_sources += custom_target(embedded_shaders[count],
+    embedded_shaders_dep_sources += custom_target(embedded_shaders[count],
         input: file,
         output: '@0@.xxd'.format(embedded_shaders[count]),
         command: [
@@ -50,3 +52,5 @@ foreach file : embedded_shaders_f
         )
     count += 1
 endforeach
+
+global_dependencies += declare_dependency(sources: embedded_shaders_dep_sources)