diff --git a/src/core/base_bitset_type.hpp b/src/core/base_bitset_type.hpp
index 43da1d2983..aaea935658 100644
--- a/src/core/base_bitset_type.hpp
+++ b/src/core/base_bitset_type.hpp
@@ -13,6 +13,8 @@
 #ifndef BASE_BITSET_TYPE_HPP
 #define BASE_BITSET_TYPE_HPP
 
+#include "bitmath_func.hpp"
+
 /**
  * Base for bit set wrapper.
  * Allows wrapping strong type values as a bit set. Methods are loosely modelled on std::bitset.
@@ -206,6 +208,9 @@ public:
 		return (this->base() & Tmask) == this->base();
 	}
 
+	auto begin() const { return SetBitIterator<Tvalue_type>(this->data).begin(); }
+	auto end() const { return SetBitIterator<Tvalue_type>(this->data).end(); }
+
 private:
 	Tstorage data; ///< Bitmask of values.
 };