diff --git a/SDK/include/NDK/Entity.hpp b/SDK/include/NDK/Entity.hpp
index 57cc72a66..4ad4f86aa 100644
--- a/SDK/include/NDK/Entity.hpp
+++ b/SDK/include/NDK/Entity.hpp
@@ -8,12 +8,13 @@
 #define NDK_ENTITY_HPP
 
 #include <Nazara/Core/Bitset.hpp>
-#include <NDK/Component.hpp>
+#include <NDK/Algorithm.hpp>
 #include <memory>
 #include <vector>
 
 namespace Ndk
 {
+	class BaseComponent;
 	class EntityHandle;
 	class World;
 
diff --git a/SDK/include/NDK/Entity.inl b/SDK/include/NDK/Entity.inl
index c3935b0bf..2d9bd42a7 100644
--- a/SDK/include/NDK/Entity.inl
+++ b/SDK/include/NDK/Entity.inl
@@ -9,12 +9,6 @@
 
 namespace Ndk
 {
-	inline Entity::Entity(World& world, EntityId id) :
-	m_id(id),
-	m_world(&world)
-	{
-	}
-
 	template<typename ComponentType, typename... Args>
 	ComponentType& Entity::AddComponent(Args&&... args)
 	{
diff --git a/SDK/src/NDK/Entity.cpp b/SDK/src/NDK/Entity.cpp
index 445efffa4..3600e46cf 100644
--- a/SDK/src/NDK/Entity.cpp
+++ b/SDK/src/NDK/Entity.cpp
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <NDK/Entity.hpp>
+#include <NDK/BaseComponent.hpp>
 #include <NDK/EntityHandle.hpp>
 #include <NDK/World.hpp>
 
@@ -21,6 +22,12 @@ namespace Ndk
 			handle->OnEntityMoved(this);
 	}
 
+	Entity::Entity(World& world, EntityId id) :
+	m_id(id),
+	m_world(&world)
+	{
+	}
+
 	Entity::~Entity()
 	{
 		Destroy();