--- a/src/station.cpp	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/station.cpp	Tue Jan 22 21:00:30 2008 +0000
@@ -6,23 +6,12 @@
 #include "openttd.h"
 #include "bridge_map.h"
 #include "debug.h"
-#include "functions.h"
 #include "station_map.h"
-#include "table/sprites.h"
-#include "table/strings.h"
-#include "map.h"
-#include "tile.h"
 #include "station.h"
-#include "gfx.h"
-#include "window.h"
-#include "viewport.h"
-#include "command.h"
 #include "town.h"
-#include "vehicle.h"
 #include "news.h"
 #include "saveload.h"
-#include "economy.h"
-#include "player.h"
+#include "player_func.h"
 #include "airport.h"
 #include "sprite.h"
 #include "depot.h"
@@ -32,10 +21,19 @@
 #include "newgrf_callbacks.h"
 #include "newgrf_station.h"
 #include "yapf/yapf.h"
-#include "date.h"
-#include "helpers.hpp"
 #include "cargotype.h"
 #include "roadveh.h"
+#include "station_gui.h"
+#include "zoom_func.h"
+#include "functions.h"
+#include "window_func.h"
+#include "date_func.h"
+#include "variables.h"
+#include "settings_type.h"
+#include "command_func.h"
+
+#include "table/sprites.h"
+#include "table/strings.h"
 
 Station::Station(TileIndex tile)
 {
@@ -66,7 +64,7 @@
 {
 	DEBUG(station, cDebugCtorLevel, "I-%3d", index);
 
-	DeleteName(this->string_id);
+	free(this->name);
 	free(this->speclist);
 
 	if (CleaningPool()) return;
@@ -133,7 +131,7 @@
 void Station::MarkDirty() const
 {
 	if (sign.width_1 != 0) {
-		InvalidateWindowWidget(WC_STATION_VIEW, index, 1);
+		InvalidateWindowWidget(WC_STATION_VIEW, index, SVW_CAPTION);
 
 		/* We use ZOOM_LVL_MAX here, as every viewport can have an other zoom,
 		 *  and there is no way for us to know which is the biggest. So make the