(svn r21890) -Cleanup: remove some unneeded includes

19 files changed, 7 insertions, 29 deletions

diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp
index 586fdb569..8ec213cd8 100644
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -10,10 +10,8 @@
 /** @file ai_config.cpp Implementation of AIConfig. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../settings_type.h"
 #include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
 
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 44c3fa66b..1bc7ad9de 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -10,7 +10,6 @@
 /** @file ai_gui.cpp Window for configuring the AIs */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../table/sprites.h"
 #include "../gui.h"
 #include "../querystring_gui.h"
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 73a7ba05b..be2abf715 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -15,7 +15,6 @@
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "../settings_type.h"
-#include "../openttd.h"
 #include "../debug.h"
 #include "../rev.h"
 
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index a2b980fb6..d08c36f63 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -74,6 +74,7 @@
 #include "api/ai_waypointlist.hpp.sq"
 
 #include "../company_base.h"
+#include "../company_func.h"
 #include "../fileio_func.h"
 
 /** The maximum number of operations for saving or loading the data of an AI. */
diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.hpp
index 117f6cd3e..cc183d887 100644
--- a/src/ai/ai_scanner.hpp
+++ b/src/ai/ai_scanner.hpp
@@ -12,11 +12,8 @@
 #ifndef AI_SCANNER_HPP
 #define AI_SCANNER_HPP
 
-#include <squirrel.h>
 #include "../script/script_scanner.hpp"
-#include "../core/string_compare_type.hpp"
 #include "ai.hpp"
-#include <map>
 
 /**
  * Class that scans for available AIs.
diff --git a/src/ai/ai_storage.hpp b/src/ai/ai_storage.hpp
index 24f3e56f9..381cb0db2 100644
--- a/src/ai/ai_storage.hpp
+++ b/src/ai/ai_storage.hpp
@@ -12,12 +12,7 @@
 #ifndef AI_STORAGE_HPP
 #define AI_STORAGE_HPP
 
-#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 "../road_type.h"
 #include "../group.h"
diff --git a/src/ai/api/ai_accounting.hpp b/src/ai/api/ai_accounting.hpp
index 4dc8a9da4..1d4fc9085 100644
--- a/src/ai/api/ai_accounting.hpp
+++ b/src/ai/api/ai_accounting.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_ACCOUNTING_HPP
 #define AI_ACCOUNTING_HPP
 
-#include "../../stdafx.h"
 #include "ai_object.hpp"
 
 /**
diff --git a/src/ai/api/ai_controller.cpp b/src/ai/api/ai_controller.cpp
index fdd2b7708..9a2c552c0 100644
--- a/src/ai/api/ai_controller.cpp
+++ b/src/ai/api/ai_controller.cpp
@@ -10,13 +10,12 @@
 /** @file ai_controller.cpp Implementation of AIControler. */
 
 #include "../../stdafx.h"
-#include "../../stdafx.h"
 #include "../../string_func.h"
 #include "../../company_base.h"
+#include "../../company_func.h"
 #include "../../rev.h"
 
 #include "ai_controller.hpp"
-#include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 #include "../ai_config.hpp"
 #include "ai_log.hpp"
diff --git a/src/ai/api/ai_engine.hpp b/src/ai/api/ai_engine.hpp
index b126734a8..337b80485 100644
--- a/src/ai/api/ai_engine.hpp
+++ b/src/ai/api/ai_engine.hpp
@@ -12,9 +12,7 @@
 #ifndef AI_ENGINE_HPP
 #define AI_ENGINE_HPP
 
-#include "ai_object.hpp"
 #include "ai_vehicle.hpp"
-#include "ai_road.hpp"
 #include "ai_rail.hpp"
 #include "ai_airport.hpp"
 
diff --git a/src/ai/api/ai_event_types.hpp b/src/ai/api/ai_event_types.hpp
index acb36c77c..7ca675eeb 100644
--- a/src/ai/api/ai_event_types.hpp
+++ b/src/ai/api/ai_event_types.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_EVENT_TYPES_HPP
 #define AI_EVENT_TYPES_HPP
 
-#include "ai_object.hpp"
 #include "ai_event.hpp"
 #include "ai_company.hpp"
 
