--- a/src/rail_cmd.cpp	Mon Mar 19 09:33:17 2007 +0000
+++ b/src/rail_cmd.cpp	Mon Mar 19 12:38:16 2007 +0000
@@ -879,7 +879,7 @@
 
 			/* update power of trains in this depot */
 			FOR_ALL_VEHICLES(v) {
-				if (v->type == VEH_Train && IsFrontEngine(v) && v->tile == tile && v->u.rail.track == 0x80) {
+				if (v->type == VEH_TRAIN && IsFrontEngine(v) && v->tile == tile && v->u.rail.track == 0x80) {
 					TrainPowerChanged(v);
 				}
 			}
@@ -1417,7 +1417,7 @@
 	DrawTileSequence(x, y, dts->ground_sprite + offset, dts->seq, 0);
 }
 
-typedef struct SetSignalsData {
+struct SetSignalsData {
 	int cur;
 	int cur_stack;
 	bool stop;
@@ -1435,7 +1435,7 @@
 	TileIndex next_tile[NUM_SSD_STACK];
 	DiagDirectionByte next_dir[NUM_SSD_STACK];
 
-} SetSignalsData;
+};
 
 static bool SetSignalsEnumProc(TileIndex tile, void* data, Trackdir trackdir, uint length, byte* state)
 {
@@ -1473,16 +1473,16 @@
 }
 
 /* Struct to parse data from VehicleFromPos to SignalVehicleCheckProc */
-typedef struct SignalVehicleCheckStruct {
+struct SignalVehicleCheckStruct {
 	TileIndex tile;
 	uint track;
-} SignalVehicleCheckStruct;
+};
 
 static void *SignalVehicleCheckProc(Vehicle *v, void *data)
 {
 	const SignalVehicleCheckStruct* dest = (SignalVehicleCheckStruct*)data;
 
-	if (v->type != VEH_Train) return NULL;
+	if (v->type != VEH_TRAIN) return NULL;
 
 	/* Wrong tile, or no train? Not a match */
 	if (v->tile != dest->tile) return NULL;
@@ -1888,7 +1888,7 @@
 static void ClickTile_Track(TileIndex tile)
 {
 	switch (GetRailTileType(tile)) {
-		case RAIL_TILE_DEPOT:    ShowDepotWindow(tile, VEH_Train);                  break;
+		case RAIL_TILE_DEPOT:    ShowDepotWindow(tile, VEH_TRAIN);                  break;
 		case RAIL_TILE_WAYPOINT: ShowRenameWaypointWindow(GetWaypointByTile(tile)); break;
 		default: break;
 	}
@@ -1951,7 +1951,7 @@
 	int length;
 
 	// this routine applies only to trains in depot tiles
-	if (v->type != VEH_Train || !IsTileDepotType(tile, TRANSPORT_RAIL)) return VETSB_CONTINUE;
+	if (v->type != VEH_TRAIN || !IsTileDepotType(tile, TRANSPORT_RAIL)) return VETSB_CONTINUE;
 
 	/* depot direction */
 	dir = GetRailDepotDirection(tile);