--- a/src/station.h	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/station.h	Tue Jan 22 21:00:30 2008 +0000
@@ -6,14 +6,15 @@
 #define STATION_H
 
 #include "airport.h"
-#include "player.h"
 #include "oldpool.h"
 #include "sprite.h"
-#include "tile.h"
-#include "road.h"
+#include "road_type.h"
 #include "newgrf_station.h"
 #include "newgrf_fsmports.h"
 #include "cargopacket.h"
+#include "cargo_type.h"
+#include "town_type.h"
+#include "core/geometry_type.hpp"
 #include <list>
 #include <set>
 
@@ -141,7 +142,8 @@
 	TileIndex airport_tile;
 	TileIndex dock_tile;
 	Town *town;
-	uint16 string_id;
+	StringID string_id;     ///< Default name (town area) of station
+	char *name;             ///< Custom name
 
 	ViewportSign sign;
 
@@ -261,10 +263,6 @@
 void ShowStationViewWindow(StationID station);
 void UpdateAllStationVirtCoord();
 
-/* sorter stuff */
-void RebuildStationLists();
-void ResortStationLists();
-
 static inline StationID GetMaxStationIndex()
 {
 	/* TODO - This isn't the real content of the function, but
@@ -310,6 +308,8 @@
 RoadStop * AllocateRoadStop();
 void ClearSlot(Vehicle *v);
 
+bool HasStationInUse(StationID station, PlayerID player);
+
 void DeleteOilRig(TileIndex t);
 
 #endif /* STATION_H */