diff --git a/arch/arm/src/cmake/platform.cmake b/arch/arm/src/cmake/platform.cmake
index 802dc41562b5d..e7c10544552fb 100644
--- a/arch/arm/src/cmake/platform.cmake
+++ b/arch/arm/src/cmake/platform.cmake
@@ -87,6 +87,9 @@ endif()
 
 if(CONFIG_LIBCXXTOOLCHAIN)
   nuttx_find_toolchain_lib(libstdc++.a)
+endif()
+
+if(CONFIG_LIBMINIABI)
   list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
 endif()
 
diff --git a/arch/arm64/src/cmake/platform.cmake b/arch/arm64/src/cmake/platform.cmake
index 63a21e000975c..a4f16ffd14345 100644
--- a/arch/arm64/src/cmake/platform.cmake
+++ b/arch/arm64/src/cmake/platform.cmake
@@ -47,6 +47,9 @@ endif()
 
 if(CONFIG_LIBCXXTOOLCHAIN)
   nuttx_find_toolchain_lib(libstdc++.a)
+endif()
+
+if(CONFIG_LIBMINIABI)
   list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
 endif()
 
diff --git a/arch/risc-v/src/cmake/platform.cmake b/arch/risc-v/src/cmake/platform.cmake
index 44cb48675ffe6..72d28f6ef9984 100644
--- a/arch/risc-v/src/cmake/platform.cmake
+++ b/arch/risc-v/src/cmake/platform.cmake
@@ -49,6 +49,9 @@ endif()
 
 if(CONFIG_LIBCXXTOOLCHAIN)
   nuttx_find_toolchain_lib(libstdc++.a)
+endif()
+
+if(CONFIG_LIBMINIABI)
   list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
 endif()
 
diff --git a/arch/tricore/src/cmake/platform.cmake b/arch/tricore/src/cmake/platform.cmake
index 9707020658d85..4178d882ea420 100644
--- a/arch/tricore/src/cmake/platform.cmake
+++ b/arch/tricore/src/cmake/platform.cmake
@@ -49,6 +49,9 @@ if(CONFIG_TRICORE_TOOLCHAIN_GNU)
   endif()
   if(CONFIG_LIBCXXTOOLCHAIN)
     nuttx_find_toolchain_lib(libstdc++.a)
+  endif()
+
+  if(CONFIG_LIBMINIABI)
     list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
   endif()
   if(CONFIG_COVERAGE_TOOLCHAIN)
diff --git a/arch/x86_64/src/cmake/platform.cmake b/arch/x86_64/src/cmake/platform.cmake
index 7a670b1c0661f..ed6d76df8c5d7 100644
--- a/arch/x86_64/src/cmake/platform.cmake
+++ b/arch/x86_64/src/cmake/platform.cmake
@@ -49,6 +49,9 @@ endif()
 
 if(CONFIG_LIBCXXTOOLCHAIN)
   nuttx_find_toolchain_lib(libstdc++.a)
+endif()
+
+if(CONFIG_LIBMINIABI)
   list(APPEND CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${NUTTX_DIR}/include/cxx)
 endif()
 
diff --git a/tools/Config.mk b/tools/Config.mk
index 59602abe5aae0..16b13321510d7 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -747,7 +747,9 @@ ifeq ($(CONFIG_LIBCXX),y)
 else ifeq ($(CONFIG_UCLIBCXX),y)
   ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)uClibc++
 else
-  ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)cxx
+  ifeq ($(CONFIG_LIBMINIABI),y)
+    ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)cxx
+  endif
   ifeq ($(CONFIG_ETL),y)
     ARCHXXINCLUDES += ${INCSYSDIR_PREFIX}$(TOPDIR)$(DELIM)include$(DELIM)etl
   endif