diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -169,7 +169,7 @@ CommandCost CmdBuildRailWaypoint(TileInd
 
 	/* Check if the given station class is valid */
 	if (spec_class != STAT_CLASS_WAYP) return CMD_ERROR;
-	if (spec_index >= GetNumCustomStations(spec_class)) return CMD_ERROR;
+	if (spec_index >= StationClass::GetCount(spec_class)) return CMD_ERROR;
 
 	/* The number of parts to build */
 	byte count = axis == AXIS_X ? height : width;
@@ -241,7 +241,7 @@ CommandCost CmdBuildRailWaypoint(TileInd
 
 		wp->UpdateVirtCoord();
 
-		const StationSpec *spec = GetCustomStationSpec(spec_class, spec_index);
+		const StationSpec *spec = StationClass::Get(spec_class, spec_index);
 		byte *layout_ptr = AllocaM(byte, count);
 		if (spec == NULL) {
 			/* The layout must be 0 for the 'normal' waypoints by design. */