diff --git a/SDK/include/NDK/EntityList.hpp b/SDK/include/NDK/EntityList.hpp
index 0f89d0cad..3b4f1580a 100644
--- a/SDK/include/NDK/EntityList.hpp
+++ b/SDK/include/NDK/EntityList.hpp
@@ -55,7 +55,7 @@ namespace Ndk
 			World* m_world;
 	};
 
-	class NDK_API EntityList::iterator : public std::iterator<std::forward_iterator_tag, const EntityHandle>
+	class NDK_API EntityList::iterator
 	{
 		friend EntityList;
 
@@ -73,6 +73,12 @@ namespace Ndk
 
 			friend inline void swap(iterator& lhs, iterator& rhs);
 
+			using difference_type = std::ptrdiff_t;
+			using iterator_category = std::forward_iterator_tag;
+			using pointer = EntityHandle*;
+			using reference = EntityHandle&;
+			using value_type = EntityHandle;
+
 		private:
 			inline iterator(const EntityList* world, std::size_t nextId);