diff --git a/arch/x86/zefi/efi.h b/arch/x86/zefi/efi.h
index 9be17c53e14..a81f163c19a 100644
--- a/arch/x86/zefi/efi.h
+++ b/arch/x86/zefi/efi.h
@@ -10,6 +10,7 @@
 #ifndef _ASMLANGUAGE
 
 #include <stdbool.h>
+#include <zephyr/autoconf.h>
 
 #define __abi __attribute__((ms_abi))
 
diff --git a/boards/intel/adl/CMakeLists.txt b/boards/intel/adl/CMakeLists.txt
index 36ddcdf9d13..6a250ca315c 100644
--- a/boards/intel/adl/CMakeLists.txt
+++ b/boards/intel/adl/CMakeLists.txt
@@ -6,7 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
   -o ${CMAKE_OBJCOPY}
-  -i ${ZEPHYR_BASE}/include
+  -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
diff --git a/boards/intel/ehl/CMakeLists.txt b/boards/intel/ehl/CMakeLists.txt
index 36ddcdf9d13..6a250ca315c 100644
--- a/boards/intel/ehl/CMakeLists.txt
+++ b/boards/intel/ehl/CMakeLists.txt
@@ -6,7 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
   -o ${CMAKE_OBJCOPY}
-  -i ${ZEPHYR_BASE}/include
+  -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
diff --git a/boards/intel/rpl/CMakeLists.txt b/boards/intel/rpl/CMakeLists.txt
index 36ddcdf9d13..6a250ca315c 100644
--- a/boards/intel/rpl/CMakeLists.txt
+++ b/boards/intel/rpl/CMakeLists.txt
@@ -6,7 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
   -o ${CMAKE_OBJCOPY}
-  -i ${ZEPHYR_BASE}/include
+  -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
diff --git a/boards/qemu/x86/CMakeLists.txt b/boards/qemu/x86/CMakeLists.txt
index 1f37a49df8c..1ee70f9f48a 100644
--- a/boards/qemu/x86/CMakeLists.txt
+++ b/boards/qemu/x86/CMakeLists.txt
@@ -5,7 +5,7 @@ if(CONFIG_BOARD_QEMU_X86_64 AND CONFIG_BUILD_OUTPUT_EFI)
 set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
-  -i ${ZEPHYR_BASE}/include
+  -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
   -o ${CMAKE_OBJCOPY}
   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
diff --git a/boards/up-bridge-the-gap/up_squared/CMakeLists.txt b/boards/up-bridge-the-gap/up_squared/CMakeLists.txt
index ddfd93807ff..98e4e9b2a82 100644
--- a/boards/up-bridge-the-gap/up_squared/CMakeLists.txt
+++ b/boards/up-bridge-the-gap/up_squared/CMakeLists.txt
@@ -9,7 +9,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
   -o ${CMAKE_OBJCOPY}
-  -i ${ZEPHYR_BASE}/include
+  -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt b/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt
index 36ddcdf9d13..6a250ca315c 100644
--- a/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt
+++ b/boards/up-bridge-the-gap/up_squared_pro_7000/CMakeLists.txt
@@ -6,7 +6,7 @@ set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
   COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/arch/x86/zefi/zefi.py
   -c ${CMAKE_C_COMPILER}
   -o ${CMAKE_OBJCOPY}
-  -i ${ZEPHYR_BASE}/include
+  -i ${ZEPHYR_BASE}/include ${PROJECT_BINARY_DIR}/include/generated
   -f ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.elf
   $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}