diff --git a/src/roadstop_base.h b/src/roadstop_base.h
index 3c0ecf129e..af95fee4f8 100644
--- a/src/roadstop_base.h
+++ b/src/roadstop_base.h
@@ -15,7 +15,7 @@
 #include "core/bitmath_func.hpp"
 #include "vehicle_type.h"
 
-typedef Pool<RoadStop, RoadStopID, 32, 64000> RoadStopPool;
+using RoadStopPool = Pool<RoadStop, RoadStopID, 32, RoadStopID::End().base()>;
 extern RoadStopPool _roadstop_pool;
 
 /** A Stop for a Road Vehicle */
diff --git a/src/station_type.h b/src/station_type.h
index a6c5223195..b6438d2eb8 100644
--- a/src/station_type.h
+++ b/src/station_type.h
@@ -10,11 +10,12 @@
 #ifndef STATION_TYPE_H
 #define STATION_TYPE_H
 
+#include "core/pool_type.hpp"
 #include "core/smallstack_type.hpp"
 #include "tilearea_type.h"
 
 typedef uint16_t StationID;
-typedef uint16_t RoadStopID;
+using RoadStopID = PoolID<uint16_t, struct RoadStopIDTag, 64000, 0xFFFF>;
 
 struct BaseStation;
 struct Station;