(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header

src/ai/ai_config.hpp

@@ -15,6 +15,7 @@
 #include <map>
 #include "ai_info.hpp"
 #include "../core/string_compare_type.hpp"
+#include "../company_type.h"
 
 class AIConfig {
 private:

src/ai/ai_core.cpp

@@ -17,7 +17,6 @@
 #include "../network/network.h"
 #include "../window_func.h"
 #include "../command_func.h"
-#include "ai.hpp"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"

src/ai/ai_gui.hpp

@@ -12,6 +12,8 @@
 #ifndef AI_GUI_HPP
 #define AI_GUI_HPP
 
+#include "../company_type.h"
+
 void ShowAIDebugWindow(CompanyID show_company = INVALID_COMPANY);
 void ShowAIConfigWindow();
 

src/ai/ai_info.cpp

@@ -14,7 +14,6 @@
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
-#include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "../settings_type.h"

src/ai/ai_instance.cpp

@@ -11,10 +11,8 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../vehicle_base.h"
 #include "../saveload/saveload.h"
 #include "../gui.h"
-#include "table/strings.h"
 
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
@@ -79,6 +77,7 @@
 #include "api/ai_waypoint.hpp.sq"
 #include "api/ai_waypointlist.hpp.sq"
 
+#include "../company_base.h"
 #include "../fileio_func.h"
 
 AIStorage::~AIStorage()

src/ai/ai_instance.hpp

@@ -12,6 +12,8 @@
 #ifndef AI_INSTANCE_HPP
 #define AI_INSTANCE_HPP
 
+#include <squirrel.h>
+
 /**
  * The callback function when an AI suspends.
  */

src/ai/ai_scanner.cpp

@@ -19,7 +19,6 @@
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
-#include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "api/ai_controller.hpp"

src/ai/ai_scanner.hpp

@@ -12,8 +12,10 @@
 #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 AIScanner : public ScriptScanner {

src/ai/ai_storage.hpp

@@ -19,8 +19,10 @@
 #include "../signs_func.h"
 #include "../tunnelbridge.h"
 #include "../vehicle_func.h"
+#include "../road_type.h"
 #include "../group.h"
 
+#include "table/strings.h"
 #include <vector>
 
 /**

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"

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"

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"

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"

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"

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)
 {

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)

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"
 

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"

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"
 

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"

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"

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"

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"

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)