diff --git a/libs/ecs/include/psemek/ecs/accessor.hpp b/libs/ecs/include/psemek/ecs/accessor.hpp
index db0a2939..bcda087d 100644
--- a/libs/ecs/include/psemek/ecs/accessor.hpp
+++ b/libs/ecs/include/psemek/ecs/accessor.hpp
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <psemek/ecs/detail/table.hpp>
-#include <psemek/util/span.hpp>
-#include <psemek/util/range.hpp>
 #include <psemek/util/exception.hpp>
 #include <psemek/util/type_name.hpp>
 #include <psemek/util/to_string.hpp>
diff --git a/libs/ecs/include/psemek/ecs/container.hpp b/libs/ecs/include/psemek/ecs/container.hpp
index 47165184..e7e6ab34 100644
--- a/libs/ecs/include/psemek/ecs/container.hpp
+++ b/libs/ecs/include/psemek/ecs/container.hpp
@@ -8,12 +8,7 @@
 #include <psemek/ecs/detail/component_uuid_helper.hpp>
 #include <psemek/ecs/detail/without.hpp>
 #include <psemek/ecs/accessor.hpp>
-#include <psemek/ecs/without.hpp>
-#include <psemek/util/span.hpp>
 #include <psemek/util/range.hpp>
-#include <psemek/util/exception.hpp>
-#include <psemek/util/type_name.hpp>
-#include <psemek/util/to_string.hpp>
 
 #include <typeindex>