15 files changed, 3 insertions, 14 deletions
diff --git a/src/ai/api/ai_abstractlist.cpp b/src/ai/api/ai_abstractlist.cpp
index 6194558eb..4d5cea3cb 100644
--- a/src/ai/api/ai_abstractlist.cpp
+++ b/src/ai/api/ai_abstractlist.cpp
@@ -9,7 +9,6 @@
 
 /** @file ai_abstractlist.cpp Implementation of AIAbstractList. */
 
-#include <squirrel.h>
 #include "ai_abstractlist.hpp"
 #include "../../debug.h"
 #include "../../script/squirrel.hpp"
diff --git a/src/ai/api/ai_controller.cpp b/src/ai/api/ai_controller.cpp
index 6852e1142..9084fbc4c 100644
--- a/src/ai/api/ai_controller.cpp
+++ b/src/ai/api/ai_controller.cpp
@@ -13,9 +13,7 @@
 #include "../../string_func.h"
 #include "../../company_base.h"
 #include "../../rev.h"
-#include "table/strings.h"
 
-#include "../ai.hpp"
 #include "ai_controller.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
diff --git a/src/ai/api/ai_engine.cpp b/src/ai/api/ai_engine.cpp
index 157ee825d..3793b748c 100644
--- a/src/ai/api/ai_engine.cpp
+++ b/src/ai/api/ai_engine.cpp
@@ -14,7 +14,6 @@
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../strings_func.h"
-#include "../../settings_type.h"
 #include "../../rail.h"
 #include "../../engine_base.h"
 #include "../../articulated_vehicles.h"
diff --git a/src/ai/api/ai_execmode.cpp b/src/ai/api/ai_execmode.cpp
index 680887770..0cede135f 100644
--- a/src/ai/api/ai_execmode.cpp
+++ b/src/ai/api/ai_execmode.cpp
@@ -10,7 +10,6 @@
 /** @file ai_execmode.cpp Implementation of AIExecMode. */
 
 #include "ai_execmode.hpp"
-#include "../../command_type.h"
 #include "../../company_base.h"
 #include "../../company_func.h"
 #include "../ai_instance.hpp"
diff --git a/src/ai/api/ai_group.cpp b/src/ai/api/ai_group.cpp
index 0aad40cf5..b1ececbe1 100644
--- a/src/ai/api/ai_group.cpp
+++ b/src/ai/api/ai_group.cpp
@@ -16,7 +16,6 @@
 #include "../../group.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../command_func.h"
 #include "../../autoreplace_func.h"
 #include "../../settings_func.h"
 #include "table/strings.h"
diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp
index 8bf892c8e..993a88993 100644
--- a/src/ai/api/ai_industrytype.cpp
+++ b/src/ai/api/ai_industrytype.cpp
@@ -14,6 +14,7 @@
 #include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../industry.h"
+#include "../../core/random_func.hpp"
 
 /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)
 {
diff --git a/src/ai/api/ai_list.cpp b/src/ai/api/ai_list.cpp
index f93e504f1..4194d10e8 100644
--- a/src/ai/api/ai_list.cpp
+++ b/src/ai/api/ai_list.cpp
@@ -9,7 +9,6 @@
 
 /** @file ai_list.cpp Implementation of AIList. */
 
-#include <squirrel.h>
 #include "ai_list.hpp"
 
 void AIList::AddItem(int32 item, int32 value)
diff --git a/src/ai/api/ai_map.cpp b/src/ai/api/ai_map.cpp
index d5728b9eb..c9432fa26 100644
--- a/src/ai/api/ai_map.cpp
+++ b/src/ai/api/ai_map.cpp
@@ -9,7 +9,6 @@
 
 /** @file ai_map.cpp Implementation of AIMap. */
 
-#include "../../stdafx.h"
 #include "ai_map.hpp"
 #include "../../tile_map.h"
 
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index c6b0da1bc..eb9e247e7 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/ai/api/ai_object.cpp
@@ -14,8 +14,6 @@
 #include "../../script/squirrel.hpp"
 #include "../../company_base.h"
 
-#include "table/strings.h"
-#include "../ai.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 #include "ai_error.hpp"
diff --git a/src/ai/api/ai_rail.cpp b/src/ai/api/ai_rail.cpp
index 39781bc44..eb2e01628 100644
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -16,6 +16,7 @@
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
+#include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
 
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index c221bbff0..c43eb64ec 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -9,7 +9,6 @@
 
 /** @file ai_road.cpp Implementation of AIRoad. */
 
-#include "../../stdafx.h"
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp
index af9d184c8..670355dff 100644
--- a/src/ai/api/ai_station.cpp
+++ b/src/ai/api/ai_station.cpp
@@ -9,7 +9,6 @@
 
 /** @file ai_station.cpp Implementation of AIStation. */
 
-#include "../../stdafx.h"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
diff --git a/src/ai/api/ai_testmode.cpp b/src/ai/api/ai_testmode.cpp
index d7dc82ee3..832aff329 100644
--- a/src/ai/api/ai_testmode.cpp
+++ b/src/ai/api/ai_testmode.cpp
@@ -10,7 +10,6 @@
 /** @file ai_testmode.cpp Implementation of AITestMode. */
 
 #include "ai_testmode.hpp"
-#include "../../command_type.h"
 #include "../../company_base.h"
 #include "../../company_func.h"
 #include "../ai_instance.hpp"
diff --git a/src/ai/api/ai_tile.cpp b/src/ai/api/ai_tile.cpp
index aeaba0b06..04c977626 100644
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -14,7 +14,6 @@
 #include "ai_town.hpp"
 #include "../../station_func.h"
 #include "../../company_func.h"
-#include "../../road_map.h"
 #include "../../water_map.h"
 #include "../../clear_map.h"
 #include "../../tree_map.h"
diff --git a/src/ai/api/ai_vehicle.cpp b/src/ai/api/ai_vehicle.cpp
index 03f39bae6..6784ee4b8 100644
--- a/src/ai/api/ai_vehicle.cpp
+++ b/src/ai/api/ai_vehicle.cpp
@@ -22,6 +22,7 @@
 #include "../../roadveh.h"
 #include "../../train.h"
 #include "../../vehicle_func.h"
+#include "../../engine_base.h"
 #include "table/strings.h"
 
 /* static */ bool AIVehicle::IsValidVehicle(VehicleID vehicle_id)