diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp
index 97eecc1b9a..02500a0fd0 100644
--- a/src/newgrf_airporttiles.cpp
+++ b/src/newgrf_airporttiles.cpp
@@ -270,7 +270,7 @@ static void AirportDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGrou
 	SpriteID pal   = dts->ground.pal;
 
 	if (GB(image, 0, SPRITE_WIDTH) != 0) {
-		if (image == SPR_FLAT_WATER_TILE && GetWaterClass(ti->tile) != WATER_CLASS_INVALID) {
+		if (image == SPR_FLAT_WATER_TILE && IsTileOnWater(ti->tile)) {
 			DrawWaterClassGround(ti);
 		} else {
 			DrawGroundSprite(image, GroundSpritePaletteTransform(image, pal, GENERAL_SPRITE_COLOUR(colour)));
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 7e6faee27f..454409bdd3 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -401,7 +401,7 @@ static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile, TileType t)
 			return GetIndustrySpec(Industry::GetByTile(tile)->type)->map_colour * 0x01010101;
 		} else {
 			/* Otherwise, return the colour which will make it disappear */
-			t = (GetWaterClass(tile) == WATER_CLASS_INVALID) ? MP_CLEAR : MP_WATER;
+			t = (IsTileOnWater(tile) ? MP_WATER : MP_CLEAR);
 		}
 	}
 
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 12ea763d6f..74b4f484b6 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2663,7 +2663,7 @@ static void DrawTile_Station(TileInfo *ti)
 		}
 	}
 
-	if (IsBuoy(ti->tile) || IsDock(ti->tile) || (IsOilRig(ti->tile) && GetWaterClass(ti->tile) != WATER_CLASS_INVALID)) {
+	if (IsBuoy(ti->tile) || IsDock(ti->tile) || (IsOilRig(ti->tile) && IsTileOnWater(ti->tile))) {
 		if (ti->tileh == SLOPE_FLAT) {
 			DrawWaterClassGround(ti);
 		} else {
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 6f24956b15..8b17d968f1 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -485,7 +485,7 @@ static bool IsWateredTile(TileIndex tile, Direction from)
 				if ((IsTileType(src_tile, MP_STATION) && IsOilRig(src_tile)) ||
 				    (IsTileType(src_tile, MP_INDUSTRY))) return true;
 
-				return GetWaterClass(tile) != WATER_CLASS_INVALID;
+				return IsTileOnWater(tile);
 			}
 			return (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);