--- a/src/yapf/yapf.hpp	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/yapf/yapf.hpp	Tue Jan 22 21:00:30 2008 +0000
@@ -7,23 +7,23 @@
 
 #include "track_dir.hpp"
 
-#include "../vehicle.h"
+#include "../vehicle_base.h"
 #include "../depot.h"
 #include "../road_map.h"
 #include "../tunnel_map.h"
 #include "../bridge_map.h"
+#include "../tunnelbridge_map.h"
 #include "../bridge.h"
 #include "../station.h"
 #include "../station_map.h"
-#include "../date.h"
-#include "../functions.h"
+#include "../tile_cmd.h"
 #include "../landscape.h"
 #include "yapf.h"
 #include "../pathfind.h"
 #include "../waypoint.h"
 #include "../debug.h"
+#include "../settings_type.h"
 
-extern Patches _patches_newgame;
 extern uint64 _rdtsc();
 
 #include <limits.h>