--- a/src/genworld.cpp	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/genworld.cpp	Wed Jan 09 18:11:12 2008 +0000
@@ -4,23 +4,24 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "functions.h"
 #include "landscape.h"
 #include "player.h"
 #include "table/sprites.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"
 
 void GenerateClearTile();
 void GenerateIndustries();