diff --git a/SDK/include/NDK/Algorithm.hpp b/SDK/include/NDK/Algorithm.hpp
index 7c8de5a31..ece1d5d37 100644
--- a/SDK/include/NDK/Algorithm.hpp
+++ b/SDK/include/NDK/Algorithm.hpp
@@ -11,16 +11,13 @@
 
 namespace Ndk
 {
-	class BaseComponent;
-	class BaseSystem;
-
 	template<unsigned int N> ComponentId BuildComponentId(const char (&name)[N]);
 	template<typename ComponentType> constexpr ComponentIndex GetComponentIndex();
 	template<typename SystemType> constexpr SystemIndex GetSystemIndex();
 	template<typename ComponentType, unsigned int N> ComponentIndex InitializeComponent(const char (&name)[N]);
 	template<typename SystemType> SystemIndex InitializeSystem();
-	template<typename ComponentType> bool IsComponent(BaseComponent& component);
-	template<typename SystemType> bool IsSystem(BaseSystem& system);
+	template<typename ComponentType, typename C> bool IsComponent(C& component);
+	template<typename SystemType, typename S> bool IsSystem(S& system);
 }
 
 #include <Ndk/Algorithm.inl>
diff --git a/SDK/include/NDK/Algorithm.inl b/SDK/include/NDK/Algorithm.inl
index 8392e0ed6..e79e3a901 100644
--- a/SDK/include/NDK/Algorithm.inl
+++ b/SDK/include/NDK/Algorithm.inl
@@ -3,8 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <Nazara/Core/Endianness.hpp>
-#include <Ndk/BaseComponent.hpp>
-#include <Ndk/BaseSystem.hpp>
 
 namespace Ndk
 {
@@ -47,14 +45,14 @@ namespace Ndk
 		return SystemType::systemIndex;
 	}
 
-	template<typename ComponentType>
-	bool IsComponent(BaseComponent& component)
+	template<typename ComponentType, typename C>
+	bool IsComponent(C& component)
 	{
 		return component.GetIndex() == GetComponentIndex<ComponentType>();
 	}
 
-	template<typename SystemType>
-	bool IsSystem(BaseSystem& system)
+	template<typename SystemType, typename S>
+	bool IsSystem(S& system)
 	{
 		return system.GetIndex() == GetSystemIndex<SystemType>();
 	}