diff --git a/include/nigiri/routing/interval_estimate.h b/include/nigiri/routing/interval_estimate.h
index f1b08bbf..dbee7220 100644
--- a/include/nigiri/routing/interval_estimate.h
+++ b/include/nigiri/routing/interval_estimate.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "nigiri/routing/journey.h"
+#include "nigiri/routing/limits.h"
 #include "nigiri/routing/pareto_set.h"
 #include "nigiri/routing/query.h"
 #include "nigiri/timetable.h"
@@ -14,10 +15,9 @@ struct interval_estimator {
       : tt_{tt}, q_{q} {
 
     auto const start_itv = std::visit(
-        utl::overloaded{[](unixtime_t const& ut) {
-                          return interval<unixtime_t>{ut, ut};
-                        },
-                        [](interval<unixtime_t> iut) { return iut; }},
+        utl::overloaded{
+            [](unixtime_t const& ut) { return interval<unixtime_t>{ut, ut}; },
+            [](interval<unixtime_t> iut) { return iut; }},
         q.start_time_);
 
     auto const ext = kMaxSearchIntervalSize - start_itv.size();
diff --git a/include/nigiri/routing/limits.h b/include/nigiri/routing/limits.h
index 7f2ffc86..9fbc8ac9 100644
--- a/include/nigiri/routing/limits.h
+++ b/include/nigiri/routing/limits.h
@@ -8,5 +8,7 @@ namespace nigiri::routing {
 
 static constexpr auto const kMaxTransfers = std::uint8_t{7U};
 static constexpr auto const kMaxTravelTime = 1_days;
+constexpr auto const kMaxSearchIntervalSize =
+    date::days{std::numeric_limits<duration_t::rep>::max() / 1440};
 
 }  // namespace nigiri::routing
diff --git a/include/nigiri/types.h b/include/nigiri/types.h
index 0954be75..475a673c 100644
--- a/include/nigiri/types.h
+++ b/include/nigiri/types.h
@@ -282,9 +282,6 @@ enum class direction { kForward, kBackward };
 
 using transport_mode_id_t = std::int32_t;
 
-constexpr auto const kMaxSearchIntervalSize =
-    date::days{std::numeric_limits<duration_t::rep>::max() / 1440};
-
 }  // namespace nigiri
 
 #include <iomanip>