--- a/src/water.h	Sat Feb 02 03:23:26 2008 +0000
+++ b/src/water.h	Sat Feb 02 09:28:43 2008 +0000
@@ -11,10 +11,11 @@
 void ConvertGroundTilesIntoWaterTiles();
 
 void DrawShipDepotSprite(int x, int y, int image);
-void DrawCanalWater(TileIndex tile);
+void DrawCanalWater(TileIndex tile, bool draw_base);
+void DrawRiverWater(const struct TileInfo *ti, bool draw_base);
 void DrawShoreTile(Slope tileh);
 
-void MakeWaterOrCanalDependingOnOwner(TileIndex tile, Owner o);
-void MakeWaterOrCanalDependingOnSurroundings(TileIndex t, Owner o);
+void MakeWaterKeepingClass(TileIndex tile, Owner o);
+void SetWaterClassDependingOnSurroundings(TileIndex t);
 
 #endif /* WATER_H */