--- a/src/openttd.cpp	Wed Apr 16 22:34:14 2008 +0000
+++ b/src/openttd.cpp	Fri Apr 18 19:55:13 2008 +0000
@@ -46,7 +46,6 @@
 #include "network/network.h"
 #include "signs_base.h"
 #include "signs_func.h"
-#include "depot.h"
 #include "waypoint.h"
 #include "ai/ai.h"
 #include "train.h"
@@ -59,6 +58,7 @@
 #include "strings_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
+#include "cheat_func.h"
 
 #include "newgrf.h"
 #include "newgrf_config.h"
@@ -85,6 +85,8 @@
 
 #include "table/strings.h"
 
+StringID _switch_mode_errorstr;
+
 void CallLandscapeTick();
 void IncreaseDate();
 void DoPaletteAnimations();
@@ -1923,7 +1925,7 @@
 					}
 
 					/* Clear PBS reservation on track */
-					if (!IsTileDepotType(t, TRANSPORT_RAIL)) {
+					if (!IsRailDepotTile(t)) {
 						SB(_m[t].m4, 4, 4, 0);
 					} else {
 						ClrBit(_m[t].m3, 6);