(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers

14 files changed, 0 insertions, 22 deletions

diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index b6c072500..b03e2a5ae 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -14,7 +14,6 @@
 #include "../core/bitmath_func.hpp"
 #include "../company_base.h"
 #include "../company_func.h"
-#include "../debug.h"
 #include "../network/network.h"
 #include "../window_func.h"
 #include "../command_func.h"
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index d52d00f5c..3cfee3f6a 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -13,7 +13,6 @@
 #include "../openttd.h"
 #include "../table/sprites.h"
 #include "../gui.h"
-#include "../window_gui.h"
 #include "../querystring_gui.h"
 #include "../company_func.h"
 #include "../company_base.h"
@@ -23,7 +22,6 @@
 #include "../gfx_func.h"
 #include "../command_func.h"
 #include "../network/network.h"
-#include "../textbuf_gui.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
 #include "../core/backup_type.hpp"
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 8ee4d4499..ff5dca946 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -11,8 +11,6 @@
 
 #include "../stdafx.h"
 
-#include <squirrel.h>
-#include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 0922405ce..80cc06a7f 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -14,9 +14,6 @@
 #include "../saveload/saveload.h"
 #include "../gui.h"
 
-#include <squirrel.h>
-#include "../script/squirrel.hpp"
-#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 
 #include "ai_config.hpp"
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 7aea4a4cb..e6c2e87e7 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -15,9 +15,6 @@
 #include "../network/network.h"
 #include "../core/random_func.hpp"
 
-#include <squirrel.h>
-#include "../script/squirrel.hpp"
-#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
diff --git a/src/ai/api/ai_basestation.cpp b/src/ai/api/ai_basestation.cpp
index 137829cf8..30089609c 100644
--- a/src/ai/api/ai_basestation.cpp
+++ b/src/ai/api/ai_basestation.cpp
@@ -11,7 +11,6 @@
 
 #include "ai_basestation.hpp"
 #include "../../station_base.h"
-#include "../../command_func.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
diff --git a/src/ai/api/ai_gamesettings.cpp b/src/ai/api/ai_gamesettings.cpp
index 8f7c3eaef..7b3d6d01a 100644
--- a/src/ai/api/ai_gamesettings.cpp
+++ b/src/ai/api/ai_gamesettings.cpp
@@ -11,7 +11,6 @@
 
 #include "ai_gamesettings.hpp"
 #include "../../settings_internal.h"
-#include "../../economy_func.h"
 
 /* static */ bool AIGameSettings::IsValid(const char *setting)
 {
diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp
index 0b6e00552..43bd43322 100644
--- a/src/ai/api/ai_industrytype.cpp
+++ b/src/ai/api/ai_industrytype.cpp
@@ -11,7 +11,6 @@
 
 #include "ai_industrytype.hpp"
 #include "ai_map.hpp"
-#include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../industry.h"
 #include "../../newgrf_industries.h"
diff --git a/src/ai/api/ai_marine.cpp b/src/ai/api/ai_marine.cpp
index 3890d2108..b9e2b18de 100644
--- a/src/ai/api/ai_marine.cpp
+++ b/src/ai/api/ai_marine.cpp
@@ -13,7 +13,6 @@
 #include "ai_station.hpp"
 #include "../../station_base.h"
 #include "../../tile_cmd.h"
-#include "../../economy_func.h"
 
 
 /* static */ bool AIMarine::IsWaterDepotTile(TileIndex tile)
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index 02f9e734b..f00374954 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/ai/api/ai_object.cpp
@@ -10,7 +10,6 @@
 /** @file ai_object.cpp Implementation of AIObject. */
 
 #include "../../stdafx.h"
-#include <squirrel.h>
 #include "../../script/squirrel.hpp"
 #include "../../company_base.h"
 
diff --git a/src/ai/api/ai_rail.cpp b/src/ai/api/ai_rail.cpp
index e10cdb4df..45cc78a3a 100644
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -13,14 +13,12 @@
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_industrytype.hpp"
-#include "../../command_type.h"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
-#include "../../economy_func.h"
 
 /* static */ bool AIRail::IsRailTile(TileIndex tile)
 {
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index b03efd8c9..7cfa2c1cd 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -13,7 +13,6 @@
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
 #include "../../station_base.h"
-#include "../../command_type.h"
 #include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
 
diff --git a/src/ai/api/ai_town.cpp b/src/ai/api/ai_town.cpp
index 37b9b84d6..05615e485 100644
--- a/src/ai/api/ai_town.cpp
+++ b/src/ai/api/ai_town.cpp
@@ -14,7 +14,6 @@
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
 #include "../../town.h"
-#include "../../town_type.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
 #include "../../station_base.h"
diff --git a/src/ai/api/ai_vehicle.cpp b/src/ai/api/ai_vehicle.cpp
index a816c73f1..e62cb585b 100644
--- a/src/ai/api/ai_vehicle.cpp
+++ b/src/ai/api/ai_vehicle.cpp
@@ -15,14 +15,12 @@
 #include "ai_group.hpp"
 #include "../ai_instance.hpp"
 #include "../../company_func.h"
-#include "../../aircraft.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../command_func.h"
 #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)