--- a/src/newgrf.h	Mon Dec 03 23:39:38 2007 +0000
+++ b/src/newgrf.h	Tue Jan 22 21:00:30 2008 +0000
@@ -6,11 +6,10 @@
 #define NEWGRF_H
 
 #include "station.h"
-#include "town.h"
+#include "town_type.h"
 #include "newgrf_config.h"
-#include "helpers.hpp"
 #include "cargotype.h"
-#include "industry.h"
+#include "industry_type.h"
 #include "newgrf_fsmports.h"
 
 enum GrfLoadingStage {
@@ -43,6 +42,7 @@
 
 struct GRFFile {
 	char *filename;
+	bool is_ottdfile;
 	uint32 grfid;
 	uint16 sprite_offset;
 	byte grf_version;
@@ -87,13 +87,10 @@
 
 extern GRFFile *_first_grffile;
 
-extern SpriteID _coast_base;
-
 struct GRFLoadedFeatures {
 	bool has_2CC;             ///< Set if any vehicle is loaded which uses 2cc (two company colours).
 	bool has_newhouses;       ///< Set if there are any newhouses loaded.
 	bool has_newindustries;   ///< Set if there are any newindustries loaded.
-	bool has_newwater;        ///< Set it there are any newwater grf loaded
 };
 
 /* Indicates which are the newgrf features currently loaded ingame */