4 files changed, 6 insertions, 4 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index ae0e247de..71c12c664 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -12,7 +12,6 @@
 #include "../../station_map.h"
 #include "../../player.h"
 #include "../../tunnel_map.h"
-#include "../../vehicle.h"
 #include "../../engine.h"
 #include "../../command_func.h"
 #include "../../town.h"
@@ -26,6 +25,7 @@
 #include "../../date_func.h"
 #include "../../tunnelbridge_map.h"
 #include "../../window_func.h"
+#include "../../vehicle_func.h"
 #include "../../functions.h"
 #include "default.h"
 
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp
index 3b6b044ec..d54575666 100644
--- a/src/ai/trolly/build.cpp
+++ b/src/ai/trolly/build.cpp
@@ -4,13 +4,14 @@
 #include "../../openttd.h"
 #include "../../debug.h"
 #include "../../road_map.h"
-#include "../../vehicle.h"
 #include "../../command_func.h"
 #include "trolly.h"
 #include "../../engine.h"
 #include "../../station.h"
 #include "../../variables.h"
 #include "../../bridge.h"
+#include "../../vehicle_func.h"
+#include "../../vehicle_base.h"
 #include "../ai.h"
 
 // Build HQ
diff --git a/src/ai/trolly/shared.cpp b/src/ai/trolly/shared.cpp
index 6af9c199d..2b80021fa 100644
--- a/src/ai/trolly/shared.cpp
+++ b/src/ai/trolly/shared.cpp
@@ -4,8 +4,8 @@
 #include "../../openttd.h"
 #include "../../debug.h"
 #include "../../map_func.h"
+#include "../../vehicle_base.h"
 #include "trolly.h"
-#include "../../vehicle.h"
 
 int AiNew_GetRailDirection(TileIndex tile_a, TileIndex tile_b, TileIndex tile_c)
 {
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp
index fe0f91395..9ca8988b6 100644
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -31,7 +31,8 @@
 #include "../../engine.h"
 #include "../../gui.h"
 #include "../../depot.h"
-#include "../../vehicle.h"
+#include "../../vehicle_base.h"
+#include "../../vehicle_func.h"
 #include "../../date_func.h"
 #include "../ai.h"
 #include "../../order.h"