--- a/src/genworld.cpp	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/genworld.cpp	Tue Jan 22 21:00:30 2008 +0000
@@ -4,23 +4,29 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "functions.h"
 #include "landscape.h"
-#include "player.h"
-#include "table/sprites.h"
+#include "player_func.h"
 #include "variables.h"
 #include "thread.h"
-#include "command.h"
+#include "command_func.h"
 #include "genworld.h"
-#include "gfx.h"
 #include "gfxinit.h"
-#include "gui.h"
+#include "window_func.h"
 #include "network/network.h"
 #include "debug.h"
-#include "settings.h"
+#include "settings_func.h"
 #include "heightmap.h"
-#include "date.h"
-#include "viewport.h"
+#include "viewport_func.h"
+#include "gfx_func.h"
+#include "map_func.h"
+#include "date_func.h"
+#include "core/random_func.hpp"
+#include "engine.h"
+#include "settings_type.h"
+#include "newgrf_storage.h"
+#include "water.h"
+
+#include "table/sprites.h"
 
 void GenerateClearTile();
 void GenerateIndustries();
@@ -114,6 +120,8 @@
 		}
 	}
 
+	ClearStorageChanges(true);
+
 	/* These are probably pointless when inside the scenario editor. */
 	SetGeneratingWorldProgress(GWP_GAME_INIT, 3);
 	StartupPlayers();