(svn r15299) -Cleanup: remove many redundant includes

42 files changed, 3 insertions, 147 deletions

diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp
index 2f08e0d14..1cad24bb7 100644
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -8,7 +8,6 @@
 #include "../core/random_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
-#include "ai_info.hpp"
 
 void AIConfig::ChangeAI(const char *name, int version)
 {
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index 60475f24b..e9e2a5bd2 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -3,18 +3,14 @@
 /** @file ai_core.cpp Implementation of AI. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
-#include "../company_type.h"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../debug.h"
 #include "../network/network.h"
 #include "../settings_type.h"
-#include "../window_type.h"
 #include "../window_func.h"
 #include "../command_func.h"
 #include "ai.hpp"
-#include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index a68613530..4c34531df 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -3,21 +3,14 @@
 /** @file ai_gui.cpp Window for configuring the AIs */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../gui.h"
 #include "../window_gui.h"
 #include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
-#include "../economy_func.h"
-#include "../variables.h"
-#include "../cargotype.h"
 #include "../strings_func.h"
-#include "../core/alloc_func.hpp"
 #include "../window_func.h"
-#include "../date_func.h"
 #include "../gfx_func.h"
-#include "../debug.h"
 #include "../command_func.h"
 #include "../network/network.h"
 #include "../string_func.h"
@@ -26,15 +19,10 @@
 #include "../network/network_content.h"
 
 #include "ai.hpp"
-#include "api/ai_types.hpp"
-#include "api/ai_controller.hpp"
-#include "api/ai_object.hpp"
 #include "api/ai_log.hpp"
-#include "ai_info.hpp"
 #include "ai_config.hpp"
 
 #include "table/strings.h"
-#include "../table/sprites.h"
 
 /**
  * Window that let you choose an available AI.
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 4c70e2ab5..8dae0511e 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -3,17 +3,13 @@
 /** @file ai_info.cpp Implementation of AIFileInfo */
 
 #include "../stdafx.h"
-#include "../core/alloc_func.hpp"
 
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
-#include "../script/squirrel_class.hpp"
-#include "../script/squirrel_std.hpp"
 #include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
-#include "api/ai_controller.hpp"
 #include "../settings_type.h"
 #include "../openttd.h"
 
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 5ad763ae9..14413d0bd 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -3,13 +3,8 @@
 /** @file ai_instance.cpp Implementation of AIInstance. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../debug.h"
-#include "../company_func.h"
-#include "../core/alloc_func.hpp"
-#include "../string_func.h"
 #include "../settings_type.h"
-#include "../company_base.h"
 #include "../vehicle_base.h"
 #include "../saveload/saveload.h"
 #include "table/strings.h"
@@ -22,7 +17,6 @@
 
 #define DEFINE_SCRIPT_FILES
 
-#include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_storage.hpp"
 #include "ai_instance.hpp"
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index e1a58b702..e9174504f 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -4,13 +4,11 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../openttd.h"
 #include "../string_func.h"
 #include "../fileio_func.h"
 #include "../fios.h"
 #include "../network/network.h"
 #include "../core/random_func.hpp"
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <squirrel.h>
diff --git a/src/ai/api/ai_airport.cpp b/src/ai/api/ai_airport.cpp
index 2b0c3155b..ec3d40029 100644
--- a/src/ai/api/ai_airport.cpp
+++ b/src/ai/api/ai_airport.cpp
@@ -4,12 +4,8 @@
 
 #include "ai_airport.hpp"
 #include "ai_station.hpp"
-#include "ai_error.hpp"
-#include "../../openttd.h"
-#include "../../variables.h"
 #include "../../station_map.h"
 #include "../../company_func.h"
-#include "../../settings_type.h"
 #include "../../command_type.h"
 #include "../../town.h"
 
diff --git a/src/ai/api/ai_bridge.cpp b/src/ai/api/ai_bridge.cpp
index 1ca26b81d..310c23f25 100644
--- a/src/ai/api/ai_bridge.cpp
+++ b/src/ai/api/ai_bridge.cpp
@@ -5,14 +5,11 @@
 #include "ai_bridge.hpp"
 #include "ai_rail.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../bridge_map.h"
 #include "../../strings_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../economy_func.h"
 #include "../../settings_type.h"
-#include "../../road_map.h"
-#include "table/strings.h"
 
 /* static */ bool AIBridge::IsValidBridge(BridgeID bridge_id)
 {
diff --git a/src/ai/api/ai_bridgelist.cpp b/src/ai/api/ai_bridgelist.cpp
index 4f2fb2719..9fd6728c2 100644
--- a/src/ai/api/ai_bridgelist.cpp
+++ b/src/ai/api/ai_bridgelist.cpp
@@ -4,7 +4,6 @@
 
 #include "ai_bridgelist.hpp"
 #include "ai_bridge.hpp"
-#include "../../openttd.h"
 #include "../../bridge.h"
 #include "../../date_func.h"
 
diff --git a/src/ai/api/ai_cargo.cpp b/src/ai/api/ai_cargo.cpp
index dccf2af6e..1e2684f1a 100644
--- a/src/ai/api/ai_cargo.cpp
+++ b/src/ai/api/ai_cargo.cpp
@@ -3,7 +3,6 @@
 /** @file ai_cargo.cpp Implementation of AICargo. */
 
 #include "ai_cargo.hpp"
-#include "../../openttd.h"
 #include "../../cargotype.h"
 #include "../../economy_func.h"
 #include "../../core/alloc_func.hpp"
diff --git a/src/ai/api/ai_cargolist.cpp b/src/ai/api/ai_cargolist.cpp
index e480895fc..fe92a3886 100644
--- a/src/ai/api/ai_cargolist.cpp
+++ b/src/ai/api/ai_cargolist.cpp
@@ -4,7 +4,6 @@
 
 #include "ai_cargolist.hpp"
 #include "ai_industry.hpp"
-#include "../../openttd.h"
 #include "../../cargotype.h"
 #include "../../tile_type.h"
 #include "../../industry.h"
diff --git a/src/ai/api/ai_company.cpp b/src/ai/api/ai_company.cpp
index 439215a7e..a2f85e202 100644
--- a/src/ai/api/ai_company.cpp
+++ b/src/ai/api/ai_company.cpp
@@ -5,14 +5,12 @@
 #include "ai_company.hpp"
 #include "ai_error.hpp"
 #include "ai_log.hpp"
-#include "../../openttd.h"
 #include "../../command_func.h"
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../economy_func.h"
 #include "../../strings_func.h"
 #include "../../tile_map.h"
-#include "../../variables.h"
 #include "../../core/alloc_func.hpp"
 #include "../../string_func.h"
 #include "table/strings.h"
diff --git a/src/ai/api/ai_controller.cpp b/src/ai/api/ai_controller.cpp
index cb1fb6819..96f9715a8 100644
--- a/src/ai/api/ai_controller.cpp
+++ b/src/ai/api/ai_controller.cpp
@@ -3,18 +3,12 @@
 /** @file ai_controller.cpp Implementation of AIControler. */
 
 #include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../company_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../string_func.h"
-#include "../../settings_type.h"
 #include "../../company_base.h"
-#include "../../saveload/saveload.h"
 #include "table/strings.h"
 
 #include "../ai.hpp"
 #include "ai_controller.hpp"
-#include "../ai_info.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 #include "../ai_config.hpp"
diff --git a/src/ai/api/ai_depotlist.cpp b/src/ai/api/ai_depotlist.cpp
index b93ec3aef..f4cdb1a08 100644
--- a/src/ai/api/ai_depotlist.cpp
+++ b/src/ai/api/ai_depotlist.cpp
@@ -3,7 +3,6 @@
 /** @file ai_depotlist.cpp Implementation of AIDepotList and friends. */
 
 #include "ai_depotlist.hpp"
-#include "../../core/math_func.hpp"
 #include "../../tile_map.h"
 #include "../../company_func.h"
 #include "../../depot_base.h"
diff --git a/src/ai/api/ai_engine.cpp b/src/ai/api/ai_engine.cpp
index 5d301f47c..564dbc018 100644
--- a/src/ai/api/ai_engine.cpp
+++ b/src/ai/api/ai_engine.cpp
@@ -4,18 +4,10 @@
 
 #include "ai_engine.hpp"
 #include "ai_cargo.hpp"
-#include "ai_rail.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../strings_func.h"
-#include "../../roadveh.h"
-#include "../../train.h"
-#include "../../ship.h"
 #include "../../aircraft.h"
 #include "../../vehicle_func.h"
-#include "../../core/alloc_func.hpp"
-#include "../../economy_func.h"
-#include "../../core/bitmath_func.hpp"
 #include "../../settings_type.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"
diff --git a/src/ai/api/ai_error.cpp b/src/ai/api/ai_error.cpp
index e060532d4..7aca7d51e 100644
--- a/src/ai/api/ai_error.cpp
+++ b/src/ai/api/ai_error.cpp
@@ -3,7 +3,6 @@
 /** @file ai_error.cpp Implementation of AIError. */
 
 #include "ai_error.hpp"
-#include "table/strings.h"
 #include "../../core/bitmath_func.hpp"
 
 AIError::AIErrorMap AIError::error_map = AIError::AIErrorMap();
diff --git a/src/ai/api/ai_event.cpp b/src/ai/api/ai_event.cpp
index b18fa4777..1d6bdbce6 100644
--- a/src/ai/api/ai_event.cpp
+++ b/src/ai/api/ai_event.cpp
@@ -2,11 +2,9 @@
 
 /** @file ai_event.cpp Implementation of AIEvent. */
 
-#include "ai_event.hpp"
 #include "ai_event_types.hpp"
 
 #include <queue>
-#include <set>
 
 struct AIEventData {
 	std::queue<AIEvent *> stack;
diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp
index 6230caad6..1cf14f32d 100644
--- a/src/ai/api/ai_event_types.cpp
+++ b/src/ai/api/ai_event_types.cpp
@@ -3,14 +3,9 @@
 /** @file ai_event_types.cpp Implementation of all EventTypes. */
 
 #include "ai_event_types.hpp"
-#include "../../openttd.h"
-#include "../../core/alloc_func.hpp"
 #include "../../strings_func.h"
-#include "../../roadveh.h"
-#include "../../train.h"
-#include "../../ship.h"
-#include "../../aircraft.h"
 #include "../../settings_type.h"
+#include "../../aircraft.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"
 
diff --git a/src/ai/api/ai_gamesettings.cpp b/src/ai/api/ai_gamesettings.cpp
index b3b4fb85a..16c95e72b 100644
--- a/src/ai/api/ai_gamesettings.cpp
+++ b/src/ai/api/ai_gamesettings.cpp
@@ -4,7 +4,6 @@
 
 #include "ai_gamesettings.hpp"
 #include "../../settings_internal.h"
-#include "../../saveload/saveload.h"
 
 /* static */ bool AIGameSettings::IsValid(const char *setting)
 {
diff --git a/src/ai/api/ai_group.cpp b/src/ai/api/ai_group.cpp
index ea3af7d8c..23846d815 100644
--- a/src/ai/api/ai_group.cpp
+++ b/src/ai/api/ai_group.cpp
@@ -3,10 +3,8 @@
 /** @file ai_group.cpp Implementation of AIGroup. */
 
 #include "ai_group.hpp"
-#include "ai_vehicle.hpp"
 #include "ai_engine.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../group.h"
 #include "../../string_func.h"
diff --git a/src/ai/api/ai_grouplist.cpp b/src/ai/api/ai_grouplist.cpp
index be57b3750..6ff0c3cf5 100644
--- a/src/ai/api/ai_grouplist.cpp
+++ b/src/ai/api/ai_grouplist.cpp
@@ -3,7 +3,6 @@
 /** @file ai_grouplist.cpp Implementation of AIGroupList and friends. */
 
 #include "ai_grouplist.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../group.h"
 
diff --git a/src/ai/api/ai_industry.cpp b/src/ai/api/ai_industry.cpp
index 0cb5989aa..6876b270b 100644
--- a/src/ai/api/ai_industry.cpp
+++ b/src/ai/api/ai_industry.cpp
@@ -5,13 +5,10 @@
 #include "ai_industry.hpp"
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
-#include "../../openttd.h"
 #include "../../tile_type.h"
 #include "../../industry.h"
-#include "../../tile_map.h"
 #include "../../strings_func.h"
 #include "../../station_map.h"
-#include "../../station_func.h"
 #include "table/strings.h"
 
 /* static */ IndustryID AIIndustry::GetMaxIndustryID()
diff --git a/src/ai/api/ai_industrylist.cpp b/src/ai/api/ai_industrylist.cpp
index 8917e9cc0..ab14a3c10 100644
--- a/src/ai/api/ai_industrylist.cpp
+++ b/src/ai/api/ai_industrylist.cpp
@@ -3,7 +3,6 @@
 /** @file ai_industrylist.cpp Implementation of AIIndustryList and friends. */
 
 #include "ai_industrylist.hpp"
-#include "../../openttd.h"
 #include "../../tile_type.h"
 #include "../../industry.h"
 
diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp
index 18ea41de5..095aaa45f 100644
--- a/src/ai/api/ai_industrytype.cpp
+++ b/src/ai/api/ai_industrytype.cpp
@@ -4,11 +4,9 @@
 
 #include "ai_industrytype.hpp"
 #include "ai_map.hpp"
-#include "../../openttd.h"
 #include "../../command_type.h"
 #include "../../settings_type.h"
 #include "../../strings_func.h"
-#include "../../tile_type.h"
 #include "../../industry.h"
 
 /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)
diff --git a/src/ai/api/ai_industrytypelist.cpp b/src/ai/api/ai_industrytypelist.cpp
index b5ef34b50..0b1e90a65 100644
--- a/src/ai/api/ai_industrytypelist.cpp
+++ b/src/ai/api/ai_industrytypelist.cpp
@@ -3,7 +3,6 @@
 /** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */
 
 #include "ai_industrytypelist.hpp"
-#include "../../openttd.h"
 #include "../../tile_type.h"
 #include "../../industry.h"
 
diff --git a/src/ai/api/ai_map.cpp b/src/ai/api/ai_map.cpp
index dd6151f19..61cfed87f 100644
--- a/src/ai/api/ai_map.cpp
+++ b/src/ai/api/ai_map.cpp
@@ -3,7 +3,6 @@
 /** @file ai_map.cpp Implementation of AIMap. */
 
 #include "ai_map.hpp"
-#include "../../map_func.h"
 #include "../../tile_map.h"
 
 /* static */ bool AIMap::IsValidTile(TileIndex t)
diff --git a/src/ai/api/ai_marine.cpp b/src/ai/api/ai_marine.cpp
index d2160b4ca..e1712ab69 100644
--- a/src/ai/api/ai_marine.cpp
+++ b/src/ai/api/ai_marine.cpp
@@ -3,11 +3,7 @@
 /** @file ai_marine.cpp Implementation of AIMarine. */
 
 #include "ai_marine.hpp"
-#include "../../openttd.h"
-#include "../../command_type.h"
-#include "../../variables.h"
 #include "../../station_map.h"
-#include "../../water_map.h"
 #include "../../tile_cmd.h"
 
 
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index 1ae5b4fd0..64ae49349 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/ai/api/ai_object.cpp
@@ -2,26 +2,12 @@
 
 /** @file ai_object.cpp Implementation of AIObject. */
 
-#include "ai_object.hpp"
 #include "ai_log.hpp"
-#include "ai_error.hpp"
 #include "table/strings.h"
-#include "../../openttd.h"
-#include "../../command_func.h"
-#include "../../map_func.h"
-#include "../../network/network.h"
-#include "../../company_func.h"
-#include "../../signs_func.h"
-#include "../../tunnelbridge.h"
-#include "../../vehicle_func.h"
-#include "../../group.h"
 #include "../ai.hpp"
-#include "ai_controller.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 
-#include <vector>
-
 static AIStorage *GetStorage()
 {
 	return AIInstance::GetStorage();
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 1f30688e4..6e8b1163a 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -3,18 +3,12 @@
 /** @file ai_order.cpp Implementation of AIOrder. */
 
 #include "ai_order.hpp"
-#include "ai_map.hpp"
 #include "ai_vehicle.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../debug.h"
 #include "../../vehicle_base.h"
 #include "../../depot_base.h"
-#include "../../landscape.h"
-#include "../../rail_map.h"
-#include "../../road_map.h"
 #include "../../station_map.h"
-#include "../../water_map.h"
 #include "../../waypoint.h"
 
 /**
diff --git a/src/ai/api/ai_rail.cpp b/src/ai/api/ai_rail.cpp
index f35f98de3..5d08690d9 100644
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -3,21 +3,13 @@
 /** @file ai_rail.cpp Implementation of AIRail. */
 
 #include "ai_rail.hpp"
-#include "ai_object.hpp"
 #include "ai_map.hpp"
-#include "../../openttd.h"
 #include "../../debug.h"
-#include "../../rail_map.h"
-#include "../../road_map.h"
-#include "../../command_type.h"
 #include "../../station_map.h"
 #include "../../company_func.h"
-#include "../../core/math_func.hpp"
 #include "../../waypoint.h"
-#include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
-#include "../../newgrf_callbacks.h"
 
 /* static */ bool AIRail::IsRailTile(TileIndex tile)
 {
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index 2e3137f23..be40caf4c 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -4,14 +4,10 @@
 
 #include "ai_road.hpp"
 #include "ai_map.hpp"
-#include "ai_list.hpp"
-#include "../../openttd.h"
-#include "../../road_map.h"
 #include "../../station_map.h"
-#include "../../tunnelbridge_map.h"
 #include "../../command_type.h"
-#include "../../company_func.h"
 #include "../../settings_type.h"
+#include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
 
 /* static */ bool AIRoad::IsRoadTile(TileIndex tile)
diff --git a/src/ai/api/ai_sign.cpp b/src/ai/api/ai_sign.cpp
index 4683e2d32..3f397a4f0 100644
--- a/src/ai/api/ai_sign.cpp
+++ b/src/ai/api/ai_sign.cpp
@@ -5,7 +5,6 @@
 #include "ai_sign.hpp"
 #include "table/strings.h"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../command_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../signs_base.h"
diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp
index 4086b56a2..364b09538 100644
--- a/src/ai/api/ai_station.cpp
+++ b/src/ai/api/ai_station.cpp
@@ -6,16 +6,12 @@
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "../../openttd.h"
 #include "../../command_func.h"
 #include "../../debug.h"
 #include "../../station_map.h"
-#include "../../variables.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../company_func.h"
-#include "../../settings_type.h"
 #include "../../town.h"
 #include "table/strings.h"
 
diff --git a/src/ai/api/ai_stationlist.cpp b/src/ai/api/ai_stationlist.cpp
index 43cb33878..f392513e7 100644
--- a/src/ai/api/ai_stationlist.cpp
+++ b/src/ai/api/ai_stationlist.cpp
@@ -4,7 +4,6 @@
 
 #include "ai_stationlist.hpp"
 #include "ai_vehicle.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../station_base.h"
 #include "../../vehicle_base.h"
diff --git a/src/ai/api/ai_subsidy.cpp b/src/ai/api/ai_subsidy.cpp
index 1d0ec65d1..d4a8b7e0f 100644
--- a/src/ai/api/ai_subsidy.cpp
+++ b/src/ai/api/ai_subsidy.cpp
@@ -3,10 +3,7 @@
 /** @file ai_subsidy.cpp Implementation of AISubsidy. */
 
 #include "ai_subsidy.hpp"
-#include "ai_error.hpp"
-#include "ai_company.hpp"
 #include "ai_date.hpp"
-#include "../../openttd.h"
 #include "../../economy_func.h"
 #include "../../station_base.h"
 #include "../../cargotype.h"
diff --git a/src/ai/api/ai_tile.cpp b/src/ai/api/ai_tile.cpp
index 04b8c0290..8a04c1772 100644
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -5,14 +5,7 @@
 #include "ai_tile.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "../../openttd.h"
-#include "../../tile_map.h"
-#include "../../tile_cmd.h"
-#include "../../map_func.h"
-#include "../../variables.h"
 #include "../../station_func.h"
-#include "../../command_type.h"
-#include "../../settings_type.h"
 #include "../../company_func.h"
 #include "../../road_map.h"
 #include "../../water_map.h"
diff --git a/src/ai/api/ai_tilelist.cpp b/src/ai/api/ai_tilelist.cpp
index 2360765f4..d2fa8c468 100644
--- a/src/ai/api/ai_tilelist.cpp
+++ b/src/ai/api/ai_tilelist.cpp
@@ -4,15 +4,10 @@
 
 #include "ai_tilelist.hpp"
 #include "ai_industry.hpp"
-#include "../../openttd.h"
-#include "../../landscape.h"
-#include "../../settings_type.h"
-#include "../../station_func.h"
-#include "../../map_func.h"
 #include "../../tile_map.h"
 #include "../../industry_map.h"
-#include "../../station_base.h"
 #include "../../station_map.h"
+#include "../../settings_type.h"
 
 void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2)
 {
diff --git a/src/ai/api/ai_town.cpp b/src/ai/api/ai_town.cpp
index ebb575e96..60fbdb799 100644
--- a/src/ai/api/ai_town.cpp
+++ b/src/ai/api/ai_town.cpp
@@ -7,7 +7,6 @@
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
 #include "../../command_type.h"
-#include "../../openttd.h"
 #include "../../town.h"
 #include "../../strings_func.h"
 #include "../../core/alloc_func.hpp"
diff --git a/src/ai/api/ai_townlist.cpp b/src/ai/api/ai_townlist.cpp
index 34612d857..d14c280c9 100644
--- a/src/ai/api/ai_townlist.cpp
+++ b/src/ai/api/ai_townlist.cpp
@@ -3,7 +3,6 @@
 /** @file ai_townlist.cpp Implementation of AITownList and friends. */
 
 #include "ai_townlist.hpp"
-#include "../../openttd.h"
 #include "../../town.h"
 
 AITownList::AITownList()
diff --git a/src/ai/api/ai_tunnel.cpp b/src/ai/api/ai_tunnel.cpp
index 6c4c7b216..2b1fb1e31 100644
--- a/src/ai/api/ai_tunnel.cpp
+++ b/src/ai/api/ai_tunnel.cpp
@@ -3,13 +3,9 @@
 /** @file ai_tunnel.cpp Implementation of AITunnel. */
 
 #include "ai_tunnel.hpp"
-#include "ai_map.hpp"
 #include "ai_rail.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
-#include "../../landscape.h"
 #include "../../tunnel_map.h"
-#include "../../road_type.h"
 #include "../../command_func.h"
 #include "../../tunnelbridge.h"
 #include "../../road_func.h"
diff --git a/src/ai/api/ai_vehicle.cpp b/src/ai/api/ai_vehicle.cpp
index 197b558b8..93732130b 100644
--- a/src/ai/api/ai_vehicle.cpp
+++ b/src/ai/api/ai_vehicle.cpp
@@ -2,19 +2,15 @@
 
 /** @file ai_vehicle.cpp Implementation of AIVehicle. */
 
-#include "ai_vehicle.hpp"
 #include "ai_engine.hpp"
 #include "ai_cargo.hpp"
-#include "ai_order.hpp"
 #include "ai_gamesettings.hpp"
 #include "ai_group.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../aircraft.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../command_func.h"
 #include "../../roadveh.h"
 #include "../../train.h"
diff --git a/src/ai/api/ai_vehiclelist.cpp b/src/ai/api/ai_vehiclelist.cpp
index 127ac77e9..c7e75c795 100644
--- a/src/ai/api/ai_vehiclelist.cpp
+++ b/src/ai/api/ai_vehiclelist.cpp
@@ -4,7 +4,6 @@
 
 #include "ai_vehiclelist.hpp"
 #include "ai_station.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../vehicle_base.h"