diff --git a/libs/libxx/libcxx.cmake b/libs/libxx/libcxx.cmake
index 62f9e6d9b02..2bea3136caa 100644
--- a/libs/libxx/libcxx.cmake
+++ b/libs/libxx/libcxx.cmake
@@ -102,10 +102,5 @@ endif()
 nuttx_add_system_library(libcxx)
 target_sources(libcxx PRIVATE ${SRCS})
 target_compile_options(libcxx PRIVATE ${FLAGS})
-if(CONFIG_LIBCXXABI)
-  target_include_directories(
-    libcxx BEFORE PRIVATE ${CMAKE_CURRENT_LIST_DIR}/libcxxabi/include)
-endif()
-
 target_include_directories(libcxx BEFORE
                            PRIVATE ${CMAKE_CURRENT_LIST_DIR}/libcxx/src)
diff --git a/libs/libxx/libcxxabi.cmake b/libs/libxx/libcxxabi.cmake
index e6943ba60dc..078d35df9ee 100644
--- a/libs/libxx/libcxxabi.cmake
+++ b/libs/libxx/libcxxabi.cmake
@@ -52,6 +52,12 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/libcxxabi)
   endif()
 endif()
 
+set_property(
+  TARGET nuttx
+  APPEND
+  PROPERTY NUTTX_CXX_INCLUDE_DIRECTORIES
+           ${CMAKE_CURRENT_LIST_DIR}/libcxxabi/include)
+
 nuttx_add_system_library(libcxxabi)
 
 set(SRCS)
@@ -112,7 +118,6 @@ endif()
 target_compile_definitions(libcxxabi PRIVATE LIBCXXABI_NON_DEMANGLING_TERMINATE)
 
 target_sources(libcxxabi PRIVATE ${TARGET_SRCS})
-target_compile_options(libcxxabi PRIVATE -frtti)
 target_include_directories(
   libcxxabi BEFORE PRIVATE ${CMAKE_CURRENT_LIST_DIR}/libcxxabi/include
                            ${CMAKE_CURRENT_LIST_DIR}/libcxx/src)