diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index 956866dfbb..e088e3bd63 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -6,16 +6,11 @@ idf_component_register(SRCS "src/cpu_util.c"
                             "src/soc_include_legacy_warn.c"
                             "src/compare_set.c"
                        REQUIRES hal #cpu.h directly includes HAL header
+                       INCLUDE_DIRS include
                        PRIV_REQUIRES ${target}
                        LDFRAGMENTS linker.lf)
 
-
-# Since there can be chip-specific HAL headers which can include the common
-# HAL header via include_next, process the build scripts here first so that
-# include directories appear first in the compile command.
-add_subdirectory(src/${target})
-target_include_directories(${COMPONENT_LIB} PUBLIC include)
-target_link_libraries(${COMPONENT_LIB} PRIVATE idf::hal)
-
 add_subdirectory(soc)
+
+add_subdirectory(src/${target})
 target_link_libraries(${COMPONENT_LIB} PUBLIC "soc_${target}")