(svn r23369) -Codechange: use script includes when possible, not ai includes

10 files changed, 10 insertions, 11 deletions

diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp
index 7f6c2ad63..da74712cc 100644
--- a/src/script/api/script_bridge.cpp
+++ b/src/script/api/script_bridge.cpp
@@ -12,7 +12,7 @@
 #include "../../stdafx.h"
 #include "script_bridge.hpp"
 #include "script_rail.hpp"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../../bridge_map.h"
 #include "../../strings_func.h"
 #include "../../economy_func.h"
diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp
index 055774be3..06b994ad1 100644
--- a/src/script/api/script_controller.cpp
+++ b/src/script/api/script_controller.cpp
@@ -15,9 +15,9 @@
 #include "../../rev.h"
 
 #include "script_controller.hpp"
-#include "../../ai/ai_instance.hpp"
 #include "../script_fatalerror.hpp"
 #include "../script_info.hpp"
+#include "../script_instance.hpp"
 #include "../script_suspend.hpp"
 #include "script_log.hpp"
 
diff --git a/src/script/api/script_execmode.cpp b/src/script/api/script_execmode.cpp
index e0481b25b..d0911e3f8 100644
--- a/src/script/api/script_execmode.cpp
+++ b/src/script/api/script_execmode.cpp
@@ -13,7 +13,7 @@
 #include "script_execmode.hpp"
 #include "../../company_base.h"
 #include "../../company_func.h"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../script_fatalerror.hpp"
 
 bool ScriptExecMode::ModeProc()
diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp
index 026e101d9..050cc63a9 100644
--- a/src/script/api/script_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -12,7 +12,7 @@
 #include "../../stdafx.h"
 #include "script_group.hpp"
 #include "script_engine.hpp"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../../company_func.h"
 #include "../../group.h"
 #include "../../string_func.h"
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index 894668d4d..e6e063bb6 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -17,8 +17,7 @@
 #include "../../tunnelbridge.h"
 
 #include "../script_storage.hpp"
-#include "../../ai/ai_config.hpp"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../script_fatalerror.hpp"
 #include "../script_suspend.hpp"
 #include "script_error.hpp"
diff --git a/src/script/api/script_order.cpp b/src/script/api/script_order.cpp
index 2e72dd350..a7ea14ce3 100644
--- a/src/script/api/script_order.cpp
+++ b/src/script/api/script_order.cpp
@@ -13,7 +13,7 @@
 #include "script_order.hpp"
 #include "script_vehicle.hpp"
 #include "script_cargo.hpp"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../../debug.h"
 #include "../../vehicle_base.h"
 #include "../../roadstop_base.h"
diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp
index 85303b034..555ccdb4b 100644
--- a/src/script/api/script_sign.cpp
+++ b/src/script/api/script_sign.cpp
@@ -12,7 +12,7 @@
 #include "../../stdafx.h"
 #include "script_sign.hpp"
 #include "table/strings.h"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../../command_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../signs_base.h"
diff --git a/src/script/api/script_testmode.cpp b/src/script/api/script_testmode.cpp
index 184a8795c..16472a118 100644
--- a/src/script/api/script_testmode.cpp
+++ b/src/script/api/script_testmode.cpp
@@ -13,7 +13,7 @@
 #include "script_testmode.hpp"
 #include "../../company_base.h"
 #include "../../company_func.h"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../script_fatalerror.hpp"
 
 bool ScriptTestMode::ModeProc()
diff --git a/src/script/api/script_tunnel.cpp b/src/script/api/script_tunnel.cpp
index e6b7b45cf..10b99d2f2 100644
--- a/src/script/api/script_tunnel.cpp
+++ b/src/script/api/script_tunnel.cpp
@@ -12,7 +12,7 @@
 #include "../../stdafx.h"
 #include "script_tunnel.hpp"
 #include "script_rail.hpp"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../../tunnel_map.h"
 #include "../../command_func.h"
 
diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp
index ff240200b..d536aa8a7 100644
--- a/src/script/api/script_vehicle.cpp
+++ b/src/script/api/script_vehicle.cpp
@@ -14,7 +14,7 @@
 #include "script_cargo.hpp"
 #include "script_gamesettings.hpp"
 #include "script_group.hpp"
-#include "../../ai/ai_instance.hpp"
+#include "../script_instance.hpp"
 #include "../../company_func.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"