diff --git a/src/freedreno/ir3/meson.build b/src/freedreno/ir3/meson.build
index aacfd1e2fdf..adad6ee9a32 100644
--- a/src/freedreno/ir3/meson.build
+++ b/src/freedreno/ir3/meson.build
@@ -138,8 +138,8 @@ libfreedreno_ir3 = static_library(
   include_directories : [inc_freedreno, inc_include, inc_src],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
-  link_with: [libir3decode, libir3encode, libfreedreno_common],
-  dependencies : [idep_nir_headers, dep_dl, idep_mesautil],
+  link_with: [libir3encode, libfreedreno_common],
+  dependencies : [idep_libir3decode, idep_nir_headers, dep_dl, idep_mesautil],
   build_by_default : false,
 )
 
@@ -148,8 +148,8 @@ test('ir3_disasm',
     'ir3_disasm',
     'tests/disasm.c',
     link_args : [ld_args_build_id],
-    link_with: [libfreedreno_ir3, libir3decode],
-    dependencies: [idep_mesautil, idep_nir],
+    link_with: [libfreedreno_ir3],
+    dependencies: [idep_libir3decode, idep_mesautil, idep_nir],
     include_directories: [inc_freedreno, inc_include, inc_src],
   ),
   suite: ['freedreno'],
diff --git a/src/freedreno/isa/meson.build b/src/freedreno/isa/meson.build
index 35a46e8d73c..ae7a4e896dd 100644
--- a/src/freedreno/isa/meson.build
+++ b/src/freedreno/isa/meson.build
@@ -47,7 +47,7 @@ decode_files = [
   'isa.h',
 ]
 
-libir3decode = static_library(
+_libir3decode = static_library(
   'ir3decode',
   decode_files,
   dependencies: [idep_mesautil, idep_isaspec_decode],
@@ -58,10 +58,21 @@ libir3decode = static_library(
   gnu_symbol_visibility: 'hidden',
 )
 
+idep_libir3decode = declare_dependency(
+  include_directories : [
+    include_directories('.'),
+    inc_include,
+    inc_src
+  ],
+  link_with : _libir3decode,
+  dependencies: [idep_isaspec_decode],
+  sources : [ir3_isa],
+)
+
 ir3disasm = executable(
   'ir3-disasm',
   ['ir3-disasm.c'],
-  link_with: libir3decode,
+  dependencies: [idep_libir3decode],
   build_by_default: with_tools.contains('freedreno'),
   include_directories: [
     inc_src,