diff --git a/Include/auROXTL/Objects/SOO.hpp b/Include/auROXTL/Objects/SOO.hpp
index 4f31b0b..22c6856 100644
--- a/Include/auROXTL/Objects/SOO.hpp
+++ b/Include/auROXTL/Objects/SOO.hpp
@@ -44,7 +44,7 @@ struct Type ## SOO
     AUROXTL_INTERFACE_SOO_HDR_(vis, Type ## SOO, targetSize, ## __VA_ARGS__)        \
     inline auto operator ->()                                                       \
     {                                                                               \
-        if constexpr (std::is_const_v<typename AuRemovePointer_t<decltype(this)>>)  \
+        if constexpr (std::is_const_v<AuRemovePointer_t<decltype(this)>>)           \
         {                                                                           \
             return (const extends *)this->padding;                                  \
                                                                                     \
@@ -57,7 +57,7 @@ struct Type ## SOO
                                                                                     \
     inline auto AsPointer()                                                         \
     {                                                                               \
-        if constexpr (std::is_const_v<typename AuRemovePointer_t<decltype(this)>>)  \
+        if constexpr (std::is_const_v<AuRemovePointer_t<decltype(this)>>)           \
         {                                                                           \
             return (const extends *)this->padding;                                  \
         }                                                                           \
diff --git a/Include/auROXTL/auTupleUtils.hpp b/Include/auROXTL/auTupleUtils.hpp
index 246a18c..325532e 100644
--- a/Include/auROXTL/auTupleUtils.hpp
+++ b/Include/auROXTL/auTupleUtils.hpp
@@ -52,13 +52,13 @@ template <class T, class Enable = void>
 struct AuIsPair_C;
 
 template <class T>
-struct AuIsPair_C<T, typename AuEnableIf_t<IsPairImpl<T>::value>>
+struct AuIsPair_C<T, AuEnableIf_t<IsPairImpl<T>::value>>
 {
-    using type = typename AuPair<typename T::first_type, typename T::second_type>;
+    using type = AuPair<typename T::first_type, typename T::second_type>;
 };
 
 template <class T>
-struct AuIsPair_C<T, typename AuEnableIf_t<!IsPairImpl<T>::value>>
+struct AuIsPair_C<T, AuEnableIf_t<!IsPairImpl<T>::value>>
 {
     using type = void;
 };
diff --git a/Include/auROXTLTypes.hpp b/Include/auROXTLTypes.hpp
index 49ef2f0..8f20fcc 100644
--- a/Include/auROXTLTypes.hpp
+++ b/Include/auROXTLTypes.hpp
@@ -11,6 +11,7 @@
     #include <vector>
     #include <utility>
     #include <map>
+    #include <list>
     #include <string>
     #include <array>
     #include <algorithm>