diff --git a/src/etnaviv/isa/meson.build b/src/etnaviv/isa/meson.build
index c1327195fa8..76aa07dfdcb 100644
--- a/src/etnaviv/isa/meson.build
+++ b/src/etnaviv/isa/meson.build
@@ -24,7 +24,7 @@ decode_files = [
   'isa.h',
 ]
 
-libetnaviv_decode = static_library(
+_libetnaviv_decode = static_library(
   'etnaviv_decode',
   decode_files,
   dependencies: [idep_mesautil, idep_isaspec_decode],
@@ -35,10 +35,21 @@ libetnaviv_decode = static_library(
   gnu_symbol_visibility: 'hidden',
 )
 
+idep_libetnaviv_decode = declare_dependency(
+  include_directories : [
+    include_directories('.'),
+    inc_include,
+    inc_src
+  ],
+  link_with : _libetnaviv_decode,
+  dependencies: [idep_isaspec_decode],
+  sources : [etnaviv_isa],
+)
+
 disasm = executable(
   'etnaviv-disasm',
   ['disasm.c'],
-  link_with: libetnaviv_decode,
+  dependencies: idep_libetnaviv_decode,
   build_by_default: with_tools.contains('etnaviv'),
   include_directories: [
     inc_src,
diff --git a/src/etnaviv/isa/tests/meson.build b/src/etnaviv/isa/tests/meson.build
index afb13bf5cec..a185164519e 100644
--- a/src/etnaviv/isa/tests/meson.build
+++ b/src/etnaviv/isa/tests/meson.build
@@ -7,8 +7,7 @@ test(
   'etnaviv_isa_disasm',
   executable(
     'etnaviv_disasm', 'disasm.cpp',
-    link_with: [libetnaviv_decode],
     include_directories: [inc_etnaviv, inc_src],
-    dependencies : [idep_gtest],
+    dependencies : [idep_gtest, idep_libetnaviv_decode],
   )
 )
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index a25a86a29a1..553c0aca141 100644
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -117,8 +117,8 @@ libetnaviv = static_library(
   include_directories : [
     inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
   ],
-  link_with: [libetnaviv_drm, libetnaviv_decode],
-  dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil],
+  link_with: [libetnaviv_drm],
+  dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil, idep_libetnaviv_decode],
 )
 
 etnaviv_compiler = executable(