diff --git a/api/include/opentelemetry/config.h b/api/include/opentelemetry/config.h
index 21a2947e28..5ff6acee4d 100644
--- a/api/include/opentelemetry/config.h
+++ b/api/include/opentelemetry/config.h
@@ -8,7 +8,3 @@
 #else
 #  define OPENTELEMETRY_HAS_INCLUDE(x) __has_include(x)
 #endif
-
-#if !defined(__GLIBCXX__) || OPENTELEMETRY_HAS_INCLUDE(<codecvt>)  // >= libstdc++-5
-#  define OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
-#endif
diff --git a/api/include/opentelemetry/nostd/type_traits.h b/api/include/opentelemetry/nostd/type_traits.h
index 3a64b5db1a..a5a312bd4f 100644
--- a/api/include/opentelemetry/nostd/type_traits.h
+++ b/api/include/opentelemetry/nostd/type_traits.h
@@ -6,19 +6,9 @@
 #if defined(OPENTELEMETRY_STL_VERSION)
 #  if OPENTELEMETRY_STL_VERSION >= 2011
 #    include "opentelemetry/std/type_traits.h"
-#    define OPENTELEMETRY_HAVE_STD_TYPE_TRAITS
 #  endif
 #endif
 
-#if !defined(OPENTELEMETRY_HAVE_STD_TYPE_TRAITS)
-#  include <array>
-#  include <type_traits>
-
-#  include "opentelemetry/config.h"
-#  include "opentelemetry/nostd/detail/void.h"  // IWYU pragma: export
-#  include "opentelemetry/version.h"
-#endif
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace nostd
 {
@@ -133,7 +123,8 @@ using is_nothrow_swappable = detail::swappable::is_nothrow_swappable<is_swappabl
  *  std::is_trivialy_copy_assignable
  *  std::is_trivialy_move_assignable
  */
-#ifdef OPENTELEMETRY_TRIVIALITY_TYPE_TRAITS
+#if ((defined(OPENTELEMETRY_STL_VERSION) && OPENTELEMETRY_STL_VERSION >= 2011) || \
+     (!defined(__GLIBCXX__) || OPENTELEMETRY_HAS_INCLUDE(<codecvt>))  // >= libstdc++-5
 using std::is_trivially_copy_assignable;
 using std::is_trivially_copy_constructible;
 using std::is_trivially_move_assignable;