diff --git a/arch/common/CMakeLists.txt b/arch/common/CMakeLists.txt
index 8a8a9e6d20..a83fe44a88 100644
--- a/arch/common/CMakeLists.txt
+++ b/arch/common/CMakeLists.txt
@@ -21,7 +21,7 @@ zephyr_cc_option(-ffunction-sections -fdata-sections)
 
 zephyr_linker_sources_ifdef(CONFIG_GEN_ISR_TABLES
   SECTIONS
-  ${ZEPHYR_BASE}/include/linker/intlist.ld
+  ${ZEPHYR_BASE}/include/zephyr/linker/intlist.ld
 )
 
 if(CONFIG_GEN_ISR_TABLES)
diff --git a/arch/common/gen_isr_tables.py b/arch/common/gen_isr_tables.py
index cec35c6118..297c879185 100755
--- a/arch/common/gen_isr_tables.py
+++ b/arch/common/gen_isr_tables.py
@@ -43,7 +43,7 @@ def endian_prefix():
 def read_intlist(intlist_path, syms):
     """read a binary file containing the contents of the kernel's .intList
     section. This is an instance of a header created by
-    include/linker/intlist.ld:
+    include/zephyr/linker/intlist.ld:
 
      struct {
        uint32_t num_vectors;       <- typically CONFIG_NUM_IRQS
@@ -128,10 +128,10 @@ def parse_args():
 source_header = """
 /* AUTO-GENERATED by gen_isr_tables.py, do not edit! */
 
-#include <toolchain.h>
-#include <linker/sections.h>
-#include <sw_isr_table.h>
-#include <arch/cpu.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/sw_isr_table.h>
+#include <zephyr/arch/cpu.h>
 
 #if defined(CONFIG_GEN_SW_ISR_TABLE) && defined(CONFIG_GEN_IRQ_VECTOR_TABLE)
 #define ISR_WRAPPER ((uintptr_t)&_isr_wrapper)