summaryrefslogtreecommitdiff
path: root/src/ai
diff options
context:
space:
mode:
Diffstat (limited to 'src/ai')
-rw-r--r--src/ai/ai_config.hpp1
-rw-r--r--src/ai/ai_core.cpp1
-rw-r--r--src/ai/ai_gui.hpp2
-rw-r--r--src/ai/ai_info.cpp1
-rw-r--r--src/ai/ai_instance.cpp3
-rw-r--r--src/ai/ai_instance.hpp2
-rw-r--r--src/ai/ai_scanner.cpp1
-rw-r--r--src/ai/ai_scanner.hpp2
-rw-r--r--src/ai/ai_storage.hpp2
-rw-r--r--src/ai/api/ai_abstractlist.cpp1
-rw-r--r--src/ai/api/ai_controller.cpp2
-rw-r--r--src/ai/api/ai_engine.cpp1
-rw-r--r--src/ai/api/ai_execmode.cpp1
-rw-r--r--src/ai/api/ai_group.cpp1
-rw-r--r--src/ai/api/ai_industrytype.cpp1
-rw-r--r--src/ai/api/ai_list.cpp1
-rw-r--r--src/ai/api/ai_map.cpp1
-rw-r--r--src/ai/api/ai_object.cpp2
-rw-r--r--src/ai/api/ai_rail.cpp1
-rw-r--r--src/ai/api/ai_road.cpp1
-rw-r--r--src/ai/api/ai_station.cpp1
-rw-r--r--src/ai/api/ai_testmode.cpp1
-rw-r--r--src/ai/api/ai_tile.cpp1
-rw-r--r--src/ai/api/ai_vehicle.cpp1
24 files changed, 13 insertions, 19 deletions
diff --git a/src/ai/ai_config.hpp b/src/ai/ai_config.hpp
index fb53b725b..302a9942d 100644
--- a/src/ai/ai_config.hpp
+++ b/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:
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index eb93ecff3..9c730d867 100644
--- a/src/ai/ai_core.cpp
+++ b/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"
diff --git a/src/ai/ai_gui.hpp b/src/ai/ai_gui.hpp
index c5f0b705d..56d775a16 100644
--- a/src/ai/ai_gui.hpp
+++ b/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();
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index b753424e1..06fdc88ef 100644
--- a/src/ai/ai_info.cpp
+++ b/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"
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index d91fff0a1..d321214b0 100644
--- a/src/ai/ai_instance.cpp
+++ b/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()
diff --git a/src/ai/ai_instance.hpp b/src/ai/ai_instance.hpp
index f0862ea9e..d9e519a7e 100644
--- a/src/ai/ai_instance.hpp
+++ b/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.
*/
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 065d4e4c2..dc3dd0d1b 100644
--- a/src/ai/ai_scanner.cpp
+++ b/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"
diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.hpp
index ff3ce7790..26fc385b4 100644
--- a/src/ai/ai_scanner.hpp
+++ b/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 {
diff --git a/src/ai/ai_storage.hpp b/src/ai/ai_storage.hpp
index 2434782f6..3130418ce 100644
--- a/src/ai/ai_storage.hpp
+++ b/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>
/**
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)