diff --git a/include/Nazara/Core/Tuple.hpp b/include/Nazara/Core/Algorithm.hpp
similarity index 63%
rename from include/Nazara/Core/Tuple.hpp
rename to include/Nazara/Core/Algorithm.hpp
index 1626e5177..f094c8976 100644
--- a/include/Nazara/Core/Tuple.hpp
+++ b/include/Nazara/Core/Algorithm.hpp
@@ -4,13 +4,14 @@
 
 #pragma once
 
-#ifndef NAZARA_TUPLE_HPP
-#define NAZARA_TUPLE_HPP
+#ifndef NAZARA_ALGORITHM_CORE_HPP
+#define NAZARA_ALGORITHM_CORE_HPP
 
+#include <Nazara/Prerequesites.hpp>
 #include <tuple>
 
 template<typename F, typename... ArgsT> void NzUnpackTuple(F func, const std::tuple<ArgsT...>& t);
 
-#include <Nazara/Core/Tuple.inl>
+#include <Nazara/Core/Algorithm.inl>
 
-#endif // NAZARA_TUPLE_HPP
+#endif // NAZARA_ALGORITHM_CORE_HPP
diff --git a/include/Nazara/Core/Tuple.inl b/include/Nazara/Core/Algorithm.inl
similarity index 95%
rename from include/Nazara/Core/Tuple.inl
rename to include/Nazara/Core/Algorithm.inl
index 46c6b5753..5a8bbeccf 100644
--- a/include/Nazara/Core/Tuple.inl
+++ b/include/Nazara/Core/Algorithm.inl
@@ -8,6 +8,8 @@
 
 #include <Nazara/Core/Debug.hpp>
 
+///TODO: Améliorer l'implémentation de UnpackTuple
+
 template<unsigned int N>
 struct NzImplTupleUnpack
 {
diff --git a/include/Nazara/Core/Functor.hpp b/include/Nazara/Core/Functor.hpp
index 4ecbeed25..be6e617e1 100644
--- a/include/Nazara/Core/Functor.hpp
+++ b/include/Nazara/Core/Functor.hpp
@@ -7,7 +7,7 @@
 #ifndef NAZARA_FUNCTOR_HPP
 #define NAZARA_FUNCTOR_HPP
 
-#include <Nazara/Core/Tuple.hpp>
+#include <Nazara/Core/Algorithm.hpp>
 
 // Inspiré du code de la SFML par Laurent Gomila