diff --git a/src/component_pool.hpp b/src/component_pool.hpp
index 06f7815f6..be634e751 100644
--- a/src/component_pool.hpp
+++ b/src/component_pool.hpp
@@ -60,7 +60,7 @@ public:
     }
 
     const_iterator_type begin() const noexcept {
-        return direct.begin();
+        return direct.cbegin();
     }
 
     iterator_type end() noexcept {
@@ -68,7 +68,7 @@ public:
     }
 
     const_iterator_type end() const noexcept {
-        return direct.end();
+        return direct.cend();
     }
 
     bool has(entity_type entity) const noexcept {
diff --git a/test/benchmark.cpp b/test/benchmark.cpp
index ddfbdfbcd..36b1b4253 100644
--- a/test/benchmark.cpp
+++ b/test/benchmark.cpp
@@ -1,6 +1,5 @@
 #include <gtest/gtest.h>
 #include <registry.hpp>
-#include <functional>
 #include <iostream>
 #include <cstddef>
 #include <chrono>