diff --git a/src/script/api/script_tilelist.cpp b/src/script/api/script_tilelist.cpp
--- a/src/script/api/script_tilelist.cpp
+++ b/src/script/api/script_tilelist.cpp
@@ -21,7 +21,7 @@ void ScriptTileList::AddRectangle(TileIn
 	if (!::IsValidTile(t2)) return;
 
 	TileArea ta(t1, t2);
-	TILE_AREA_LOOP(t, ta) this->AddItem(t);
+	for (TileIndex t : ta) this->AddItem(t);
 }
 
 void ScriptTileList::AddTile(TileIndex tile)
@@ -37,7 +37,7 @@ void ScriptTileList::RemoveRectangle(Til
 	if (!::IsValidTile(t2)) return;
 
 	TileArea ta(t1, t2);
-	TILE_AREA_LOOP(t, ta) this->RemoveItem(t);
+	for (TileIndex t : ta) this->RemoveItem(t);
 }
 
 void ScriptTileList::RemoveTile(TileIndex tile)
@@ -55,7 +55,7 @@ void ScriptTileList::RemoveTile(TileInde
  */
 static void FillIndustryCatchment(const Industry *i, int radius, BitmapTileArea &bta)
 {
-	TILE_AREA_LOOP(cur_tile, i->location) {
+	for (TileIndex cur_tile : i->location) {
 		if (!::IsTileType(cur_tile, MP_INDUSTRY) || ::GetIndustryIndex(cur_tile) != i->index) continue;
 
 		int tx = TileX(cur_tile);
@@ -156,7 +156,7 @@ ScriptTileList_StationType::ScriptTileLi
 	if ((station_type & ScriptStation::STATION_DOCK) != 0)       station_type_value |= (1 << ::STATION_DOCK)    | (1 << ::STATION_OILRIG);
 
 	TileArea ta(::TileXY(rect->left, rect->top), rect->right - rect->left + 1, rect->bottom - rect->top + 1);
-	TILE_AREA_LOOP(cur_tile, ta) {
+	for (TileIndex cur_tile : ta) {
 		if (!::IsTileType(cur_tile, MP_STATION)) continue;
 		if (::GetStationIndex(cur_tile) != station_id) continue;
 		if (!HasBit(station_type_value, ::GetStationType(cur_tile))) continue;