diff --git a/src/saveload/object_sl.cpp b/src/saveload/object_sl.cpp
--- a/src/saveload/object_sl.cpp
+++ b/src/saveload/object_sl.cpp
@@ -31,10 +31,8 @@ static const SaveLoad _object_desc[] = {
 
 static void Save_OBJS()
 {
-	Object *o;
-
 	/* Write the objects */
-	FOR_ALL_OBJECTS(o) {
+	for (Object *o : Object::Iterate()) {
 		SlSetArrayIndex(o->index);
 		SlObject(o, _object_desc);
 	}
@@ -51,8 +49,7 @@ static void Load_OBJS()
 
 static void Ptrs_OBJS()
 {
-	Object *o;
-	FOR_ALL_OBJECTS(o) {
+	for (Object *o : Object::Iterate()) {
 		SlObject(o, _object_desc);
 		if (IsSavegameVersionBefore(SLV_148) && !IsTileType(o->location.tile, MP_OBJECT)) {
 			/* Due to a small bug stale objects could remain. */