diff --git a/Redcraft.Utility/Source/Public/Templates/Invoke.h b/Redcraft.Utility/Source/Public/Templates/Invoke.h
index 9b2eeb6..af53d68 100644
--- a/Redcraft.Utility/Source/Public/Templates/Invoke.h
+++ b/Redcraft.Utility/Source/Public/Templates/Invoke.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "TypeTraits/Miscellaneous.h"
-
+#include "TypeTraits/TypeTraits.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Templates/Optional.h b/Redcraft.Utility/Source/Public/Templates/Optional.h
index 550694a..2fb7608 100644
--- a/Redcraft.Utility/Source/Public/Templates/Optional.h
+++ b/Redcraft.Utility/Source/Public/Templates/Optional.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "CoreTypes.h"
+#include "Templates/Utility.h"
 #include "Concepts/Comparable.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Miscellaneous/AssertionMacros.h"
diff --git a/Redcraft.Utility/Source/Public/Templates/Utility.h b/Redcraft.Utility/Source/Public/Templates/Utility.h
index 767c29a..d5c7e6b 100644
--- a/Redcraft.Utility/Source/Public/Templates/Utility.h
+++ b/Redcraft.Utility/Source/Public/Templates/Utility.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "TypeTraits/TypeTraits.h"
+#include "TypeTraits/CompositeType.h"
+#include "TypeTraits/Miscellaneous.h"
+#include "TypeTraits/SupportedOperations.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h b/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h
index 60a3b74..8ef79e9 100644
--- a/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h
+++ b/Redcraft.Utility/Source/Public/TypeTraits/Swappable.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "CoreTypes.h"
+#include "Templates/Utility.h"
 #include "TypeTraits/HelperClasses.h"
 
 NAMESPACE_REDCRAFT_BEGIN
@@ -9,10 +10,6 @@ NAMESPACE_MODULE_BEGIN(Utility)
 
 NAMESPACE_PRIVATE_BEGIN
 
-// This is a copy of a declaration to prevent circular references, originally defined in Templates/Utility.h
-template <typename T> requires TIsMoveConstructible<T>::Value&& TIsMoveAssignable<T>::Value
-constexpr void Swap(T& A, T& B);
-
 template <typename T, typename U>
 concept CSwappableWith =
 	requires(T&& A, U&& B)