--- a/src/npf.h	Fri Nov 23 16:59:30 2007 +0000
+++ b/src/npf.h	Wed Jan 09 18:11:12 2008 +0000
@@ -5,11 +5,11 @@
 #ifndef NPF_H
 #define NPF_H
 
-#include "openttd.h"
 #include "aystar.h"
 #include "station.h"
-#include "vehicle.h"
-#include "tile.h"
+#include "vehicle_type.h"
+#include "tile_type.h"
+#include "track_type.h"
 
 /* mowing grass */
 enum {