diff --git a/include/etl/tuple.h b/include/etl/tuple.h
index 31cdce5f..b18e0a66 100644
--- a/include/etl/tuple.h
+++ b/include/etl/tuple.h
@@ -39,6 +39,7 @@ SOFTWARE.
 
   #if ETL_USING_STL
     #include <tuple>
+    #include <utility>
   #endif
 
   #include "functional.h"
@@ -1183,7 +1184,9 @@ namespace etl
 
 namespace std
 {
-  #if ETL_NOT_USING_STL && !((defined(ETL_DEVELOPMENT_OS_APPLE) || (ETL_COMPILER_FULL_VERSION >= 190000)) && defined(ETL_COMPILER_CLANG))
+  #if ETL_NOT_USING_STL                                                                                                       \
+    && !((defined(ETL_DEVELOPMENT_OS_APPLE) || (ETL_COMPILER_FULL_VERSION >= 190000) && (ETL_COMPILER_FULL_VERSION < 220000)) \
+         && defined(ETL_COMPILER_CLANG))
   template <typename T>
   struct tuple_size;