From 8bc9adde1940f6f312e5321717437ed13ec7f0ec Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Wed, 24 Jun 2009 22:38:47 +0000
Subject: [PATCH] (svn r16648) -Codechange: move some more includes around

---
 src/aircraft_cmd.cpp      | 1 +
 src/build_vehicle_gui.cpp | 1 +
 src/newgrf_engine.h       | 2 +-
 src/roadveh_cmd.cpp       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 53a69db455..4c2fd57a1f 100644
--- a/src/aircraft_cmd.cpp
+++ b/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"
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 458a6efc24..0a276dcb4c 100644
--- a/src/build_vehicle_gui.cpp
+++ b/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"
diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h
index f712dd5b31..7a796a10d8 100644
--- a/src/newgrf_engine.h
+++ b/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;
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index edc1d3960d..2b259635fb 100644
--- a/src/roadveh_cmd.cpp
+++ b/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"