diff --git a/src/ai/api/ai_group.hpp b/src/ai/api/ai_group.hpp
index 593bdb559..bff9d8dd4 100644
--- a/src/ai/api/ai_group.hpp
+++ b/src/ai/api/ai_group.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_GROUP_HPP
 #define AI_GROUP_HPP
 
-#include "ai_object.hpp"
 #include "ai_vehicle.hpp"
 
 /**
diff --git a/src/ai/api/ai_industrytypelist.hpp b/src/ai/api/ai_industrytypelist.hpp
index e17be83c0..b29c4b011 100644
--- a/src/ai/api/ai_industrytypelist.hpp
+++ b/src/ai/api/ai_industrytypelist.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_INDUSTRYTYPELIST_HPP
 #define AI_INDUSTRYTYPELIST_HPP
 
-#include "ai_list.hpp"
 #include "ai_industrytype.hpp"
 
 /**
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index f00374954..f2ddbebae 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/ai/api/ai_object.cpp
@@ -11,7 +11,11 @@
 
 #include "../../stdafx.h"
 #include "../../script/squirrel.hpp"
+#include "../../command_func.h"
 #include "../../company_base.h"
+#include "../../company_func.h"
+#include "../../network/network.h"
+#include "../../tunnelbridge.h"
 
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 36437138b..a79a6e7dd 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -10,6 +10,7 @@
 /** @file ai_order.cpp Implementation of AIOrder. */
 
 #include "../../stdafx.h"
+#include "ai_order.hpp"
 #include "ai_vehicle.hpp"
 #include "../ai_instance.hpp"
 #include "../../debug.h"
diff --git a/src/ai/api/ai_sign.hpp b/src/ai/api/ai_sign.hpp
index 518f1782b..c2816d796 100644
--- a/src/ai/api/ai_sign.hpp
+++ b/src/ai/api/ai_sign.hpp
@@ -12,9 +12,7 @@
 #ifndef AI_SIGN_HPP
 #define AI_SIGN_HPP
 
-#include "ai_object.hpp"
 #include "ai_error.hpp"
-#include "ai_company.hpp"
 
 /**
  * Class that handles all sign related functions.
diff --git a/src/ai/api/ai_station.hpp b/src/ai/api/ai_station.hpp
index 68ead640c..825c0f3ee 100644
--- a/src/ai/api/ai_station.hpp
+++ b/src/ai/api/ai_station.hpp
@@ -12,8 +12,6 @@
 #ifndef AI_STATION_HPP
 #define AI_STATION_HPP
 
-#include "ai_object.hpp"
-#include "ai_error.hpp"
 #include "ai_road.hpp"
 #include "ai_basestation.hpp"
 
diff --git a/src/ai/api/ai_subsidy.hpp b/src/ai/api/ai_subsidy.hpp
index 2993c867e..b4079e59f 100644
--- a/src/ai/api/ai_subsidy.hpp
+++ b/src/ai/api/ai_subsidy.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_SUBSIDY_HPP
 #define AI_SUBSIDY_HPP
 
-#include "ai_object.hpp"
 #include "ai_company.hpp"
 
 /**
diff --git a/src/ai/api/ai_tunnel.hpp b/src/ai/api/ai_tunnel.hpp
index 0dac7e857..f1d8beae3 100644
--- a/src/ai/api/ai_tunnel.hpp
+++ b/src/ai/api/ai_tunnel.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_TUNNEL_HPP
 #define AI_TUNNEL_HPP
 
-#include "ai_object.hpp"
 #include "ai_vehicle.hpp"
 
 /**
diff --git a/src/ai/api/ai_vehicle.hpp b/src/ai/api/ai_vehicle.hpp
index 083e9da1c..9477e879e 100644
--- a/src/ai/api/ai_vehicle.hpp
+++ b/src/ai/api/ai_vehicle.hpp
@@ -12,10 +12,7 @@
 #ifndef AI_VEHICLE_HPP
 #define AI_VEHICLE_HPP
 
-#include "ai_object.hpp"
-#include "ai_error.hpp"
 #include "ai_road.hpp"
-#include "ai_order.hpp"
 
 /**
  * Class that handles all vehicle related functions.