The only way it could not include Iran is if they surrendered before being attacked.
The question would be what is the time gap between the Psalm 83 War and Gog and Magog? There will be enough time for Israel to think that it can live in peace, to become prosperous (they say it will take a year to start getting gas from the new off-shore gas fields)... but I don't expect it will be much longer than a year. I don't believe Iran will wait too long!