diff --git a/waypoint.h b/waypoint.h
--- a/waypoint.h
+++ b/waypoint.h
@@ -42,11 +42,6 @@ static inline uint16 GetWaypointPoolSize
 	return _waypoint_pool.total_items;
 }
 
-static inline bool IsWaypointIndex(uint index)
-{
-	return index < GetWaypointPoolSize();
-}
-
 /**
  * Check if a Waypoint really exists.
  */
@@ -55,6 +50,11 @@ static inline bool IsValidWaypoint(const
 	return wp->xy != 0;
 }
 
+static inline bool IsValidWaypointID(uint index)
+{
+	return index < GetWaypointPoolSize() && IsValidWaypoint(GetWaypoint(index));
+}
+
 #define FOR_ALL_WAYPOINTS_FROM(wp, start) for (wp = GetWaypoint(start); wp != NULL; wp = (wp->index + 1 < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1) : NULL) if (IsValidWaypoint(wp))
 #define FOR_ALL_WAYPOINTS(wp) FOR_ALL_WAYPOINTS_FROM(wp, 0)