diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -230,7 +230,4 @@ struct PersistentStorage : PersistentSto
 
 assert_compile(cpp_lengthof(OldPersistentStorage, storage) <= cpp_lengthof(PersistentStorage, storage));
 
-#define FOR_ALL_STORAGES_FROM(var, start) FOR_ALL_ITEMS_FROM(PersistentStorage, storage_index, var, start)
-#define FOR_ALL_STORAGES(var) FOR_ALL_STORAGES_FROM(var, 0)
-
 #endif /* NEWGRF_STORAGE_H */
diff --git a/src/saveload/storage_sl.cpp b/src/saveload/storage_sl.cpp
--- a/src/saveload/storage_sl.cpp
+++ b/src/saveload/storage_sl.cpp
@@ -36,10 +36,8 @@ static void Load_PSAC()
 /** Save persistent storage data. */
 static void Save_PSAC()
 {
-	PersistentStorage *ps;
-
 	/* Write the industries */
-	FOR_ALL_STORAGES(ps) {
+	for (PersistentStorage *ps : PersistentStorage::Iterate()) {
 		ps->ClearChanges();
 		SlSetArrayIndex(ps->index);
 		SlObject(ps, _storage_desc);