diff --git a/components/cli/CMakeLists.txt b/components/cli/CMakeLists.txt
index 227a35514..d1bb4a956 100644
--- a/components/cli/CMakeLists.txt
+++ b/components/cli/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(CLI_INCLUDES "include")
 
 if (CONFIG_COMPILER_CXX_EXCEPTIONS)
-  list(APPEND CLI_INCLUDES "../../external/cli/include")
+  list(APPEND CLI_INCLUDES "detail/cli/include")
 else()
   message(WARNING "C++ exceptions are disabled, CLI is disabled")
 endif()
diff --git a/components/csv/CMakeLists.txt b/components/csv/CMakeLists.txt
index 752b15cf3..d6a7a9074 100644
--- a/components/csv/CMakeLists.txt
+++ b/components/csv/CMakeLists.txt
@@ -1,3 +1,3 @@
 idf_component_register(
-  INCLUDE_DIRS "../../external/csv2/include" "include"
+  INCLUDE_DIRS "detail/csv2/include" "include"
   )
diff --git a/components/format/CMakeLists.txt b/components/format/CMakeLists.txt
index 5ae85bbbe..152f306b1 100644
--- a/components/format/CMakeLists.txt
+++ b/components/format/CMakeLists.txt
@@ -1,3 +1,3 @@
 idf_component_register(
-  INCLUDE_DIRS "../../external/fmt/include" "include"
+  INCLUDE_DIRS "detail/fmt/include" "include"
 )
diff --git a/components/gfps_service/CMakeLists.txt b/components/gfps_service/CMakeLists.txt
index 085736b40..a8f0674ae 100644
--- a/components/gfps_service/CMakeLists.txt
+++ b/components/gfps_service/CMakeLists.txt
@@ -1,6 +1,6 @@
 idf_component_register(
-  INCLUDE_DIRS "../../external/nearby/embedded/client/source" "../../external/nearby/embedded/common/source" "../../external/nearby/embedded/common/target" "include"
-  SRC_DIRS "../../external/nearby/embedded/client/source" "../../external/nearby/embedded/common/source" "../../external/nearby/embedded/common/source/mbedtls" "src"
+  INCLUDE_DIRS "detail/nearby/embedded/client/source" "detail/nearby/embedded/common/source" "detail/nearby/embedded/common/target" "include"
+  SRC_DIRS "detail/nearby/embedded/client/source" "detail/nearby/embedded/common/source" "detail/nearby/embedded/common/source/mbedtls" "src"
   REQUIRES "esp_hw_support" "esp-nimble-cpp" "mbedtls" "nvs_flash" "logger" "task" "timer" "base_component"
 )
 
diff --git a/components/hid-rp/CMakeLists.txt b/components/hid-rp/CMakeLists.txt
index fe5ef9077..a160e906c 100644
--- a/components/hid-rp/CMakeLists.txt
+++ b/components/hid-rp/CMakeLists.txt
@@ -1,3 +1,3 @@
 idf_component_register(
-  INCLUDE_DIRS "include" "../../external/hid-rp/hid-rp"
+  INCLUDE_DIRS "include" "detail/hid-rp/hid-rp"
 )
diff --git a/components/serialization/CMakeLists.txt b/components/serialization/CMakeLists.txt
index 9205cdeec..92d7a518a 100644
--- a/components/serialization/CMakeLists.txt
+++ b/components/serialization/CMakeLists.txt
@@ -1,3 +1,3 @@
 idf_component_register(
-  INCLUDE_DIRS "../../external/alpaca/include" "include"
+  INCLUDE_DIRS "detail/alpaca/include" "include"
   )
diff --git a/components/state_machine/CMakeLists.txt b/components/state_machine/CMakeLists.txt
index d2e8b4e58..80059904e 100644
--- a/components/state_machine/CMakeLists.txt
+++ b/components/state_machine/CMakeLists.txt
@@ -1,4 +1,4 @@
 idf_component_register(
-  INCLUDE_DIRS "../../external/magic_enum/include/magic_enum" "include"
+  INCLUDE_DIRS "detail/magic_enum/include/magic_enum" "include"
   SRC_DIRS "src"
 )
diff --git a/components/tabulate/CMakeLists.txt b/components/tabulate/CMakeLists.txt
index 20140a659..5bfa6f27f 100644
--- a/components/tabulate/CMakeLists.txt
+++ b/components/tabulate/CMakeLists.txt
@@ -1,3 +1,3 @@
 idf_component_register(
-  INCLUDE_DIRS "../../external/tabulate/include" "include"
+  INCLUDE_DIRS "detail/tabulate/include" "include"
 )