--- a/src/newgrf_cargo.h	Sat Jan 06 07:26:15 2007 +0000
+++ b/src/newgrf_cargo.h	Sat Jan 06 13:26:04 2007 +0000
@@ -52,9 +52,9 @@
 	NUM_GLOBAL_CID  =  32
 };
 
-VARDEF const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
-VARDEF const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
-VARDEF const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
-VARDEF const uint32 cargo_classes[16];
+extern const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
+extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
+extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
+extern const uint32 cargo_classes[16];
 
 #endif /* NEWGRF_CARGO_H */

--- a/src/newgrf_engine.h	Sat Jan 06 07:26:15 2007 +0000
+++ b/src/newgrf_engine.h	Sat Jan 06 13:26:04 2007 +0000
@@ -13,10 +13,6 @@
 extern int _traininfo_vehicle_pitch;
 extern int _traininfo_vehicle_width;
 
-extern const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
-extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
-extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
-extern const uint32 cargo_classes[16];
 
 void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, byte *train_id, int trains);
 void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group);