diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index e11bdd753d..53a69db455 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -29,6 +29,7 @@
 #include "effectvehicle_func.h"
 #include "settings_type.h"
 #include "station_base.h"
+#include "cargotype.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 763f2022f2..458a6efc24 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -24,6 +24,7 @@
 #include "window_gui.h"
 #include "engine_gui.h"
 #include "settings_type.h"
+#include "cargotype.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/engine.cpp b/src/engine.cpp
index d39c86f6aa..030b3ca8a7 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -9,6 +9,7 @@
 #include "news_func.h"
 #include "variables.h"
 #include "aircraft.h"
+#include "newgrf.h"
 #include "newgrf_engine.h"
 #include "group.h"
 #include "strings_func.h"
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index e99b04d76d..ce7e7e6ead 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -7,6 +7,7 @@
 #include "train.h"
 #include "roadveh.h"
 #include "company_func.h"
+#include "newgrf.h"
 #include "newgrf_engine.h"
 #include "newgrf_spritegroup.h"
 #include "date_func.h"
diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h
index 930d742ff6..f712dd5b31 100644
--- a/src/newgrf_engine.h
+++ b/src/newgrf_engine.h
@@ -5,7 +5,6 @@
 #ifndef NEWGRF_ENGINE_H
 #define NEWGRF_ENGINE_H
 
-#include "newgrf.h"
 #include "direction_type.h"
 #include "newgrf_cargo.h"
 
diff --git a/src/newgrf_sound.cpp b/src/newgrf_sound.cpp
index f8eb1c79b4..9859bd27b8 100644
--- a/src/newgrf_sound.cpp
+++ b/src/newgrf_sound.cpp
@@ -4,6 +4,7 @@
 
 #include "stdafx.h"
 #include "engine_base.h"
+#include "newgrf.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "vehicle_base.h"
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 891f3d3801..edc1d3960d 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -31,6 +31,7 @@
 #include "effectvehicle_func.h"
 #include "settings_type.h"
 #include "roadstop_base.h"
+#include "cargotype.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 332101a541..1f04cf3d0e 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -30,6 +30,7 @@
 #include "settings_type.h"
 #include "ai/ai.hpp"
 #include "pathfind.h"
+#include "landscape_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 29bbce8888..cffd8c7ef4 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -31,6 +31,7 @@
 #include "vehiclelist.h"
 #include "settings_type.h"
 #include "articulated_vehicles.h"
+#include "cargotype.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"