(svn r16648) -Codechange: move some more includes around

src/aircraft_cmd.cpp

@@ -30,6 +30,7 @@
 #include "settings_type.h"
 #include "station_base.h"
 #include "cargotype.h"
+#include "newgrf_cargo.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/build_vehicle_gui.cpp

@@ -25,6 +25,7 @@
 #include "engine_gui.h"
 #include "settings_type.h"
 #include "cargotype.h"
+#include "newgrf_cargo.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/newgrf_engine.h

@@ -6,7 +6,7 @@
 #define NEWGRF_ENGINE_H
 
 #include "direction_type.h"
-#include "newgrf_cargo.h"
+#include "newgrf_callbacks.h"
 
 extern int _traininfo_vehicle_pitch;
 extern int _traininfo_vehicle_width;

src/roadveh_cmd.cpp

@@ -32,6 +32,7 @@
 #include "settings_type.h"
 #include "roadstop_base.h"
 #include "cargotype.h"
+#include "newgrf_cargo.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"