diff --git a/target/avr/meson.build b/target/avr/meson.build
index 3e172bde1c..af5e7d6374 100644
--- a/target/avr/meson.build
+++ b/target/avr/meson.build
@@ -11,10 +11,13 @@ avr_ss.add(files(
   'translate.c',
   'helper.c',
   'cpu.c',
-  'gdbstub.c',
   'disas.c'))
 
+avr_common_system_ss = ss.source_set()
+avr_common_system_ss.add(files('gdbstub.c'))
+
 avr_system_ss.add(files('machine.c'))
 
 target_arch += {'avr': avr_ss}
 target_system_arch += {'avr': avr_system_ss}
+target_common_system_arch += {'avr': avr_common_system_ss}