diff -r 88c5ce6a5215 -r 8afdd9877afd src/openttd.h
--- a/src/openttd.h	Wed Dec 19 20:45:46 2007 +0000
+++ b/src/openttd.h	Wed Dec 19 23:26:02 2007 +0000
@@ -26,10 +26,10 @@
 };
 
 #include "map.h"
-#include "slope.h"
+#include "slope_type.h"
+#include "vehicle_type.h"
 
 // Forward declarations of structs.
-struct Vehicle;
 struct Depot;
 struct Waypoint;
 struct Station;
@@ -55,7 +55,6 @@
 typedef EngineID *EngineList; ///< engine list type placeholder acceptable for C code (see helpers.cpp)
 
 /* IDs used in Pools */
-typedef uint16 VehicleID;
 typedef uint16 StationID;
 static const StationID INVALID_STATION = 0xFFFF;
 typedef uint16 RoadStopID;