diff --git a/include/etl/generators/type_traits_generator.h b/include/etl/generators/type_traits_generator.h
index 1babf113..776d991b 100644
--- a/include/etl/generators/type_traits_generator.h
+++ b/include/etl/generators/type_traits_generator.h
@@ -832,7 +832,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_reference_t = std::remove_reference_t<T>;
+  using remove_reference_t = typename std::remove_reference<T>::type;
 #endif
 
   //***************************************************************************
@@ -842,7 +842,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_pointer_t = std::remove_pointer_t<T>;
+  using remove_pointer_t = typename std::remove_pointer<T>::type;
 #endif
 
   //***************************************************************************
@@ -852,7 +852,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_pointer_t = std::add_pointer_t<T>;
+  using add_pointer_t = typename std::add_pointer<T>::type;
 #endif
 
   //***************************************************************************
@@ -872,7 +872,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_const_t = std::remove_const_t<T>;
+  using remove_const_t = typename std::remove_const<T>::type;
 #endif
 
   //***************************************************************************
@@ -882,7 +882,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_const_t = std::add_const_t<T>;
+  using add_const_t = typename std::add_const<T>::type;
 #endif
 
   //***************************************************************************
@@ -902,7 +902,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_volatile_t = std::remove_volatile_t<T>;
+  using remove_volatile_t = typename std::remove_volatile<T>::type;
 #endif
 
   //***************************************************************************
@@ -912,7 +912,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_volatile_t = std::add_volatile_t<T>;
+  using add_volatile_t = typename std::add_volatile<T>::type;
 #endif
 
   //***************************************************************************
@@ -922,7 +922,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_cv_t = std::remove_cv_t<T>;
+  using remove_cv_t = typename std::remove_cv<T>::type;
 #endif
 
   //***************************************************************************
@@ -932,7 +932,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_cv_t = std::add_cv_t<T>;
+  using add_cv_t = typename std::add_cv<T>::type;
 #endif
 
   //***************************************************************************
@@ -1209,7 +1209,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using make_signed_t = std::make_signed_t<T>;
+  using make_signed_t = typename std::make_signed<T>::type;
 #endif
 
   //***************************************************************************
@@ -1219,7 +1219,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using make_unsigned_t = std::make_unsigned_t<T>;
+  using make_unsigned_t = typename std::make_unsigned<T>::type;
 #endif
 
   //***************************************************************************
@@ -1229,7 +1229,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <bool B, typename T = void>
-  using enable_if_t = std::enable_if_t<B, T>;
+  using enable_if_t = typename std::enable_if<B, T>::type;
 #endif
 
   //***************************************************************************
@@ -1250,7 +1250,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_extent_t = std::remove_extent_t<T>;
+  using remove_extent_t = typename std::remove_extent<T>::type;
 #endif
 
   //***************************************************************************
@@ -1260,7 +1260,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_all_extents_t = std::remove_all_extents_t<T>;
+  using remove_all_extents_t = typename std::remove_all_extents<T>::type;
 #endif
 
   //***************************************************************************
@@ -1280,7 +1280,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using decay_t = std::decay_t<T>;
+  using decay_t = typename std::decay<T>::type;
 #endif
 
   //***************************************************************************
@@ -1308,7 +1308,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_lvalue_reference_t = std::add_lvalue_reference_t<T>;
+  using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
 #endif
 
   //***************************************************************************
@@ -1319,7 +1319,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_rvalue_reference_t = std::add_rvalue_reference_t<T>;
+  using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
 #endif
 
   //***************************************************************************
diff --git a/include/etl/type_traits.h b/include/etl/type_traits.h
index c667e9b7..e51a839e 100644
--- a/include/etl/type_traits.h
+++ b/include/etl/type_traits.h
@@ -820,7 +820,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_reference_t = std::remove_reference_t<T>;
+  using remove_reference_t = typename std::remove_reference<T>::type;
 #endif
 
   //***************************************************************************
@@ -830,7 +830,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_pointer_t = std::remove_pointer_t<T>;
+  using remove_pointer_t = typename std::remove_pointer<T>::type;
 #endif
 
   //***************************************************************************
@@ -840,7 +840,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_pointer_t = std::add_pointer_t<T>;
+  using add_pointer_t = typename std::add_pointer<T>::type;
 #endif
 
   //***************************************************************************
@@ -860,7 +860,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_const_t = std::remove_const_t<T>;
+  using remove_const_t = typename std::remove_const<T>::type;
 #endif
 
   //***************************************************************************
@@ -870,7 +870,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_const_t = std::add_const_t<T>;
+  using add_const_t = typename std::add_const<T>::type;
 #endif
 
   //***************************************************************************
@@ -890,7 +890,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_volatile_t = std::remove_volatile_t<T>;
+  using remove_volatile_t = typename std::remove_volatile<T>::type;
 #endif
 
   //***************************************************************************
@@ -900,7 +900,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_volatile_t = std::add_volatile_t<T>;
+  using add_volatile_t = typename std::add_volatile<T>::type;
 #endif
 
   //***************************************************************************
@@ -910,7 +910,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_cv_t = std::remove_cv_t<T>;
+  using remove_cv_t = typename std::remove_cv<T>::type;
 #endif
 
   //***************************************************************************
@@ -920,7 +920,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_cv_t = std::add_cv_t<T>;
+  using add_cv_t = typename std::add_cv<T>::type;
 #endif
 
   //***************************************************************************
@@ -1197,7 +1197,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using make_signed_t = std::make_signed_t<T>;
+  using make_signed_t = typename std::make_signed<T>::type;
 #endif
 
   //***************************************************************************
@@ -1207,7 +1207,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using make_unsigned_t = std::make_unsigned_t<T>;
+  using make_unsigned_t = typename std::make_unsigned<T>::type;
 #endif
 
   //***************************************************************************
@@ -1217,7 +1217,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <bool B, typename T = void>
-  using enable_if_t = std::enable_if_t<B, T>;
+  using enable_if_t = typename std::enable_if<B, T>::type;
 #endif
 
   //***************************************************************************
@@ -1238,7 +1238,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_extent_t = std::remove_extent_t<T>;
+  using remove_extent_t = typename std::remove_extent<T>::type;
 #endif
 
   //***************************************************************************
@@ -1248,7 +1248,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using remove_all_extents_t = std::remove_all_extents_t<T>;
+  using remove_all_extents_t = typename std::remove_all_extents<T>::type;
 #endif
 
   //***************************************************************************
@@ -1268,7 +1268,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using decay_t = std::decay_t<T>;
+  using decay_t = typename std::decay<T>::type;
 #endif
 
   //***************************************************************************
@@ -1296,7 +1296,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_lvalue_reference_t = std::add_lvalue_reference_t<T>;
+  using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
 #endif
 
   //***************************************************************************
@@ -1307,7 +1307,7 @@ namespace etl
 
 #if ETL_CPP11_SUPPORTED
   template <typename T>
-  using add_rvalue_reference_t = std::add_rvalue_reference_t<T>;
+  using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
 #endif
 
   //***************************************************************************