diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d6dc9ffb..0fac3c1fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,7 @@ if(ENTT_INCLUDE_HEADERS)
         signal/emitter.hpp
         signal/fwd.hpp
         signal/sigh.hpp
+        stl/algorithm.hpp
         stl/array.hpp
         stl/atomic.hpp
         stl/functional.hpp
diff --git a/src/entt/core/algorithm.hpp b/src/entt/core/algorithm.hpp
index 233f5e4ca..a17d4c820 100644
--- a/src/entt/core/algorithm.hpp
+++ b/src/entt/core/algorithm.hpp
@@ -1,9 +1,9 @@
 #ifndef ENTT_CORE_ALGORITHM_HPP
 #define ENTT_CORE_ALGORITHM_HPP
 
-#include <algorithm>
 #include <concepts>
 #include <functional>
+#include "../stl/algorithm.hpp"
 #include "../stl/functional.hpp"
 #include "../stl/iterator.hpp"
 #include "../stl/utility.hpp"
diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp
index 3c9c061d9..b7b3f658c 100644
--- a/src/entt/entity/registry.hpp
+++ b/src/entt/entity/registry.hpp
@@ -1,7 +1,6 @@
 #ifndef ENTT_ENTITY_REGISTRY_HPP
 #define ENTT_ENTITY_REGISTRY_HPP
 
-#include <algorithm>
 #include <compare>
 #include <concepts>
 #include <cstddef>
@@ -17,6 +16,7 @@
 #include "../core/memory.hpp"
 #include "../core/type_info.hpp"
 #include "../core/type_traits.hpp"
+#include "../stl/algorithm.hpp"
 #include "../stl/array.hpp"
 #include "../stl/functional.hpp"
 #include "../stl/iterator.hpp"
diff --git a/src/entt/entity/runtime_view.hpp b/src/entt/entity/runtime_view.hpp
index 3b1bf3919..ad220f127 100644
--- a/src/entt/entity/runtime_view.hpp
+++ b/src/entt/entity/runtime_view.hpp
@@ -1,8 +1,8 @@
 #ifndef ENTT_ENTITY_RUNTIME_VIEW_HPP
 #define ENTT_ENTITY_RUNTIME_VIEW_HPP
 
-#include <algorithm>
 #include <cstddef>
+#include "../stl/algorithm.hpp"
 #include "../stl/iterator.hpp"
 #include "../stl/utility.hpp"
 #include "../stl/vector.hpp"
diff --git a/src/entt/entt.hpp b/src/entt/entt.hpp
index 68d2d9b93..40ce2d164 100644
--- a/src/entt/entt.hpp
+++ b/src/entt/entt.hpp
@@ -69,6 +69,7 @@ namespace entt::stl {}
 #include "signal/dispatcher.hpp"
 #include "signal/emitter.hpp"
 #include "signal/sigh.hpp"
+#include "stl/algorithm.hpp"
 #include "stl/array.hpp"
 #include "stl/atomic.hpp"
 #include "stl/functional.hpp"
diff --git a/src/entt/graph/flow.hpp b/src/entt/graph/flow.hpp
index 7aaec2599..b71cd3a5c 100644
--- a/src/entt/graph/flow.hpp
+++ b/src/entt/graph/flow.hpp
@@ -1,7 +1,6 @@
 #ifndef ENTT_GRAPH_FLOW_HPP
 #define ENTT_GRAPH_FLOW_HPP
 
-#include <algorithm>
 #include <concepts>
 #include <cstddef>
 #include <functional>
@@ -12,6 +11,7 @@
 #include "../core/compressed_pair.hpp"
 #include "../core/fwd.hpp"
 #include "../core/iterator.hpp"
+#include "../stl/algorithm.hpp"
 #include "../stl/functional.hpp"
 #include "../stl/iterator.hpp"
 #include "../stl/type_traits.hpp"
diff --git a/src/entt/stl/algorithm.hpp b/src/entt/stl/algorithm.hpp
new file mode 100644
index 000000000..e6bbd4113
--- /dev/null
+++ b/src/entt/stl/algorithm.hpp
@@ -0,0 +1,12 @@
+#ifndef ENTT_STL_ALGORITHM_HPP
+#define ENTT_STL_ALGORITHM_HPP
+
+#include <algorithm>
+
+/*! @cond ENTT_INTERNAL */
+namespace entt::stl {
+
+} // namespace entt::stl
+/*! @endcond */
+
+#endif