diff --git a/components/cxx/CMakeLists.txt b/components/cxx/CMakeLists.txt
index 371bb2a9f19..a16ca7e941e 100644
--- a/components/cxx/CMakeLists.txt
+++ b/components/cxx/CMakeLists.txt
@@ -6,7 +6,7 @@ if(${target} STREQUAL "linux")
 endif()
 
 set(srcs "cxx_exception_stubs.cpp")
-set(priv_requires esp_system)
+set(priv_requires)
 
 if(NOT esp_tee_build)
     list(APPEND srcs "cxx_guards.cpp" "cxx_init.cpp")
diff --git a/components/cxx/cxx_init.cpp b/components/cxx/cxx_init.cpp
index dcd61269715..c6d001e575f 100644
--- a/components/cxx/cxx_init.cpp
+++ b/components/cxx/cxx_init.cpp
@@ -6,7 +6,6 @@
 
 #include "sdkconfig.h"
 #include "esp_log.h"
-#include "esp_private/startup_internal.h"
 
 namespace {
 const char *TAG = "C++ init";
diff --git a/components/cxx/test_apps/.build-test-rules.yml b/components/cxx/test_apps/.build-test-rules.yml
index 787715d3964..b06f9d253ec 100644
--- a/components/cxx/test_apps/.build-test-rules.yml
+++ b/components/cxx/test_apps/.build-test-rules.yml
@@ -5,3 +5,7 @@ components/cxx/test_apps:
     - if: IDF_TARGET in ["esp32", "esp32c3", "esp32c61", "esp32p4"]
       temporary: true
       reason: the other targets are not tested yet
+  depends_components:
+    - cxx
+    - pthread
+    - freertos
diff --git a/examples/cxx/.build-test-rules.yml b/examples/cxx/.build-test-rules.yml
new file mode 100644
index 00000000000..b92a76f7972
--- /dev/null
+++ b/examples/cxx/.build-test-rules.yml
@@ -0,0 +1,14 @@
+# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
+
+examples/cxx/exceptions:
+  depends_components:
+    - cxx
+
+examples/cxx/pthread:
+  depends_components:
+    - cxx
+    - pthread
+
+examples/cxx/rtti:
+  depends_components:
+    - cxx