diff --git a/arch/arm/src/CMakeLists.txt b/arch/arm/src/CMakeLists.txt
index e176d04c5c..4f9ff8d089 100644
--- a/arch/arm/src/CMakeLists.txt
+++ b/arch/arm/src/CMakeLists.txt
@@ -29,7 +29,7 @@ add_subdirectory(common)
 target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} common
                                               ${ARCH_SUBDIR})
 
-if(NOT CONFIG_BUILD_FLAT)
+if(CONFIG_BUILD_PROTECTED)
   target_include_directories(arch_interface BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR}
                                                           common ${ARCH_SUBDIR})
 endif()
diff --git a/arch/arm/src/qemu/CMakeLists.txt b/arch/arm/src/qemu/CMakeLists.txt
index 4784d64ccd..3c6b52b4b3 100644
--- a/arch/arm/src/qemu/CMakeLists.txt
+++ b/arch/arm/src/qemu/CMakeLists.txt
@@ -30,4 +30,8 @@ if(CONFIG_ARCH_IDLE_CUSTOM)
   list(APPEND SRCS qemu_idle.c)
 endif()
 
+if(CONFIG_BUILD_KERNEL)
+  list(APPEND SRCS qemu_pgalloc.c)
+endif()
+
 target_sources(arch PRIVATE ${SRCS})