diff --git a/Include/auROXTL/ThirdParty/tartanllamaOptional.hpp b/Include/auROXTL/ThirdParty/tartanllamaOptional.hpp
index d5c8cc7..0b0e9e2 100644
--- a/Include/auROXTL/ThirdParty/tartanllamaOptional.hpp
+++ b/Include/auROXTL/ThirdParty/tartanllamaOptional.hpp
@@ -2014,7 +2014,7 @@ namespace tl {
                 return 0;
             }
 
-            return AuHashCode(this->m_value);
+            return __audetail::HashCode(this->m_value);
         }
     }; // namespace tl
 
@@ -3135,7 +3135,7 @@ namespace tl {
 
         AuUInt HashCode() const
         {
-            return AuHashCode(m_value);
+            return __audetail::HashCode(m_value);
         }
 
     private:
@@ -3155,7 +3155,7 @@ namespace std
             if (!o.has_value())
                 return 0;
 
-            return AuHashCode<tl::detail::remove_const_t<T>>(*o);
+            return __audetail::HashCode<tl::detail::remove_const_t<T>>(*o);
         }
     };
 }
diff --git a/Include/auROXTL/auMemoryModel.hpp b/Include/auROXTL/auMemoryModel.hpp
index e64189a..d6d6aa2 100644
--- a/Include/auROXTL/auMemoryModel.hpp
+++ b/Include/auROXTL/auMemoryModel.hpp
@@ -132,10 +132,6 @@ static void auline AuSafeDelete(T *in)
     #define AURORA_RUNTIME_AU_DEFAULT_DELETER std::default_delete
 #endif
 
-// TODO: Move me
-#include "auOptional.hpp"
-#include "auCastUtils.hpp"
-
 namespace Aurora::Memory
 {
     template <class T>
diff --git a/Include/auROXTLTypes.hpp b/Include/auROXTLTypes.hpp
index 8ec9bae..bbd5934 100644
--- a/Include/auROXTLTypes.hpp
+++ b/Include/auROXTLTypes.hpp
@@ -150,22 +150,25 @@ namespace __audetail
 
     template <class T>
     constexpr inline bool AuHasBegin_v = AuHasBegin<T>::type::value;
+
+    template <class T>
+    AuUInt HashCode(const T &hashCode);
 }
 
 #include <auROXTL/auResult.hpp>
 #include <auROXTL/auMemoryModel.hpp>
-#include <auROXTL/auOptionalEx.hpp>
 #include <auROXTL/auString.hpp>
 #include <auROXTL/auUTF8StringView.hpp>
 #include <auROXTL/auFunctional.hpp>
-#include <auROXTL/auArray.hpp>
+#include <auROXTL/auTuple.hpp>
 #include <auROXTL/auList.hpp>
 #include <auROXTL/auHashMap.hpp>
 #include <auROXTL/auBST.hpp>
-#include <auROXTL/auTuple.hpp>
-#include <auROXTL/auOptional.hpp>
 #include <auROXTL/auVector.hpp>
+#include <auROXTL/auArray.hpp>
 #include <auROXTL/auArrayList.hpp>
+#include <auROXTL/auOptional.hpp>
+#include <auROXTL/auOptionalEx.hpp>
 
 namespace Aurora::Memory
 {
diff --git a/Include/auROXTLUtils.hpp b/Include/auROXTLUtils.hpp
index 8b803e7..9a832a7 100644
--- a/Include/auROXTLUtils.hpp
+++ b/Include/auROXTLUtils.hpp
@@ -41,15 +41,32 @@
 #include <auROXTL/auBitsUtils.hpp>
 #include <auROXTL/auMagicUtils.hpp>
 #include <auROXTL/auWin32Utils.hpp>
+
+// annoying
+#include <auROXTL/auHashUtils.hpp>
+
+namespace __audetail
+{
+    template <class T>
+    AuUInt HashCode(const T &hashCode)
+    {
+        return AuHashCode(hashCode);
+    }
+}
+
+
+// annoying
 #include <auROXTL/auCastUtils.hpp>
+
+// cont
 #include <auROXTL/auTypeUtils.hpp>
 #include <auROXTL/auNumericLimits.hpp>
 #include <auROXTL/auUnitUtils.hpp>
 #include <auROXTL/auFNV1Utils.hpp>
-#include <auROXTL/auHashUtils.hpp>
 #include <auROXTL/auTryConstructUtils.hpp>
 #include <auROXTL/auTryCallUtils.hpp>
 
+
 #include <auROXTL/Objects/SafeDestroy.hpp>
 #include <auROXTL/Objects/ResetMember.hpp>