(svn r23354) -Codechange: move all src/ai/api/ai_*.[hc]pp files to src/script/api/script_* (Rubidium)

156 files changed, 492 insertions, 490 deletions

diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp
index c8e5036b5..2d5355a9c 100644
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@@ -13,7 +13,7 @@
 #define AI_HPP
 
 #ifdef ENABLE_AI
-#include "api/ai_event_types.hpp"
+#include "../script/api/script_event_types.hpp"
 #include "../date_type.h"
 #include "../core/string_compare_type.hpp"
 #include <map>
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index a370bda9d..5ea4ddac0 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -21,7 +21,7 @@
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
-#include "api/ai_error.hpp"
+#include "../script/api/script_error.hpp"
 
 /* static */ uint AI::frame_counter = 0;
 /* static */ AIScanner *AI::ai_scanner = NULL;
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index d8b55c6c2..90f900f9b 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -26,7 +26,7 @@
 #include "../core/backup_type.hpp"
 
 #include "ai.hpp"
-#include "api/ai_log.hpp"
+#include "../script/api/script_log.hpp"
 #include "ai_config.hpp"
 #include "ai_instance.hpp"
 
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 0062ffa87..832b89887 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -18,7 +18,7 @@
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
-#include "api/ai_controller.hpp"
+#include "../script/api/script_controller.hpp"
 
 void AIScanner::RescanAIDir()
 {
diff --git a/src/ai/api/ai_accounting.hpp.sq b/src/ai/api/ai_accounting.hpp.sq
index 0bebf7a18..f3513f7dd 100644
--- a/src/ai/api/ai_accounting.hpp.sq
+++ b/src/ai/api/ai_accounting.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_accounting.hpp"
+#include "../../script/api/script_accounting.hpp"
 
 namespace SQConvert {
 	/* Allow AIAccounting to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_airport.hpp.sq b/src/ai/api/ai_airport.hpp.sq
index e68ae7c91..4a98e895e 100644
--- a/src/ai/api/ai_airport.hpp.sq
+++ b/src/ai/api/ai_airport.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_airport.hpp"
+#include "../../script/api/script_airport.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_base.hpp.sq b/src/ai/api/ai_base.hpp.sq
index 677c06273..4f993f786 100644
--- a/src/ai/api/ai_base.hpp.sq
+++ b/src/ai/api/ai_base.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_base.hpp"
+#include "../../script/api/script_base.hpp"
 
 namespace SQConvert {
 	/* Allow AIBase to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_basestation.hpp.sq b/src/ai/api/ai_basestation.hpp.sq
index 070e0640d..07ca83a5f 100644
--- a/src/ai/api/ai_basestation.hpp.sq
+++ b/src/ai/api/ai_basestation.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_basestation.hpp"
+#include "../../script/api/script_basestation.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_bridge.hpp.sq b/src/ai/api/ai_bridge.hpp.sq
index 28e37bc74..ef426f25a 100644
--- a/src/ai/api/ai_bridge.hpp.sq
+++ b/src/ai/api/ai_bridge.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_bridge.hpp"
+#include "../../script/api/script_bridge.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_bridgelist.hpp.sq b/src/ai/api/ai_bridgelist.hpp.sq
index b02a700be..62ea99303 100644
--- a/src/ai/api/ai_bridgelist.hpp.sq
+++ b/src/ai/api/ai_bridgelist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_bridgelist.hpp"
+#include "../../script/api/script_bridgelist.hpp"
 
 namespace SQConvert {
 	/* Allow AIBridgeList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_cargo.hpp.sq b/src/ai/api/ai_cargo.hpp.sq
index da92e3e4f..463a0e0ac 100644
--- a/src/ai/api/ai_cargo.hpp.sq
+++ b/src/ai/api/ai_cargo.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_cargo.hpp"
+#include "../../script/api/script_cargo.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_cargolist.hpp.sq b/src/ai/api/ai_cargolist.hpp.sq
index e046bc43d..f32cffeb4 100644
--- a/src/ai/api/ai_cargolist.hpp.sq
+++ b/src/ai/api/ai_cargolist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_cargolist.hpp"
+#include "../../script/api/script_cargolist.hpp"
 
 namespace SQConvert {
 	/* Allow AICargoList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_company.hpp.sq b/src/ai/api/ai_company.hpp.sq
index e6ad843c5..097081198 100644
--- a/src/ai/api/ai_company.hpp.sq
+++ b/src/ai/api/ai_company.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_company.hpp"
+#include "../../script/api/script_company.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_controller.hpp.sq b/src/ai/api/ai_controller.hpp.sq
index f66c23481..20c681803 100644
--- a/src/ai/api/ai_controller.hpp.sq
+++ b/src/ai/api/ai_controller.hpp.sq
@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ai_controller.hpp"
+#include "../../script/api/script_controller.hpp"
 
 template <> const char *GetClassName<AIController, ST_AI>() { return "AIController"; }
 
diff --git a/src/ai/api/ai_date.hpp.sq b/src/ai/api/ai_date.hpp.sq
index d84f3c078..f6c534ef5 100644
--- a/src/ai/api/ai_date.hpp.sq
+++ b/src/ai/api/ai_date.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_date.hpp"
+#include "../../script/api/script_date.hpp"
 
 namespace SQConvert {
 	/* Allow AIDate to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_depotlist.hpp.sq b/src/ai/api/ai_depotlist.hpp.sq
index 89f9b3b96..aeb835b84 100644
--- a/src/ai/api/ai_depotlist.hpp.sq
+++ b/src/ai/api/ai_depotlist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_depotlist.hpp"
+#include "../../script/api/script_depotlist.hpp"
 
 namespace SQConvert {
 	/* Allow AIDepotList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_engine.hpp.sq b/src/ai/api/ai_engine.hpp.sq
index 8e37b2b1b..effab73cb 100644
--- a/src/ai/api/ai_engine.hpp.sq
+++ b/src/ai/api/ai_engine.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_engine.hpp"
+#include "../../script/api/script_engine.hpp"
 
 namespace SQConvert {
 	/* Allow AIEngine to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_enginelist.hpp.sq b/src/ai/api/ai_enginelist.hpp.sq
index 7d135f643..e1879c441 100644
--- a/src/ai/api/ai_enginelist.hpp.sq
+++ b/src/ai/api/ai_enginelist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_enginelist.hpp"
+#include "../../script/api/script_enginelist.hpp"
 
 namespace SQConvert {
 	/* Allow AIEngineList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_error.hpp.sq b/src/ai/api/ai_error.hpp.sq
index 62874810b..c124c204b 100644
--- a/src/ai/api/ai_error.hpp.sq
+++ b/src/ai/api/ai_error.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_error.hpp"
+#include "../../script/api/script_error.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_event.hpp.sq b/src/ai/api/ai_event.hpp.sq
index aa86ce8b9..cb79f58f4 100644
--- a/src/ai/api/ai_event.hpp.sq
+++ b/src/ai/api/ai_event.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_event.hpp"
+#include "../../script/api/script_event.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_event_types.hpp.sq b/src/ai/api/ai_event_types.hpp.sq
index 8766e2f3b..a4d6b4f0c 100644
--- a/src/ai/api/ai_event_types.hpp.sq
+++ b/src/ai/api/ai_event_types.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_event_types.hpp"
+#include "../../script/api/script_event_types.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_execmode.hpp.sq b/src/ai/api/ai_execmode.hpp.sq
index 61e3673ac..8e6b77a75 100644
--- a/src/ai/api/ai_execmode.hpp.sq
+++ b/src/ai/api/ai_execmode.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_execmode.hpp"
+#include "../../script/api/script_execmode.hpp"
 
 namespace SQConvert {
 	/* Allow AIExecMode to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_gamesettings.hpp.sq b/src/ai/api/ai_gamesettings.hpp.sq
index f0e3c3d6a..db8502520 100644
--- a/src/ai/api/ai_gamesettings.hpp.sq
+++ b/src/ai/api/ai_gamesettings.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_gamesettings.hpp"
+#include "../../script/api/script_gamesettings.hpp"
 
 namespace SQConvert {
 	/* Allow AIGameSettings to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_group.hpp.sq b/src/ai/api/ai_group.hpp.sq
index 5fc4ae34b..4b0cc7b22 100644
--- a/src/ai/api/ai_group.hpp.sq
+++ b/src/ai/api/ai_group.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_group.hpp"
+#include "../../script/api/script_group.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_grouplist.hpp.sq b/src/ai/api/ai_grouplist.hpp.sq
index bf07c8da2..254cd2475 100644
--- a/src/ai/api/ai_grouplist.hpp.sq
+++ b/src/ai/api/ai_grouplist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_grouplist.hpp"
+#include "../../script/api/script_grouplist.hpp"
 
 namespace SQConvert {
 	/* Allow AIGroupList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_industry.hpp.sq b/src/ai/api/ai_industry.hpp.sq
index 7fee363b2..dbc7d1dd6 100644
--- a/src/ai/api/ai_industry.hpp.sq
+++ b/src/ai/api/ai_industry.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_industry.hpp"
+#include "../../script/api/script_industry.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_industrylist.hpp.sq b/src/ai/api/ai_industrylist.hpp.sq
index 00fb1f6df..3c1036294 100644
--- a/src/ai/api/ai_industrylist.hpp.sq
+++ b/src/ai/api/ai_industrylist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_industrylist.hpp"
+#include "../../script/api/script_industrylist.hpp"
 
 namespace SQConvert {
 	/* Allow AIIndustryList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_industrytype.hpp.sq b/src/ai/api/ai_industrytype.hpp.sq
index ba1d993c8..9a0583805 100644
--- a/src/ai/api/ai_industrytype.hpp.sq
+++ b/src/ai/api/ai_industrytype.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_industrytype.hpp"
+#include "../../script/api/script_industrytype.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_industrytypelist.hpp.sq b/src/ai/api/ai_industrytypelist.hpp.sq
index 4187572ee..5e7ac4baa 100644
--- a/src/ai/api/ai_industrytypelist.hpp.sq
+++ b/src/ai/api/ai_industrytypelist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_industrytypelist.hpp"
+#include "../../script/api/script_industrytypelist.hpp"
 
 namespace SQConvert {
 	/* Allow AIIndustryTypeList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_list.hpp.sq b/src/ai/api/ai_list.hpp.sq
index ec31ca220..3465c6957 100644
--- a/src/ai/api/ai_list.hpp.sq
+++ b/src/ai/api/ai_list.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_list.hpp"
+#include "../../script/api/script_list.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_log.hpp.sq b/src/ai/api/ai_log.hpp.sq
index b35625d1d..ccc850bb3 100644
--- a/src/ai/api/ai_log.hpp.sq
+++ b/src/ai/api/ai_log.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_log.hpp"
+#include "../../script/api/script_log.hpp"
 
 namespace SQConvert {
 	/* Allow AILog to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_map.hpp.sq b/src/ai/api/ai_map.hpp.sq
index 4f051c9b4..e9c1ac0f2 100644
--- a/src/ai/api/ai_map.hpp.sq
+++ b/src/ai/api/ai_map.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_map.hpp"
+#include "../../script/api/script_map.hpp"
 
 namespace SQConvert {
 	/* Allow AIMap to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_marine.hpp.sq b/src/ai/api/ai_marine.hpp.sq
index 7d7f05fa5..3b30a3442 100644
--- a/src/ai/api/ai_marine.hpp.sq
+++ b/src/ai/api/ai_marine.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_marine.hpp"
+#include "../../script/api/script_marine.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_order.hpp.sq b/src/ai/api/ai_order.hpp.sq
index 3d0a6b62f..c116adc68 100644
--- a/src/ai/api/ai_order.hpp.sq
+++ b/src/ai/api/ai_order.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_order.hpp"
+#include "../../script/api/script_order.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_rail.hpp.sq b/src/ai/api/ai_rail.hpp.sq
index a5a8f663b..002892f14 100644
--- a/src/ai/api/ai_rail.hpp.sq
+++ b/src/ai/api/ai_rail.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_rail.hpp"
+#include "../../script/api/script_rail.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_railtypelist.hpp.sq b/src/ai/api/ai_railtypelist.hpp.sq
index 990235796..0ed5789f2 100644
--- a/src/ai/api/ai_railtypelist.hpp.sq
+++ b/src/ai/api/ai_railtypelist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_railtypelist.hpp"
+#include "../../script/api/script_railtypelist.hpp"
 
 namespace SQConvert {
 	/* Allow AIRailTypeList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_road.hpp.sq b/src/ai/api/ai_road.hpp.sq
index 20b79e249..859686634 100644
--- a/src/ai/api/ai_road.hpp.sq
+++ b/src/ai/api/ai_road.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_road.hpp"
+#include "../../script/api/script_road.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_sign.hpp.sq b/src/ai/api/ai_sign.hpp.sq
index c33e18d74..87a3bc171 100644
--- a/src/ai/api/ai_sign.hpp.sq
+++ b/src/ai/api/ai_sign.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_sign.hpp"
+#include "../../script/api/script_sign.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_signlist.hpp.sq b/src/ai/api/ai_signlist.hpp.sq
index 91a2383c4..a07a8f66e 100644
--- a/src/ai/api/ai_signlist.hpp.sq
+++ b/src/ai/api/ai_signlist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_signlist.hpp"
+#include "../../script/api/script_signlist.hpp"
 
 namespace SQConvert {
 	/* Allow AISignList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_station.hpp.sq b/src/ai/api/ai_station.hpp.sq
index 3f064995a..fb5fd8568 100644
--- a/src/ai/api/ai_station.hpp.sq
+++ b/src/ai/api/ai_station.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_station.hpp"
+#include "../../script/api/script_station.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_stationlist.hpp.sq b/src/ai/api/ai_stationlist.hpp.sq
index 04e0b8646..1c57de089 100644
--- a/src/ai/api/ai_stationlist.hpp.sq
+++ b/src/ai/api/ai_stationlist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_stationlist.hpp"
+#include "../../script/api/script_stationlist.hpp"
 
 namespace SQConvert {
 	/* Allow AIStationList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_subsidy.hpp.sq b/src/ai/api/ai_subsidy.hpp.sq
index b32dabe72..d55564a73 100644
--- a/src/ai/api/ai_subsidy.hpp.sq
+++ b/src/ai/api/ai_subsidy.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_subsidy.hpp"
+#include "../../script/api/script_subsidy.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_subsidylist.hpp.sq b/src/ai/api/ai_subsidylist.hpp.sq
index cfe441213..ab614975e 100644
--- a/src/ai/api/ai_subsidylist.hpp.sq
+++ b/src/ai/api/ai_subsidylist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_subsidylist.hpp"
+#include "../../script/api/script_subsidylist.hpp"
 
 namespace SQConvert {
 	/* Allow AISubsidyList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_testmode.hpp.sq b/src/ai/api/ai_testmode.hpp.sq
index dc369e36e..01e294b5c 100644
--- a/src/ai/api/ai_testmode.hpp.sq
+++ b/src/ai/api/ai_testmode.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_testmode.hpp"
+#include "../../script/api/script_testmode.hpp"
 
 namespace SQConvert {
 	/* Allow AITestMode to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_tile.hpp.sq b/src/ai/api/ai_tile.hpp.sq
index 6a7f771e5..a6702d43b 100644
--- a/src/ai/api/ai_tile.hpp.sq
+++ b/src/ai/api/ai_tile.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_tile.hpp"
+#include "../../script/api/script_tile.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_tilelist.hpp.sq b/src/ai/api/ai_tilelist.hpp.sq
index 0cbfbc332..361b6ecf0 100644
--- a/src/ai/api/ai_tilelist.hpp.sq
+++ b/src/ai/api/ai_tilelist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_tilelist.hpp"
+#include "../../script/api/script_tilelist.hpp"
 
 namespace SQConvert {
 	/* Allow AITileList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_town.hpp.sq b/src/ai/api/ai_town.hpp.sq
index 7bbc9a402..9b11d0bd2 100644
--- a/src/ai/api/ai_town.hpp.sq
+++ b/src/ai/api/ai_town.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_town.hpp"
+#include "../../script/api/script_town.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_townlist.hpp.sq b/src/ai/api/ai_townlist.hpp.sq
index 36798478b..ccec80e57 100644
--- a/src/ai/api/ai_townlist.hpp.sq
+++ b/src/ai/api/ai_townlist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_townlist.hpp"
+#include "../../script/api/script_townlist.hpp"
 
 namespace SQConvert {
 	/* Allow AITownList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_tunnel.hpp.sq b/src/ai/api/ai_tunnel.hpp.sq
index 6837253a9..6c138945a 100644
--- a/src/ai/api/ai_tunnel.hpp.sq
+++ b/src/ai/api/ai_tunnel.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_tunnel.hpp"
+#include "../../script/api/script_tunnel.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_vehicle.hpp.sq b/src/ai/api/ai_vehicle.hpp.sq
index ce8ff22df..b1e7dc799 100644
--- a/src/ai/api/ai_vehicle.hpp.sq
+++ b/src/ai/api/ai_vehicle.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_vehicle.hpp"
+#include "../../script/api/script_vehicle.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_vehiclelist.hpp.sq b/src/ai/api/ai_vehiclelist.hpp.sq
index ff8df7614..ce4fe1470 100644
--- a/src/ai/api/ai_vehiclelist.hpp.sq
+++ b/src/ai/api/ai_vehiclelist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_vehiclelist.hpp"
+#include "../../script/api/script_vehiclelist.hpp"
 
 namespace SQConvert {
 	/* Allow AIVehicleList to be used as Squirrel parameter */
diff --git a/src/ai/api/ai_waypoint.hpp.sq b/src/ai/api/ai_waypoint.hpp.sq
index e4db4896d..4d126f38c 100644
--- a/src/ai/api/ai_waypoint.hpp.sq
+++ b/src/ai/api/ai_waypoint.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_waypoint.hpp"
+#include "../../script/api/script_waypoint.hpp"
 
 namespace SQConvert {
 	/* Allow enums to be used as Squirrel parameters */
diff --git a/src/ai/api/ai_waypointlist.hpp.sq b/src/ai/api/ai_waypointlist.hpp.sq
index 3fedd74cf..d57ebe30f 100644
--- a/src/ai/api/ai_waypointlist.hpp.sq
+++ b/src/ai/api/ai_waypointlist.hpp.sq
@@ -9,7 +9,7 @@
 
 /* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
 
-#include "ai_waypointlist.hpp"
+#include "../../script/api/script_waypointlist.hpp"
 
 namespace SQConvert {
 	/* Allow AIWaypointList to be used as Squirrel parameter */
diff --git a/src/ai/api/squirrel_export.awk b/src/ai/api/squirrel_export.awk
index bece800d6..168d146f2 100644
--- a/src/ai/api/squirrel_export.awk
+++ b/src/ai/api/squirrel_export.awk
@@ -70,7 +70,8 @@ BEGIN {
 	print ""
 	print "/* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */"
 	print ""
-	print "#include \"" $3 "\""
+	gsub("^" tolower(api) "_", "script_", $3)
+	print "#include \"../../script/api/" $3 "\""
 }
 
 # Remove the old squirrel stuff
diff --git a/src/ai/api/squirrel_export.sh b/src/ai/api/squirrel_export.sh
index 94a16f525..725890951 100755
--- a/src/ai/api/squirrel_export.sh
+++ b/src/ai/api/squirrel_export.sh
@@ -25,20 +25,21 @@ apilc=`pwd | sed "s@/api@@;s@.*/@@"`
 apiuc=`echo ${apilc} | tr [a-z] [A-Z]`
 
 if [ -z "$1" ]; then
-	for f in `ls *.hpp`; do
-		case "${f}" in
+	for f in `ls ../../script/api/*.hpp`; do
+		bf=`basename $f | sed s/script/${apilc}/`
+		case "${bf}" in
 			# these files should not be changed by this script
 			"ai_controller.hpp" | "ai_object.hpp" | "ai_types.hpp" | "ai_changelog.hpp" | "ai_info_docs.hpp" ) continue;
 		esac
-		${AWK} -v api=${apiuc} -f squirrel_export.awk ${f} > ${f}.tmp
-		if ! [ -f "${f}.sq" ] || [ -n "`diff -I '$Id' ${f}.tmp ${f}.sq 2> /dev/null || echo boo`" ]; then
-			mv ${f}.tmp ${f}.sq
-			echo "Updated: ${f}.sq"
-			svn add ${f}.sq > /dev/null 2>&1
-			svn propset svn:eol-style native ${f}.sq > /dev/null 2>&1
-			svn propset svn:keywords Id ${f}.sq > /dev/null 2>&1
+		${AWK} -v api=${apiuc} -f squirrel_export.awk ${f} > ${bf}.tmp
+		if ! [ -f "${bf}.sq" ] || [ -n "`diff -I '$Id' ${bf}.tmp ${bf}.sq 2> /dev/null || echo boo`" ]; then
+			mv ${bf}.tmp ${bf}.sq
+			echo "Updated: ${bf}.sq"
+			svn add ${bf}.sq > /dev/null 2>&1
+			svn propset svn:eol-style native ${bf}.sq > /dev/null 2>&1
+			svn propset svn:keywords Id ${bf}.sq > /dev/null 2>&1
 		else
-			rm -f ${f}.tmp
+			rm -f ${bf}.tmp
 		fi
 	done
 else
@@ -56,8 +57,8 @@ fi
 
 # Remove .hpp.sq if .hpp doesn't exist anymore
 for f in `ls *.hpp.sq`; do
-	f=`echo ${f} | sed "s/.hpp.sq$/.hpp/"`
-	if [ ! -f ${f} ];then
+	f=`echo ${f} | sed "s/.hpp.sq$/.hpp/;s/${apilc}/script/"`
+	if [ ! -f ../../script/api/${f} ];then
 		echo "Deleted: ${f}.sq"
 		svn del --force ${f}.sq > /dev/null 2>&1
 	fi
diff --git a/src/ai/api/ai_accounting.cpp b/src/script/api/script_accounting.cpp
index 770f51286..3255f8613 100644
--- a/src/ai/api/ai_accounting.cpp
+++ b/src/script/api/script_accounting.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_accounting.cpp Implementation of AIAccounting. */
+/** @file script_accounting.cpp Implementation of AIAccounting. */
 
 #include "../../stdafx.h"
-#include "ai_accounting.hpp"
+#include "script_accounting.hpp"
 
 Money AIAccounting::GetCosts()
 {
diff --git a/src/ai/api/ai_accounting.hpp b/src/script/api/script_accounting.hpp
index a68571805..e01a7684a 100644
--- a/src/ai/api/ai_accounting.hpp
+++ b/src/script/api/script_accounting.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_accounting.hpp Everything to handle AI accounting things. */
+/** @file script_accounting.hpp Everything to handle AI accounting things. */
 
-#ifndef AI_ACCOUNTING_HPP
-#define AI_ACCOUNTING_HPP
+#ifndef SCRIPT_ACCOUNTING_HPP
+#define SCRIPT_ACCOUNTING_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that keeps track of the costs, so you can request how much a block of
@@ -62,4 +62,4 @@ private:
 	Money last_costs; ///< The last cost we did return.
 };
 
-#endif /* AI_ACCOUNTING_HPP */
+#endif /* SCRIPT_ACCOUNTING_HPP */
diff --git a/src/ai/api/ai_airport.cpp b/src/script/api/script_airport.cpp
index ac0dd6422..97d6e6bb7 100644
--- a/src/ai/api/ai_airport.cpp
+++ b/src/script/api/script_airport.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_airport.cpp Implementation of AIAirport. */
+/** @file script_airport.cpp Implementation of AIAirport. */
 
 #include "../../stdafx.h"
-#include "ai_airport.hpp"
-#include "ai_station.hpp"
+#include "script_airport.hpp"
+#include "script_station.hpp"
 #include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../town.h"
diff --git a/src/ai/api/ai_airport.hpp b/src/script/api/script_airport.hpp
index 28b870bba..c60564526 100644
--- a/src/ai/api/ai_airport.hpp
+++ b/src/script/api/script_airport.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_airport.hpp Everything to query and build airports. */
+/** @file script_airport.hpp Everything to query and build airports. */
 
-#ifndef AI_AIRPORT_HPP
-#define AI_AIRPORT_HPP
+#ifndef SCRIPT_AIRPORT_HPP
+#define SCRIPT_AIRPORT_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all airport related functions.
@@ -194,4 +194,4 @@ public:
 	static TownID GetNearestTown(TileIndex tile, AirportType type);
 };
 
-#endif /* AI_AIRPORT_HPP */
+#endif /* SCRIPT_AIRPORT_HPP */
diff --git a/src/ai/api/ai_base.cpp b/src/script/api/script_base.cpp
index 439715f16..72e0ad721 100644
--- a/src/ai/api/ai_base.cpp
+++ b/src/script/api/script_base.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_base.cpp Implementation of AIBase. */
+/** @file script_base.cpp Implementation of AIBase. */
 
 #include "../../stdafx.h"
-#include "ai_base.hpp"
+#include "script_base.hpp"
 #include "../../network/network.h"
 #include "../../core/random_func.hpp"
 
diff --git a/src/ai/api/ai_base.hpp b/src/script/api/script_base.hpp
index a98f2b844..13daa3643 100644
--- a/src/ai/api/ai_base.hpp
+++ b/src/script/api/script_base.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_base.hpp Everything to query basic things. */
+/** @file script_base.hpp Everything to query basic things. */
 
-#ifndef AI_BASE_HPP
-#define AI_BASE_HPP
+#ifndef SCRIPT_BASE_HPP
+#define SCRIPT_BASE_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles some basic functions.
@@ -73,4 +73,4 @@ public:
 	static bool ChanceItem(int unused_param, uint out, uint max);
 };
 
-#endif /* AI_BASE_HPP */
+#endif /* SCRIPT_BASE_HPP */
diff --git a/src/ai/api/ai_basestation.cpp b/src/script/api/script_basestation.cpp
index b31a0d037..2ff811346 100644
--- a/src/ai/api/ai_basestation.cpp
+++ b/src/script/api/script_basestation.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_basestation.cpp Implementation of AIBaseStation. */
+/** @file script_basestation.cpp Implementation of AIBaseStation. */
 
 #include "../../stdafx.h"
-#include "ai_basestation.hpp"
+#include "script_basestation.hpp"
 #include "../../station_base.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
diff --git a/src/ai/api/ai_basestation.hpp b/src/script/api/script_basestation.hpp
index d17acf474..b26dbaecc 100644
--- a/src/ai/api/ai_basestation.hpp
+++ b/src/script/api/script_basestation.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_basestation.hpp Base for stations/waypoint handling. */
+/** @file script_basestation.hpp Base for stations/waypoint handling. */
 
-#ifndef AI_BASESTATION_HPP
-#define AI_BASESTATION_HPP
+#ifndef SCRIPT_BASESTATION_HPP
+#define SCRIPT_BASESTATION_HPP
 
-#include "ai_error.hpp"
+#include "script_error.hpp"
 
 /**
  * Base class for stations and waypoints.
@@ -75,4 +75,4 @@ public:
 	static int32 GetConstructionDate(StationID station_id);
 };
 
-#endif /* AI_BASESTATION_HPP */
+#endif /* SCRIPT_BASESTATION_HPP */
diff --git a/src/ai/api/ai_bridge.cpp b/src/script/api/script_bridge.cpp
index 8550b3df5..a1757f315 100644
--- a/src/ai/api/ai_bridge.cpp
+++ b/src/script/api/script_bridge.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_bridge.cpp Implementation of AIBridge. */
+/** @file script_bridge.cpp Implementation of AIBridge. */
 
 #include "../../stdafx.h"
-#include "ai_bridge.hpp"
-#include "ai_rail.hpp"
-#include "../ai_instance.hpp"
+#include "script_bridge.hpp"
+#include "script_rail.hpp"
+#include "../../ai/ai_instance.hpp"
 #include "../../bridge_map.h"
 #include "../../strings_func.h"
 #include "../../economy_func.h"
diff --git a/src/ai/api/ai_bridge.hpp b/src/script/api/script_bridge.hpp
index e3d4eaa10..bb6f6a9c8 100644
--- a/src/ai/api/ai_bridge.hpp
+++ b/src/script/api/script_bridge.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_bridge.hpp Everything to query and build bridges. */
+/** @file script_bridge.hpp Everything to query and build bridges. */
 
-#ifndef AI_BRIDGE_HPP
-#define AI_BRIDGE_HPP
+#ifndef SCRIPT_BRIDGE_HPP
+#define SCRIPT_BRIDGE_HPP
 
-#include "ai_vehicle.hpp"
+#include "script_vehicle.hpp"
 
 /**
  * Class that handles all bridge related functions.
@@ -166,4 +166,4 @@ public:
 	static TileIndex GetOtherBridgeEnd(TileIndex tile);
 };
 
-#endif /* AI_BRIDGE_HPP */
+#endif /* SCRIPT_BRIDGE_HPP */
diff --git a/src/ai/api/ai_bridgelist.cpp b/src/script/api/script_bridgelist.cpp
index 4a3f590f1..95ae96cc8 100644
--- a/src/ai/api/ai_bridgelist.cpp
+++ b/src/script/api/script_bridgelist.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_bridgelist.cpp Implementation of AIBridgeList and friends. */
+/** @file script_bridgelist.cpp Implementation of AIBridgeList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_bridgelist.hpp"
-#include "ai_bridge.hpp"
+#include "script_bridgelist.hpp"
+#include "script_bridge.hpp"
 #include "../../bridge.h"
 
 AIBridgeList::AIBridgeList()
diff --git a/src/ai/api/ai_bridgelist.hpp b/src/script/api/script_bridgelist.hpp
index cae2f82c0..8d089d4a5 100644
--- a/src/ai/api/ai_bridgelist.hpp
+++ b/src/script/api/script_bridgelist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_bridgelist.hpp List all the bridges. */
+/** @file script_bridgelist.hpp List all the bridges. */
 
-#ifndef AI_BRIDGELIST_HPP
-#define AI_BRIDGELIST_HPP
+#ifndef SCRIPT_BRIDGELIST_HPP
+#define SCRIPT_BRIDGELIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Create a list of bridges.
@@ -35,4 +35,4 @@ public:
 	AIBridgeList_Length(uint length);
 };
 
-#endif /* AI_BRIDGELIST_HPP */
+#endif /* SCRIPT_BRIDGELIST_HPP */
diff --git a/src/ai/api/ai_cargo.cpp b/src/script/api/script_cargo.cpp
index f77fe6dfb..a4b9fbd1a 100644
--- a/src/ai/api/ai_cargo.cpp
+++ b/src/script/api/script_cargo.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_cargo.cpp Implementation of AICargo. */
+/** @file script_cargo.cpp Implementation of AICargo. */
 
 #include "../../stdafx.h"
-#include "ai_cargo.hpp"
+#include "script_cargo.hpp"
 #include "../../cargotype.h"
 #include "../../economy_func.h"
 #include "../../core/bitmath_func.hpp"
diff --git a/src/ai/api/ai_cargo.hpp b/src/script/api/script_cargo.hpp
index 0d6a86451..ab1e1ea74 100644
--- a/src/ai/api/ai_cargo.hpp
+++ b/src/script/api/script_cargo.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_cargo.hpp Everything to query cargos. */
+/** @file script_cargo.hpp Everything to query cargos. */
 
-#ifndef AI_CARGO_HPP
-#define AI_CARGO_HPP
+#ifndef SCRIPT_CARGO_HPP
+#define SCRIPT_CARGO_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all cargo related functions.
@@ -118,4 +118,4 @@ public:
 	static Money GetCargoIncome(CargoID cargo_type, uint32 distance, uint32 days_in_transit);
 };
 
-#endif /* AI_CARGO_HPP */
+#endif /* SCRIPT_CARGO_HPP */
diff --git a/src/ai/api/ai_cargolist.cpp b/src/script/api/script_cargolist.cpp
index 4b226f65d..12964a72d 100644
--- a/src/ai/api/ai_cargolist.cpp
+++ b/src/script/api/script_cargolist.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_cargolist.cpp Implementation of AICargoList and friends. */
+/** @file script_cargolist.cpp Implementation of AICargoList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_cargolist.hpp"
-#include "ai_industry.hpp"
-#include "ai_station.hpp"
+#include "script_cargolist.hpp"
+#include "script_industry.hpp"
+#include "script_station.hpp"
 #include "../../cargotype.h"
 #include "../../industry.h"
 #include "../../station_base.h"
diff --git a/src/ai/api/ai_cargolist.hpp b/src/script/api/script_cargolist.hpp
index 01d2ec605..334792358 100644
--- a/src/ai/api/ai_cargolist.hpp
+++ b/src/script/api/script_cargolist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_cargolist.hpp List all the cargos. */
+/** @file script_cargolist.hpp List all the cargos. */
 
-#ifndef AI_CARGOLIST_HPP
-#define AI_CARGOLIST_HPP
+#ifndef SCRIPT_CARGOLIST_HPP
+#define SCRIPT_CARGOLIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates a list of cargos that can be produced in the current game.
@@ -61,4 +61,4 @@ public:
 	AICargoList_StationAccepting(StationID station_id);
 };
 
-#endif /* AI_CARGOLIST_HPP */
+#endif /* SCRIPT_CARGOLIST_HPP */
diff --git a/src/ai/api/ai_company.cpp b/src/script/api/script_company.cpp
index 90487951c..d2b897f94 100644
--- a/src/ai/api/ai_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_company.cpp Implementation of AICompany. */
+/** @file script_company.cpp Implementation of AICompany. */
 
 #include "../../stdafx.h"
-#include "ai_company.hpp"
-#include "ai_error.hpp"
+#include "script_company.hpp"
+#include "script_error.hpp"
 #include "../../command_func.h"
 #include "../../company_func.h"
 #include "../../company_base.h"
diff --git a/src/ai/api/ai_company.hpp b/src/script/api/script_company.hpp
index 6a5d64d5d..c8a7128d7 100644
--- a/src/ai/api/ai_company.hpp
+++ b/src/script/api/script_company.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_company.hpp Everything to query a company's financials and statistics or build company related buildings. */
+/** @file script_company.hpp Everything to query a company's financials and statistics or build company related buildings. */
 
-#ifndef AI_COMPANY_HPP
-#define AI_COMPANY_HPP
+#ifndef SCRIPT_COMPANY_HPP
+#define SCRIPT_COMPANY_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all company related functions.
@@ -278,4 +278,4 @@ public:
 
 DECLARE_POSTFIX_INCREMENT(AICompany::CompanyID)
 
-#endif /* AI_COMPANY_HPP */
+#endif /* SCRIPT_COMPANY_HPP */
diff --git a/src/ai/api/ai_controller.cpp b/src/script/api/script_controller.cpp
index c99c4c0a2..bdd9bc1a7 100644
--- a/src/ai/api/ai_controller.cpp
+++ b/src/script/api/script_controller.cpp
@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_controller.cpp Implementation of AIControler. */
+/** @file script_controller.cpp Implementation of AIControler. */
 
 #include "../../stdafx.h"
 #include "../../string_func.h"
@@ -16,11 +16,11 @@
 #include "../../script/squirrel.hpp"
 #include "../../rev.h"
 
-#include "ai_controller.hpp"
-#include "../ai_instance.hpp"
-#include "../ai_config.hpp"
-#include "../ai.hpp"
-#include "ai_log.hpp"
+#include "script_controller.hpp"
+#include "../../ai/ai_instance.hpp"
+#include "../../ai/ai_config.hpp"
+#include "../../ai/ai.hpp"
+#include "script_log.hpp"
 
 /* static */ void AIController::SetCommandDelay(int ticks)
 {
diff --git a/src/ai/api/ai_controller.hpp b/src/script/api/script_controller.hpp
index 8f3dd4b66..2e0e64f2e 100644
--- a/src/ai/api/ai_controller.hpp
+++ b/src/script/api/script_controller.hpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_controller.hpp The controller of the AI. */
+/** @file script_controller.hpp The controller of the AI. */
 
-#ifndef AI_CONTROLLER_HPP
-#define AI_CONTROLLER_HPP
+#ifndef SCRIPT_CONTROLLER_HPP
+#define SCRIPT_CONTROLLER_HPP
 
 #include "../../core/string_compare_type.hpp"
 #include <map>
@@ -132,4 +132,4 @@ private:
 	void RegisterClasses();
 };
 
-#endif /* AI_CONTROLLER_HPP */
+#endif /* SCRIPT_CONTROLLER_HPP */
diff --git a/src/ai/api/ai_date.cpp b/src/script/api/script_date.cpp
index ff0375ad6..af72a69d1 100644
--- a/src/ai/api/ai_date.cpp
+++ b/src/script/api/script_date.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_date.cpp Implementation of AIDate. */
+/** @file script_date.cpp Implementation of AIDate. */
 
 #include "../../stdafx.h"
-#include "ai_date.hpp"
+#include "script_date.hpp"
 #include "../../date_func.h"
 
 /* static */ int32 AIDate::GetCurrentDate()
diff --git a/src/ai/api/ai_date.hpp b/src/script/api/script_date.hpp
index 3927845b3..d8ed4044f 100644
--- a/src/ai/api/ai_date.hpp
+++ b/src/script/api/script_date.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_date.hpp Everything to query and manipulate date related information. */
+/** @file script_date.hpp Everything to query and manipulate date related information. */
 
-#ifndef AI_DATE_HPP
-#define AI_DATE_HPP
+#ifndef SCRIPT_DATE_HPP
+#define SCRIPT_DATE_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all date related (calculation) functions.
@@ -66,4 +66,4 @@ public:
 	static int32 GetDate(int32 year, int32 month, int32 day_of_month);
 };
 
-#endif /* AI_DATE_HPP */
+#endif /* SCRIPT_DATE_HPP */
diff --git a/src/ai/api/ai_depotlist.cpp b/src/script/api/script_depotlist.cpp
index e897405fb..c4b6e2d14 100644
--- a/src/ai/api/ai_depotlist.cpp
+++ b/src/script/api/script_depotlist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_depotlist.cpp Implementation of AIDepotList and friends. */
+/** @file script_depotlist.cpp Implementation of AIDepotList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_depotlist.hpp"
+#include "script_depotlist.hpp"
 #include "../../company_func.h"
 #include "../../depot_base.h"
 #include "../../station_base.h"
diff --git a/src/ai/api/ai_depotlist.hpp b/src/script/api/script_depotlist.hpp
index a84e698ea..450fea9a8 100644
--- a/src/ai/api/ai_depotlist.hpp
+++ b/src/script/api/script_depotlist.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_depotlist.hpp List all the depots (you own). */
+/** @file script_depotlist.hpp List all the depots (you own). */
 
-#ifndef AI_DEPOTLIST_HPP
-#define AI_DEPOTLIST_HPP
+#ifndef SCRIPT_DEPOTLIST_HPP
+#define SCRIPT_DEPOTLIST_HPP
 
-#include "ai_list.hpp"
-#include "ai_tile.hpp"
+#include "script_list.hpp"
+#include "script_tile.hpp"
 
 /**
  * Creates a list of the locations of the depots (and hangars) of which you are the owner.
@@ -27,4 +27,4 @@ public:
 	AIDepotList(AITile::TransportType transport_type);
 };
 
-#endif /* AI_DEPOTLIST_HPP */
+#endif /* SCRIPT_DEPOTLIST_HPP */
diff --git a/src/ai/api/ai_engine.cpp b/src/script/api/script_engine.cpp
index 904b7fe33..f054bda31 100644
--- a/src/ai/api/ai_engine.cpp
+++ b/src/script/api/script_engine.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_engine.cpp Implementation of AIEngine. */
+/** @file script_engine.cpp Implementation of AIEngine. */
 
 #include "../../stdafx.h"
-#include "ai_engine.hpp"
-#include "ai_cargo.hpp"
+#include "script_engine.hpp"
+#include "script_cargo.hpp"
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../strings_func.h"
diff --git a/src/ai/api/ai_engine.hpp b/src/script/api/script_engine.hpp
index f44268668..26788d3d5 100644
--- a/src/ai/api/ai_engine.hpp
+++ b/src/script/api/script_engine.hpp
@@ -7,14 +7,14 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_engine.hpp Everything to query and build engines. */
+/** @file script_engine.hpp Everything to query and build engines. */
 
-#ifndef AI_ENGINE_HPP
-#define AI_ENGINE_HPP
+#ifndef SCRIPT_ENGINE_HPP
+#define SCRIPT_ENGINE_HPP
 
-#include "ai_vehicle.hpp"
-#include "ai_rail.hpp"
-#include "ai_airport.hpp"
+#include "script_vehicle.hpp"
+#include "script_rail.hpp"
+#include "script_airport.hpp"
 
 /**
  * Class that handles all engine related functions.
@@ -251,4 +251,4 @@ public:
 	static AIAirport::PlaneType GetPlaneType(EngineID engine_id);
 };
 
-#endif /* AI_ENGINE_HPP */
+#endif /* SCRIPT_ENGINE_HPP */
diff --git a/src/ai/api/ai_enginelist.cpp b/src/script/api/script_enginelist.cpp
index 549d59b0d..cbbdb725e 100644
--- a/src/ai/api/ai_enginelist.cpp
+++ b/src/script/api/script_enginelist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_enginelist.cpp Implementation of AIEngineList and friends. */
+/** @file script_enginelist.cpp Implementation of AIEngineList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_enginelist.hpp"
+#include "script_enginelist.hpp"
 #include "../../company_func.h"
 #include "../../engine_base.h"
 #include "../../core/bitmath_func.hpp"
diff --git a/src/ai/api/ai_enginelist.hpp b/src/script/api/script_enginelist.hpp
index d5e67ddd8..763c908fa 100644
--- a/src/ai/api/ai_enginelist.hpp
+++ b/src/script/api/script_enginelist.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_enginelist.hpp List all the engines. */
+/** @file script_enginelist.hpp List all the engines. */
 
-#ifndef AI_ENGINELIST_HPP
-#define AI_ENGINELIST_HPP
+#ifndef SCRIPT_ENGINELIST_HPP
+#define SCRIPT_ENGINELIST_HPP
 
-#include "ai_list.hpp"
-#include "ai_vehicle.hpp"
+#include "script_list.hpp"
+#include "script_vehicle.hpp"
 
 /**
  * Create a list of engines based on a vehicle type.
@@ -27,4 +27,4 @@ public:
 	AIEngineList(AIVehicle::VehicleType vehicle_type);
 };
 
-#endif /* AI_ENGINELIST_HPP */
+#endif /* SCRIPT_ENGINELIST_HPP */
diff --git a/src/ai/api/ai_error.cpp b/src/script/api/script_error.cpp
index db1acbc0e..0614c299e 100644
--- a/src/ai/api/ai_error.cpp
+++ b/src/script/api/script_error.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_error.cpp Implementation of AIError. */
+/** @file script_error.cpp Implementation of AIError. */
 
 #include "../../stdafx.h"
-#include "ai_error.hpp"
+#include "script_error.hpp"
 #include "../../core/bitmath_func.hpp"
 
 AIError::AIErrorMap AIError::error_map = AIError::AIErrorMap();
diff --git a/src/ai/api/ai_error.hpp b/src/script/api/script_error.hpp
index 77f0a5ea4..12fa83b97 100644
--- a/src/ai/api/ai_error.hpp
+++ b/src/script/api/script_error.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_error.hpp Everything to query errors. */
+/** @file script_error.hpp Everything to query errors. */
 
-#ifndef AI_ERROR_HPP
-#define AI_ERROR_HPP
+#ifndef SCRIPT_ERROR_HPP
+#define SCRIPT_ERROR_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 #include <map>
 
 /**
@@ -176,4 +176,4 @@ private:
 	static AIErrorMapString error_map_string; ///< The mapping between error type and textual representation.
 };
 
-#endif /* AI_ERROR_HPP */
+#endif /* SCRIPT_ERROR_HPP */
diff --git a/src/ai/api/ai_event.cpp b/src/script/api/script_event.cpp
index d659aea60..6fdbea02a 100644
--- a/src/ai/api/ai_event.cpp
+++ b/src/script/api/script_event.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_event.cpp Implementation of AIEvent. */
+/** @file script_event.cpp Implementation of AIEvent. */
 
 #include "../../stdafx.h"
-#include "ai_event_types.hpp"
+#include "script_event_types.hpp"
 
 #include <queue>
 
diff --git a/src/ai/api/ai_event.hpp b/src/script/api/script_event.hpp
index cbd5134f8..449ee0361 100644
--- a/src/ai/api/ai_event.hpp
+++ b/src/script/api/script_event.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_event.hpp Everything to handle events from the game. */
+/** @file script_event.hpp Everything to handle events from the game. */
 
-#ifndef AI_EVENT_HPP
-#define AI_EVENT_HPP
+#ifndef SCRIPT_EVENT_HPP
+#define SCRIPT_EVENT_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all event related functions.
@@ -111,4 +111,4 @@ private:
 	static void CreateEventPointer();
 };
 
-#endif /* AI_EVENT_HPP */
+#endif /* SCRIPT_EVENT_HPP */
diff --git a/src/ai/api/ai_event_types.cpp b/src/script/api/script_event_types.cpp
index 30787d3af..a74f84969 100644
--- a/src/ai/api/ai_event_types.cpp
+++ b/src/script/api/script_event_types.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_event_types.cpp Implementation of all EventTypes. */
+/** @file script_event_types.cpp Implementation of all EventTypes. */
 
 #include "../../stdafx.h"
-#include "ai_event_types.hpp"
-#include "ai_vehicle.hpp"
+#include "script_event_types.hpp"
+#include "script_vehicle.hpp"
 #include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../settings_type.h"
diff --git a/src/ai/api/ai_event_types.hpp b/src/script/api/script_event_types.hpp
index 92d7e3cfe..8c541241b 100644
--- a/src/ai/api/ai_event_types.hpp
+++ b/src/script/api/script_event_types.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_event_types.hpp The detailed types of all events. */
+/** @file script_event_types.hpp The detailed types of all events. */
 
-#ifndef AI_EVENT_TYPES_HPP
-#define AI_EVENT_TYPES_HPP
+#ifndef SCRIPT_EVENT_TYPES_HPP
+#define SCRIPT_EVENT_TYPES_HPP
 
-#include "ai_event.hpp"
-#include "ai_company.hpp"
+#include "script_event.hpp"
+#include "script_company.hpp"
 
 /**
  * Event Vehicle Crash, indicating a vehicle of yours is crashed.
@@ -775,4 +775,4 @@ private:
 	TownID town; ///< The town that got founded.
 };
 
-#endif /* AI_EVENT_TYPES_HPP */
+#endif /* SCRIPT_EVENT_TYPES_HPP */
diff --git a/src/ai/api/ai_execmode.cpp b/src/script/api/script_execmode.cpp
index f5e1e502b..b4631b0f0 100644
--- a/src/ai/api/ai_execmode.cpp
+++ b/src/script/api/script_execmode.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_execmode.cpp Implementation of AIExecMode. */
+/** @file script_execmode.cpp Implementation of AIExecMode. */
 
 #include "../../stdafx.h"
-#include "ai_execmode.hpp"
+#include "script_execmode.hpp"
 #include "../../company_base.h"
 #include "../../company_func.h"
-#include "../ai_instance.hpp"
+#include "../../ai/ai_instance.hpp"
 
 bool AIExecMode::ModeProc()
 {
diff --git a/src/ai/api/ai_execmode.hpp b/src/script/api/script_execmode.hpp
index 43765f177..4772251d7 100644
--- a/src/ai/api/ai_execmode.hpp
+++ b/src/script/api/script_execmode.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_execmode.hpp Switch the AI to Execute Mode. */
+/** @file script_execmode.hpp Switch the AI to Execute Mode. */
 
-#ifndef AI_EXECMODE_HPP
-#define AI_EXECMODE_HPP
+#ifndef SCRIPT_EXECMODE_HPP
+#define SCRIPT_EXECMODE_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class to switch current mode to Execute Mode.
@@ -47,4 +47,4 @@ public:
 	~AIExecMode();
 };
 
-#endif /* AI_EXECMODE_HPP */
+#endif /* SCRIPT_EXECMODE_HPP */
diff --git a/src/ai/api/ai_gamesettings.cpp b/src/script/api/script_gamesettings.cpp
index cbd7f6e6a..3dba54a00 100644
--- a/src/ai/api/ai_gamesettings.cpp
+++ b/src/script/api/script_gamesettings.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_gamesettings.cpp Implementation of AIGameSettings. */
+/** @file script_gamesettings.cpp Implementation of AIGameSettings. */
 
 #include "../../stdafx.h"
-#include "ai_gamesettings.hpp"
+#include "script_gamesettings.hpp"
 #include "../../settings_internal.h"
 
 /* static */ bool AIGameSettings::IsValid(const char *setting)
diff --git a/src/ai/api/ai_gamesettings.hpp b/src/script/api/script_gamesettings.hpp
index 947dc8f99..07efd630e 100644
--- a/src/ai/api/ai_gamesettings.hpp
+++ b/src/script/api/script_gamesettings.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_gamesettings.hpp Everything to read game settings. */
+/** @file script_gamesettings.hpp Everything to read game settings. */
 
-#ifndef AI_GAMESETTINGS_HPP
-#define AI_GAMESETTINGS_HPP
+#ifndef SCRIPT_GAMESETTINGS_HPP
+#define SCRIPT_GAMESETTINGS_HPP
 
-#include "ai_vehicle.hpp"
+#include "script_vehicle.hpp"
 
 /**
  * Class that handles all game settings related functions.
@@ -68,4 +68,4 @@ public:
 	static bool IsDisabledVehicleType(AIVehicle::VehicleType vehicle_type);
 };
 
-#endif /* AI_GAMESETTINGS_HPP */
+#endif /* SCRIPT_GAMESETTINGS_HPP */
diff --git a/src/ai/api/ai_group.cpp b/src/script/api/script_group.cpp
index 5a95ee7c8..3c879bf52 100644
--- a/src/ai/api/ai_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_group.cpp Implementation of AIGroup. */
+/** @file script_group.cpp Implementation of AIGroup. */
 
 #include "../../stdafx.h"
-#include "ai_group.hpp"
-#include "ai_engine.hpp"
-#include "../ai_instance.hpp"
+#include "script_group.hpp"
+#include "script_engine.hpp"
+#include "../../ai/ai_instance.hpp"
 #include "../../company_func.h"
 #include "../../group.h"
 #include "../../string_func.h"
diff --git a/src/ai/api/ai_group.hpp b/src/script/api/script_group.hpp
index 2e025e013..2c9368188 100644
--- a/src/ai/api/ai_group.hpp
+++ b/src/script/api/script_group.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_group.hpp Everything to put vehicles into groups. */
+/** @file script_group.hpp Everything to put vehicles into groups. */
 
-#ifndef AI_GROUP_HPP
-#define AI_GROUP_HPP
+#ifndef SCRIPT_GROUP_HPP
+#define SCRIPT_GROUP_HPP
 
-#include "ai_vehicle.hpp"
+#include "script_vehicle.hpp"
 
 /**
  * Class that handles all group related functions.
@@ -172,4 +172,4 @@ public:
 	static bool StopAutoReplace(GroupID group_id, EngineID engine_id);
 };
 
-#endif /* AI_GROUP_HPP */
+#endif /* SCRIPT_GROUP_HPP */
diff --git a/src/ai/api/ai_grouplist.cpp b/src/script/api/script_grouplist.cpp
index 04413d604..017af8b8a 100644
--- a/src/ai/api/ai_grouplist.cpp
+++ b/src/script/api/script_grouplist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_grouplist.cpp Implementation of AIGroupList and friends. */
+/** @file script_grouplist.cpp Implementation of AIGroupList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_grouplist.hpp"
+#include "script_grouplist.hpp"
 #include "../../company_func.h"
 #include "../../group.h"
 
diff --git a/src/ai/api/ai_grouplist.hpp b/src/script/api/script_grouplist.hpp
index 1631a1d1d..3e02d1ce3 100644
--- a/src/ai/api/ai_grouplist.hpp
+++ b/src/script/api/script_grouplist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_grouplist.hpp List all the groups (you own). */
+/** @file script_grouplist.hpp List all the groups (you own). */
 
-#ifndef AI_GROUPLIST_HPP
-#define AI_GROUPLIST_HPP
+#ifndef SCRIPT_GROUPLIST_HPP
+#define SCRIPT_GROUPLIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates a list of groups of which you are the owner.
@@ -24,4 +24,4 @@ public:
 	AIGroupList();
 };
 
-#endif /* AI_GROUPLIST_HPP */
+#endif /* SCRIPT_GROUPLIST_HPP */
diff --git a/src/ai/api/ai_industry.cpp b/src/script/api/script_industry.cpp
index 6175eb1b8..a3330fdeb 100644
--- a/src/ai/api/ai_industry.cpp
+++ b/src/script/api/script_industry.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industry.cpp Implementation of AIIndustry. */
+/** @file script_industry.cpp Implementation of AIIndustry. */
 
 #include "../../stdafx.h"
-#include "ai_industry.hpp"
-#include "ai_cargo.hpp"
-#include "ai_map.hpp"
+#include "script_industry.hpp"
+#include "script_cargo.hpp"
+#include "script_map.hpp"
 #include "../../industry.h"
 #include "../../strings_func.h"
 #include "../../station_base.h"
diff --git a/src/ai/api/ai_industry.hpp b/src/script/api/script_industry.hpp
index a5513e453..32c77ee25 100644
--- a/src/ai/api/ai_industry.hpp
+++ b/src/script/api/script_industry.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industry.hpp Everything to query and build industries. */
+/** @file script_industry.hpp Everything to query and build industries. */
 
-#ifndef AI_INDUSTRY_HPP
-#define AI_INDUSTRY_HPP
+#ifndef SCRIPT_INDUSTRY_HPP
+#define SCRIPT_INDUSTRY_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all industry related functions.
@@ -199,4 +199,4 @@ public:
 	static IndustryType GetIndustryType(IndustryID industry_id);
 };
 
-#endif /* AI_INDUSTRY_HPP */
+#endif /* SCRIPT_INDUSTRY_HPP */
diff --git a/src/ai/api/ai_industrylist.cpp b/src/script/api/script_industrylist.cpp
index 2211abfb2..c3ec20fa3 100644
--- a/src/ai/api/ai_industrylist.cpp
+++ b/src/script/api/script_industrylist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industrylist.cpp Implementation of AIIndustryList and friends. */
+/** @file script_industrylist.cpp Implementation of AIIndustryList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_industrylist.hpp"
+#include "script_industrylist.hpp"
 #include "../../industry.h"
 
 AIIndustryList::AIIndustryList()
diff --git a/src/ai/api/ai_industrylist.hpp b/src/script/api/script_industrylist.hpp
index 255873b82..41a2e6586 100644
--- a/src/ai/api/ai_industrylist.hpp
+++ b/src/script/api/script_industrylist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industrylist.hpp List all the industries. */
+/** @file script_industrylist.hpp List all the industries. */
 
-#ifndef AI_INDUSTRYLIST_HPP
-#define AI_INDUSTRYLIST_HPP
+#ifndef SCRIPT_INDUSTRYLIST_HPP
+#define SCRIPT_INDUSTRYLIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates a list of industries that are currently on the map.
@@ -48,4 +48,4 @@ public:
 	AIIndustryList_CargoProducing(CargoID cargo_id);
 };
 
-#endif /* AI_INDUSTRYLIST_HPP */
+#endif /* SCRIPT_INDUSTRYLIST_HPP */
diff --git a/src/ai/api/ai_industrytype.cpp b/src/script/api/script_industrytype.cpp
index bd28df289..0a369b8f1 100644
--- a/src/ai/api/ai_industrytype.cpp
+++ b/src/script/api/script_industrytype.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industrytype.cpp Implementation of AIIndustryType. */
+/** @file script_industrytype.cpp Implementation of AIIndustryType. */
 
 #include "../../stdafx.h"
-#include "ai_industrytype.hpp"
-#include "ai_map.hpp"
-#include "ai_error.hpp"
+#include "script_industrytype.hpp"
+#include "script_map.hpp"
+#include "script_error.hpp"
 #include "../../strings_func.h"
 #include "../../industry.h"
 #include "../../newgrf_industries.h"
diff --git a/src/ai/api/ai_industrytype.hpp b/src/script/api/script_industrytype.hpp
index 523fad8e3..ad37aceda 100644
--- a/src/ai/api/ai_industrytype.hpp
+++ b/src/script/api/script_industrytype.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industrytype.hpp Everything to query and build industries. */
+/** @file script_industrytype.hpp Everything to query and build industries. */
 
-#ifndef AI_INDUSTRYTYPE_HPP
-#define AI_INDUSTRYTYPE_HPP
+#ifndef SCRIPT_INDUSTRYTYPE_HPP
+#define SCRIPT_INDUSTRYTYPE_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Class that handles all industry-type related functions.
@@ -150,4 +150,4 @@ public:
 	static bool HasDock(IndustryType industry_type);
 };
 
-#endif /* AI_INDUSTRYTYPE_HPP */
+#endif /* SCRIPT_INDUSTRYTYPE_HPP */
diff --git a/src/ai/api/ai_industrytypelist.cpp b/src/script/api/script_industrytypelist.cpp
index c417ae847..fbbe6bcf2 100644
--- a/src/ai/api/ai_industrytypelist.cpp
+++ b/src/script/api/script_industrytypelist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */
+/** @file script_industrytypelist.cpp Implementation of AIIndustryTypeList. */
 
 #include "../../stdafx.h"
-#include "ai_industrytypelist.hpp"
+#include "script_industrytypelist.hpp"
 #include "../../industry.h"
 
 AIIndustryTypeList::AIIndustryTypeList()
diff --git a/src/ai/api/ai_industrytypelist.hpp b/src/script/api/script_industrytypelist.hpp
index 90991096a..b0f25715d 100644
--- a/src/ai/api/ai_industrytypelist.hpp
+++ b/src/script/api/script_industrytypelist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_industrytypelist.hpp List all available industry types. */
+/** @file script_industrytypelist.hpp List all available industry types. */
 
-#ifndef AI_INDUSTRYTYPELIST_HPP
-#define AI_INDUSTRYTYPELIST_HPP
+#ifndef SCRIPT_INDUSTRYTYPELIST_HPP
+#define SCRIPT_INDUSTRYTYPELIST_HPP
 
-#include "ai_industrytype.hpp"
+#include "script_industrytype.hpp"
 
 /**
  * Creates a list of valid industry types.
@@ -24,4 +24,4 @@ public:
 };
 
 
-#endif /* AI_INDUSTRYTYPELIST_HPP */
+#endif /* SCRIPT_INDUSTRYTYPELIST_HPP */
diff --git a/src/ai/api/ai_list.cpp b/src/script/api/script_list.cpp
index 2188d6674..331b852d8 100644
--- a/src/ai/api/ai_list.cpp
+++ b/src/script/api/script_list.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_list.cpp Implementation of AIList. */
+/** @file script_list.cpp Implementation of AIList. */
 
 #include "../../stdafx.h"
-#include "ai_list.hpp"
+#include "script_list.hpp"
 #include "../../debug.h"
 #include "../../script/squirrel.hpp"
 
diff --git a/src/ai/api/ai_list.hpp b/src/script/api/script_list.hpp
index 9087f26c5..9c5765b21 100644
--- a/src/ai/api/ai_list.hpp
+++ b/src/script/api/script_list.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_list.hpp A list which can keep item/value pairs, which you can walk. */
+/** @file script_list.hpp A list which can keep item/value pairs, which you can walk. */
 /** @defgroup AIList Classes that create a list of items. */
 
-#ifndef AI_LIST_HPP
-#define AI_LIST_HPP
+#ifndef SCRIPT_LIST_HPP
+#define SCRIPT_LIST_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 #include <map>
 #include <set>
 
@@ -280,4 +280,4 @@ public:
 #endif /* DOXYGEN_AI_DOCS */
 };
 
-#endif /* AI_LIST_HPP */
+#endif /* SCRIPT_LIST_HPP */
diff --git a/src/ai/api/ai_log.cpp b/src/script/api/script_log.cpp
index fb2935479..10eff9088 100644
--- a/src/ai/api/ai_log.cpp
+++ b/src/script/api/script_log.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_log.cpp Implementation of AILog. */
+/** @file script_log.cpp Implementation of AILog. */
 
 #include "../../stdafx.h"
-#include "ai_log.hpp"
+#include "script_log.hpp"
 #include "../../core/alloc_func.hpp"
 #include "../../company_func.h"
 #include "../../debug.h"
diff --git a/src/ai/api/ai_log.hpp b/src/script/api/script_log.hpp
index 00ada4e3f..e352e232c 100644
--- a/src/ai/api/ai_log.hpp
+++ b/src/script/api/script_log.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_log.hpp Everything to handle and issue log messages. */
+/** @file script_log.hpp Everything to handle and issue log messages. */
 
-#ifndef AI_LOG_HPP
-#define AI_LOG_HPP
+#ifndef SCRIPT_LOG_HPP
+#define SCRIPT_LOG_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class that handles all log related functions.
@@ -82,4 +82,4 @@ private:
 	static void Log(AILog::AILogType level, const char *message);
 };
 
-#endif /* AI_LOG_HPP */
+#endif /* SCRIPT_LOG_HPP */
diff --git a/src/ai/api/ai_map.cpp b/src/script/api/script_map.cpp
index d5728b9eb..b347f4572 100644
--- a/src/ai/api/ai_map.cpp
+++ b/src/script/api/script_map.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_map.cpp Implementation of AIMap. */
+/** @file script_map.cpp Implementation of AIMap. */
 
 #include "../../stdafx.h"
-#include "ai_map.hpp"
+#include "script_map.hpp"
 #include "../../tile_map.h"
 
 /* static */ bool AIMap::IsValidTile(TileIndex t)
diff --git a/src/ai/api/ai_map.hpp b/src/script/api/script_map.hpp
index 15ff5c337..3567a5890 100644
--- a/src/ai/api/ai_map.hpp
+++ b/src/script/api/script_map.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_map.hpp Everything to query and manipulate map metadata. */
+/** @file script_map.hpp Everything to query and manipulate map metadata. */
 
-#ifndef AI_MAP_HPP
-#define AI_MAP_HPP
+#ifndef SCRIPT_MAP_HPP
+#define SCRIPT_MAP_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 #include "../../tile_type.h"
 
 /**
@@ -122,4 +122,4 @@ public:
 	static int32 DistanceFromEdge(TileIndex tile);
 };
 
-#endif /* AI_MAP_HPP */
+#endif /* SCRIPT_MAP_HPP */
diff --git a/src/ai/api/ai_marine.cpp b/src/script/api/script_marine.cpp
index 00cff6623..1bfd7ddb3 100644
--- a/src/ai/api/ai_marine.cpp
+++ b/src/script/api/script_marine.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_marine.cpp Implementation of AIMarine. */
+/** @file script_marine.cpp Implementation of AIMarine. */
 
 #include "../../stdafx.h"
-#include "ai_marine.hpp"
-#include "ai_station.hpp"
+#include "script_marine.hpp"
+#include "script_station.hpp"
 #include "../../station_base.h"
 #include "../../tile_cmd.h"
 
diff --git a/src/ai/api/ai_marine.hpp b/src/script/api/script_marine.hpp
index 1eb691fe3..d9d013c9d 100644
--- a/src/ai/api/ai_marine.hpp
+++ b/src/script/api/script_marine.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_marine.hpp Everything to query and build marine. */
+/** @file script_marine.hpp Everything to query and build marine. */
 
-#ifndef AI_MARINE_HPP
-#define AI_MARINE_HPP
+#ifndef SCRIPT_MARINE_HPP
+#define SCRIPT_MARINE_HPP
 
-#include "ai_error.hpp"
+#include "script_error.hpp"
 
 /**
  * Class that handles all marine related functions.
@@ -207,4 +207,4 @@ public:
 	static Money GetBuildCost(BuildType build_type);
 };
 
-#endif /* AI_MARINE_HPP */
+#endif /* SCRIPT_MARINE_HPP */
diff --git a/src/ai/api/ai_object.cpp b/src/script/api/script_object.cpp
index 53f2f2b55..ce734c608 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_object.cpp Implementation of AIObject. */
+/** @file script_object.cpp Implementation of AIObject. */
 
 #include "../../stdafx.h"
 #include "../../script/squirrel.hpp"
@@ -15,9 +15,9 @@
 #include "../../network/network.h"
 #include "../../tunnelbridge.h"
 
-#include "../ai_storage.hpp"
-#include "../ai_instance.hpp"
-#include "ai_error.hpp"
+#include "../../ai/ai_storage.hpp"
+#include "../../ai/ai_instance.hpp"
+#include "script_error.hpp"
 
 /**
  * Get the storage associated with the current AIInstance.
diff --git a/src/ai/api/ai_object.hpp b/src/script/api/script_object.hpp
index deac277dd..214d0e7cc 100644
--- a/src/ai/api/ai_object.hpp
+++ b/src/script/api/script_object.hpp
@@ -7,16 +7,16 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_object.hpp Main object, on which all objects depend. */
+/** @file script_object.hpp Main object, on which all objects depend. */
 
-#ifndef AI_OBJECT_HPP
-#define AI_OBJECT_HPP
+#ifndef SCRIPT_OBJECT_HPP
+#define SCRIPT_OBJECT_HPP
 
 #include "../../misc/countedptr.hpp"
 #include "../../road_type.h"
 #include "../../rail_type.h"
 
-#include "ai_types.hpp"
+#include "script_types.hpp"
 
 /**
  * The callback function when an AI suspends.
@@ -246,4 +246,4 @@ private:
 #endif /* DOXYGEN_AI_DOCS */
 };
 
-#endif /* AI_OBJECT_HPP */
+#endif /* SCRIPT_OBJECT_HPP */
diff --git a/src/ai/api/ai_order.cpp b/src/script/api/script_order.cpp
index a905aedb8..1811207cb 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/script/api/script_order.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_order.cpp Implementation of AIOrder. */
+/** @file script_order.cpp Implementation of AIOrder. */
 
 #include "../../stdafx.h"
-#include "ai_order.hpp"
-#include "ai_vehicle.hpp"
-#include "ai_cargo.hpp"
-#include "../ai_instance.hpp"
+#include "script_order.hpp"
+#include "script_vehicle.hpp"
+#include "script_cargo.hpp"
+#include "../../ai/ai_instance.hpp"
 #include "../../debug.h"
 #include "../../vehicle_base.h"
 #include "../../roadstop_base.h"
diff --git a/src/ai/api/ai_order.hpp b/src/script/api/script_order.hpp
index 470b6faaf..0f2372e77 100644
--- a/src/ai/api/ai_order.hpp
+++ b/src/script/api/script_order.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_order.hpp Everything to query and build orders. */
+/** @file script_order.hpp Everything to query and build orders. */
 
-#ifndef AI_ORDER_HPP
-#define AI_ORDER_HPP
+#ifndef SCRIPT_ORDER_HPP
+#define SCRIPT_ORDER_HPP
 
-#include "ai_error.hpp"
+#include "script_error.hpp"
 
 /**
  * Class that handles all order related functions.
@@ -558,4 +558,4 @@ public:
 };
 DECLARE_ENUM_AS_BIT_SET(AIOrder::AIOrderFlags)
 
-#endif /* AI_ORDER_HPP */
+#endif /* SCRIPT_ORDER_HPP */
diff --git a/src/ai/api/ai_rail.cpp b/src/script/api/script_rail.cpp
index 8d4606544..236106d15 100644
--- a/src/ai/api/ai_rail.cpp
+++ b/src/script/api/script_rail.cpp
@@ -7,14 +7,14 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_rail.cpp Implementation of AIRail. */
+/** @file script_rail.cpp Implementation of AIRail. */
 
 #include "../../stdafx.h"
-#include "ai_rail.hpp"
-#include "ai_map.hpp"
-#include "ai_station.hpp"
-#include "ai_industrytype.hpp"
-#include "ai_cargo.hpp"
+#include "script_rail.hpp"
+#include "script_map.hpp"
+#include "script_station.hpp"
+#include "script_industrytype.hpp"
+#include "script_cargo.hpp"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
diff --git a/src/ai/api/ai_rail.hpp b/src/script/api/script_rail.hpp
index 0a9f70c5b..57b0fa42b 100644
--- a/src/ai/api/ai_rail.hpp
+++ b/src/script/api/script_rail.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_rail.hpp Everything to query and build rails. */
+/** @file script_rail.hpp Everything to query and build rails. */
 
-#ifndef AI_RAIL_HPP
-#define AI_RAIL_HPP
+#ifndef SCRIPT_RAIL_HPP
+#define SCRIPT_RAIL_HPP
 
-#include "ai_tile.hpp"
+#include "script_tile.hpp"
 
 /**
  * Class that handles all rail related functions.
@@ -465,4 +465,4 @@ public:
 	static int32 GetMaxSpeed(RailType railtype);
 };
 
-#endif /* AI_RAIL_HPP */
+#endif /* SCRIPT_RAIL_HPP */
diff --git a/src/ai/api/ai_railtypelist.cpp b/src/script/api/script_railtypelist.cpp
index 9f2801e29..7052f7551 100644
--- a/src/ai/api/ai_railtypelist.cpp
+++ b/src/script/api/script_railtypelist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_railtypelist.cpp Implementation of AIRailTypeList and friends. */
+/** @file script_railtypelist.cpp Implementation of AIRailTypeList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_railtypelist.hpp"
+#include "script_railtypelist.hpp"
 #include "../../rail.h"
 #include "../../company_func.h"
 
diff --git a/src/ai/api/ai_railtypelist.hpp b/src/script/api/script_railtypelist.hpp
index 8162b80f5..fcc7595cf 100644
--- a/src/ai/api/ai_railtypelist.hpp
+++ b/src/script/api/script_railtypelist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_railtypelist.hpp List all available railtypes. */
+/** @file script_railtypelist.hpp List all available railtypes. */
 
-#ifndef AI_RAILTYPELIST_HPP
-#define AI_RAILTYPELIST_HPP
+#ifndef SCRIPT_RAILTYPELIST_HPP
+#define SCRIPT_RAILTYPELIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates a list of all available railtypes.
@@ -23,4 +23,4 @@ public:
 	AIRailTypeList();
 };
 
-#endif /* AI_RAILTYPELIST_HPP */
+#endif /* SCRIPT_RAILTYPELIST_HPP */
diff --git a/src/ai/api/ai_road.cpp b/src/script/api/script_road.cpp
index 784ca69b7..a60f99480 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/script/api/script_road.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_road.cpp Implementation of AIRoad. */
+/** @file script_road.cpp Implementation of AIRoad. */
 
 #include "../../stdafx.h"
-#include "ai_map.hpp"
-#include "ai_station.hpp"
-#include "ai_cargo.hpp"
+#include "script_map.hpp"
+#include "script_station.hpp"
+#include "script_cargo.hpp"
 #include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
diff --git a/src/ai/api/ai_road.hpp b/src/script/api/script_road.hpp
index 32095799f..8e6757499 100644
--- a/src/ai/api/ai_road.hpp
+++ b/src/script/api/script_road.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_road.hpp Everything to query and build roads. */
+/** @file script_road.hpp Everything to query and build roads. */
 
-#ifndef AI_ROAD_HPP
-#define AI_ROAD_HPP
+#ifndef SCRIPT_ROAD_HPP
+#define SCRIPT_ROAD_HPP
 
-#include "ai_tile.hpp"
+#include "script_tile.hpp"
 
 /**
  * Class that handles all road related functions.
@@ -483,4 +483,4 @@ private:
 	static bool _BuildRoadStationInternal(TileIndex tile, TileIndex front, RoadVehicleType road_veh_type, bool drive_through, StationID station_id);
 };
 
-#endif /* AI_ROAD_HPP */
+#endif /* SCRIPT_ROAD_HPP */
diff --git a/src/ai/api/ai_sign.cpp b/src/script/api/script_sign.cpp
index 971d52ce5..2178f3846 100644
--- a/src/ai/api/ai_sign.cpp
+++ b/src/script/api/script_sign.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_sign.cpp Implementation of AISign. */
+/** @file script_sign.cpp Implementation of AISign. */
 
 #include "../../stdafx.h"
-#include "ai_sign.hpp"
+#include "script_sign.hpp"
 #include "table/strings.h"
-#include "../ai_instance.hpp"
+#include "../../ai/ai_instance.hpp"
 #include "../../command_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../signs_base.h"
diff --git a/src/ai/api/ai_sign.hpp b/src/script/api/script_sign.hpp
index afbcf0d77..385e24f68 100644
--- a/src/ai/api/ai_sign.hpp
+++ b/src/script/api/script_sign.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_sign.hpp Everything to query and build signs. */
+/** @file script_sign.hpp Everything to query and build signs. */
 
-#ifndef AI_SIGN_HPP
-#define AI_SIGN_HPP
+#ifndef SCRIPT_SIGN_HPP
+#define SCRIPT_SIGN_HPP
 
-#include "ai_error.hpp"
+#include "script_error.hpp"
 
 /**
  * Class that handles all sign related functions.
@@ -89,4 +89,4 @@ public:
 	static bool RemoveSign(SignID sign_id);
 };
 
-#endif /* AI_SIGN_HPP */
+#endif /* SCRIPT_SIGN_HPP */
diff --git a/src/ai/api/ai_signlist.cpp b/src/script/api/script_signlist.cpp
index 661779937..3d7b228f3 100644
--- a/src/ai/api/ai_signlist.cpp
+++ b/src/script/api/script_signlist.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_signlist.cpp Implementation of AISignList and friends. */
+/** @file script_signlist.cpp Implementation of AISignList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_signlist.hpp"
-#include "ai_sign.hpp"
+#include "script_signlist.hpp"
+#include "script_sign.hpp"
 #include "../../signs_base.h"
 
 AISignList::AISignList()
diff --git a/src/ai/api/ai_signlist.hpp b/src/script/api/script_signlist.hpp
index d96e8c658..af6a9614b 100644
--- a/src/ai/api/ai_signlist.hpp
+++ b/src/script/api/script_signlist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_signlist.hpp List all the signs of your company. */
+/** @file script_signlist.hpp List all the signs of your company. */
 
-#ifndef AI_SIGNLIST_HPP
-#define AI_SIGNLIST_HPP
+#ifndef SCRIPT_SIGNLIST_HPP
+#define SCRIPT_SIGNLIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Create a list of signs your company has created.
@@ -23,4 +23,4 @@ public:
 	AISignList();
 };
 
-#endif /* AI_SIGNLIST_HPP */
+#endif /* SCRIPT_SIGNLIST_HPP */
diff --git a/src/ai/api/ai_station.cpp b/src/script/api/script_station.cpp
index 68a00368c..6dc0c009d 100644
--- a/src/ai/api/ai_station.cpp
+++ b/src/script/api/script_station.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_station.cpp Implementation of AIStation. */
+/** @file script_station.cpp Implementation of AIStation. */
 
 #include "../../stdafx.h"
-#include "ai_station.hpp"
-#include "ai_cargo.hpp"
-#include "ai_map.hpp"
-#include "ai_town.hpp"
+#include "script_station.hpp"
+#include "script_cargo.hpp"
+#include "script_map.hpp"
+#include "script_town.hpp"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../roadstop_base.h"
diff --git a/src/ai/api/ai_station.hpp b/src/script/api/script_station.hpp
index 66b1690bf..b9266c7d3 100644
--- a/src/ai/api/ai_station.hpp
+++ b/src/script/api/script_station.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_station.hpp Everything to query and build stations. */
+/** @file script_station.hpp Everything to query and build stations. */
 
-#ifndef AI_STATION_HPP
-#define AI_STATION_HPP
+#ifndef SCRIPT_STATION_HPP
+#define SCRIPT_STATION_HPP
 
-#include "ai_road.hpp"
-#include "ai_basestation.hpp"
+#include "script_road.hpp"
+#include "script_basestation.hpp"
 
 /**
  * Class that handles all station related functions.
@@ -155,4 +155,4 @@ public:
 
 DECLARE_ENUM_AS_BIT_SET(AIStation::StationType)
 
-#endif /* AI_STATION_HPP */
+#endif /* SCRIPT_STATION_HPP */
diff --git a/src/ai/api/ai_stationlist.cpp b/src/script/api/script_stationlist.cpp
index 778052d32..46394851f 100644
--- a/src/ai/api/ai_stationlist.cpp
+++ b/src/script/api/script_stationlist.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_stationlist.cpp Implementation of AIStationList and friends. */
+/** @file script_stationlist.cpp Implementation of AIStationList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_stationlist.hpp"
-#include "ai_vehicle.hpp"
+#include "script_stationlist.hpp"
+#include "script_vehicle.hpp"
 #include "../../company_func.h"
 #include "../../station_base.h"
 #include "../../vehicle_base.h"
diff --git a/src/ai/api/ai_stationlist.hpp b/src/script/api/script_stationlist.hpp
index b066523ab..6894ecf41 100644
--- a/src/ai/api/ai_stationlist.hpp
+++ b/src/script/api/script_stationlist.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_stationlist.hpp List all the stations (you own). */
+/** @file script_stationlist.hpp List all the stations (you own). */
 
-#ifndef AI_STATIONLIST_HPP
-#define AI_STATIONLIST_HPP
+#ifndef SCRIPT_STATIONLIST_HPP
+#define SCRIPT_STATIONLIST_HPP
 
-#include "ai_list.hpp"
-#include "ai_station.hpp"
+#include "script_list.hpp"
+#include "script_station.hpp"
 
 /**
  * Creates a list of stations of which you are the owner.
@@ -39,4 +39,4 @@ public:
 	AIStationList_Vehicle(VehicleID vehicle_id);
 };
 
-#endif /* AI_STATIONLIST_HPP */
+#endif /* SCRIPT_STATIONLIST_HPP */
diff --git a/src/ai/api/ai_subsidy.cpp b/src/script/api/script_subsidy.cpp
index 47a1c55dd..f770d29f7 100644
--- a/src/ai/api/ai_subsidy.cpp
+++ b/src/script/api/script_subsidy.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_subsidy.cpp Implementation of AISubsidy. */
+/** @file script_subsidy.cpp Implementation of AISubsidy. */
 
 #include "../../stdafx.h"
-#include "ai_subsidy.hpp"
-#include "ai_date.hpp"
+#include "script_subsidy.hpp"
+#include "script_date.hpp"
 #include "../../subsidy_base.h"
 #include "../../station_base.h"
 
diff --git a/src/ai/api/ai_subsidy.hpp b/src/script/api/script_subsidy.hpp
index f9f0cf140..3e7ac3ee0 100644
--- a/src/ai/api/ai_subsidy.hpp
+++ b/src/script/api/script_subsidy.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_subsidy.hpp Everything to query subsidies. */
+/** @file script_subsidy.hpp Everything to query subsidies. */
 
-#ifndef AI_SUBSIDY_HPP
-#define AI_SUBSIDY_HPP
+#ifndef SCRIPT_SUBSIDY_HPP
+#define SCRIPT_SUBSIDY_HPP
 
-#include "ai_company.hpp"
+#include "script_company.hpp"
 
 /**
  * Class that handles all subsidy related functions.
@@ -110,4 +110,4 @@ public:
 	static int32 GetDestinationIndex(SubsidyID subsidy_id);
 };
 
-#endif /* AI_SUBSIDY_HPP */
+#endif /* SCRIPT_SUBSIDY_HPP */
diff --git a/src/ai/api/ai_subsidylist.cpp b/src/script/api/script_subsidylist.cpp
index 299ab9d99..f694b9870 100644
--- a/src/ai/api/ai_subsidylist.cpp
+++ b/src/script/api/script_subsidylist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_subsidylist.cpp Implementation of AISubsidyList. */
+/** @file script_subsidylist.cpp Implementation of AISubsidyList. */
 
 #include "../../stdafx.h"
-#include "ai_subsidylist.hpp"
+#include "script_subsidylist.hpp"
 #include "../../subsidy_base.h"
 
 AISubsidyList::AISubsidyList()
diff --git a/src/ai/api/ai_subsidylist.hpp b/src/script/api/script_subsidylist.hpp
index 786f1377f..332412c9d 100644
--- a/src/ai/api/ai_subsidylist.hpp
+++ b/src/script/api/script_subsidylist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_subsidylist.hpp List all the subsidies. */
+/** @file script_subsidylist.hpp List all the subsidies. */
 
-#ifndef AI_SUBSIDYLIST_HPP
-#define AI_SUBSIDYLIST_HPP
+#ifndef SCRIPT_SUBSIDYLIST_HPP
+#define SCRIPT_SUBSIDYLIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates a list of all current subsidies.
@@ -23,4 +23,4 @@ public:
 	AISubsidyList();
 };
 
-#endif /* AI_SUBSIDYLIST_HPP */
+#endif /* SCRIPT_SUBSIDYLIST_HPP */
diff --git a/src/ai/api/ai_testmode.cpp b/src/script/api/script_testmode.cpp
index 6e2f515b4..a2e696f59 100644
--- a/src/ai/api/ai_testmode.cpp
+++ b/src/script/api/script_testmode.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_testmode.cpp Implementation of AITestMode. */
+/** @file script_testmode.cpp Implementation of AITestMode. */
 
 #include "../../stdafx.h"
-#include "ai_testmode.hpp"
+#include "script_testmode.hpp"
 #include "../../company_base.h"
 #include "../../company_func.h"
-#include "../ai_instance.hpp"
+#include "../../ai/ai_instance.hpp"
 
 bool AITestMode::ModeProc()
 {
diff --git a/src/ai/api/ai_testmode.hpp b/src/script/api/script_testmode.hpp
index 16964ef28..a6a3c8da8 100644
--- a/src/ai/api/ai_testmode.hpp
+++ b/src/script/api/script_testmode.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_testmode.hpp Switch the AI to Test Mode. */
+/** @file script_testmode.hpp Switch the AI to Test Mode. */
 
-#ifndef AI_TESTMODE_HPP
-#define AI_TESTMODE_HPP
+#ifndef SCRIPT_TESTMODE_HPP
+#define SCRIPT_TESTMODE_HPP
 
-#include "ai_object.hpp"
+#include "script_object.hpp"
 
 /**
  * Class to switch current mode to Test Mode.
@@ -49,4 +49,4 @@ public:
 	~AITestMode();
 };
 
-#endif /* AI_TESTMODE_HPP */
+#endif /* SCRIPT_TESTMODE_HPP */
diff --git a/src/ai/api/ai_tile.cpp b/src/script/api/script_tile.cpp
index b07c7cbf5..c395aa516 100644
--- a/src/ai/api/ai_tile.cpp
+++ b/src/script/api/script_tile.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_tile.cpp Implementation of AITile. */
+/** @file script_tile.cpp Implementation of AITile. */
 
 #include "../../stdafx.h"
-#include "ai_tile.hpp"
-#include "ai_map.hpp"
-#include "ai_town.hpp"
-#include "ai_cargo.hpp"
+#include "script_tile.hpp"
+#include "script_map.hpp"
+#include "script_town.hpp"
+#include "script_cargo.hpp"
 #include "../../station_func.h"
 #include "../../company_func.h"
 #include "../../water_map.h"
diff --git a/src/ai/api/ai_tile.hpp b/src/script/api/script_tile.hpp
index f9f5ba367..0e9205d3c 100644
--- a/src/ai/api/ai_tile.hpp
+++ b/src/script/api/script_tile.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_tile.hpp Everything to query and manipulate tiles. */
+/** @file script_tile.hpp Everything to query and manipulate tiles. */
 
-#ifndef AI_TILE_HPP
-#define AI_TILE_HPP
+#ifndef SCRIPT_TILE_HPP
+#define SCRIPT_TILE_HPP
 
-#include "ai_error.hpp"
-#include "ai_company.hpp"
+#include "script_error.hpp"
+#include "script_company.hpp"
 
 /**
  * Class that handles all tile related functions.
@@ -471,4 +471,4 @@ public:
 	static Money GetBuildCost(BuildType build_type);
 };
 
-#endif /* AI_TILE_HPP */
+#endif /* SCRIPT_TILE_HPP */
diff --git a/src/ai/api/ai_tilelist.cpp b/src/script/api/script_tilelist.cpp
index 0782b29f5..75b5c438e 100644
--- a/src/ai/api/ai_tilelist.cpp
+++ b/src/script/api/script_tilelist.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_tilelist.cpp Implementation of AITileList and friends. */
+/** @file script_tilelist.cpp Implementation of AITileList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_tilelist.hpp"
-#include "ai_industry.hpp"
+#include "script_tilelist.hpp"
+#include "script_industry.hpp"
 #include "../../industry.h"
 #include "../../station_base.h"
 
diff --git a/src/ai/api/ai_tilelist.hpp b/src/script/api/script_tilelist.hpp
index 803429a60..ea0f241bb 100644
--- a/src/ai/api/ai_tilelist.hpp
+++ b/src/script/api/script_tilelist.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_tilelist.hpp List tiles. */
+/** @file script_tilelist.hpp List tiles. */
 
-#ifndef AI_TILELIST_HPP
-#define AI_TILELIST_HPP
+#ifndef SCRIPT_TILELIST_HPP
+#define SCRIPT_TILELIST_HPP
 
-#include "ai_station.hpp"
-#include "ai_list.hpp"
+#include "script_station.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates an empty list, in which you can add tiles.
@@ -100,4 +100,4 @@ public:
 	AITileList_StationType(StationID station_id, AIStation::StationType station_type);
 };
 
-#endif /* AI_TILELIST_HPP */
+#endif /* SCRIPT_TILELIST_HPP */
diff --git a/src/ai/api/ai_town.cpp b/src/script/api/script_town.cpp
index 79ce96ec7..acde58e18 100644
--- a/src/ai/api/ai_town.cpp
+++ b/src/script/api/script_town.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_town.cpp Implementation of AITown. */
+/** @file script_town.cpp Implementation of AITown. */
 
 #include "../../stdafx.h"
-#include "ai_town.hpp"
-#include "ai_map.hpp"
-#include "ai_cargo.hpp"
-#include "ai_error.hpp"
+#include "script_town.hpp"
+#include "script_map.hpp"
+#include "script_cargo.hpp"
+#include "script_error.hpp"
 #include "../../town.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
diff --git a/src/ai/api/ai_town.hpp b/src/script/api/script_town.hpp
index 165045f5f..e2efb2888 100644
--- a/src/ai/api/ai_town.hpp
+++ b/src/script/api/script_town.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_town.hpp Everything to query towns. */
+/** @file script_town.hpp Everything to query towns. */
 
-#ifndef AI_TOWN_HPP
-#define AI_TOWN_HPP
+#ifndef SCRIPT_TOWN_HPP
+#define SCRIPT_TOWN_HPP
 
-#include "ai_cargo.hpp"
-#include "ai_company.hpp"
+#include "script_cargo.hpp"
+#include "script_company.hpp"
 
 /**
  * Class that handles all town related functions.
@@ -329,4 +329,4 @@ public:
 	static RoadLayout GetRoadLayout(TownID town_id);
 };
 
-#endif /* AI_TOWN_HPP */
+#endif /* SCRIPT_TOWN_HPP */
diff --git a/src/ai/api/ai_townlist.cpp b/src/script/api/script_townlist.cpp
index 2ae29a725..749555722 100644
--- a/src/ai/api/ai_townlist.cpp
+++ b/src/script/api/script_townlist.cpp
@@ -7,10 +7,10 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_townlist.cpp Implementation of AITownList and friends. */
+/** @file script_townlist.cpp Implementation of AITownList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_townlist.hpp"
+#include "script_townlist.hpp"
 #include "../../town.h"
 
 AITownList::AITownList()
diff --git a/src/ai/api/ai_townlist.hpp b/src/script/api/script_townlist.hpp
index 60f9da727..6b3ba4ebc 100644
--- a/src/ai/api/ai_townlist.hpp
+++ b/src/script/api/script_townlist.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_townlist.hpp List all the towns. */
+/** @file script_townlist.hpp List all the towns. */
 
-#ifndef AI_TOWNLIST_HPP
-#define AI_TOWNLIST_HPP
+#ifndef SCRIPT_TOWNLIST_HPP
+#define SCRIPT_TOWNLIST_HPP
 
-#include "ai_list.hpp"
+#include "script_list.hpp"
 
 /**
  * Creates a list of towns that are currently on the map.
@@ -32,4 +32,4 @@ public:
 	AITownEffectList();
 };
 
-#endif /* AI_TOWNLIST_HPP */
+#endif /* SCRIPT_TOWNLIST_HPP */
diff --git a/src/ai/api/ai_tunnel.cpp b/src/script/api/script_tunnel.cpp
index 310a751af..1d03eae79 100644
--- a/src/ai/api/ai_tunnel.cpp
+++ b/src/script/api/script_tunnel.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_tunnel.cpp Implementation of AITunnel. */
+/** @file script_tunnel.cpp Implementation of AITunnel. */
 
 #include "../../stdafx.h"
-#include "ai_tunnel.hpp"
-#include "ai_rail.hpp"
-#include "../ai_instance.hpp"
+#include "script_tunnel.hpp"
+#include "script_rail.hpp"
+#include "../../ai/ai_instance.hpp"
 #include "../../tunnel_map.h"
 #include "../../command_func.h"
 
diff --git a/src/ai/api/ai_tunnel.hpp b/src/script/api/script_tunnel.hpp
index 18f14a03e..86def379d 100644
--- a/src/ai/api/ai_tunnel.hpp
+++ b/src/script/api/script_tunnel.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_tunnel.hpp Everything to query and build tunnels. */
+/** @file script_tunnel.hpp Everything to query and build tunnels. */
 
-#ifndef AI_TUNNEL_HPP
-#define AI_TUNNEL_HPP
+#ifndef SCRIPT_TUNNEL_HPP
+#define SCRIPT_TUNNEL_HPP
 
-#include "ai_vehicle.hpp"
+#include "script_vehicle.hpp"
 
 /**
  * Class that handles all tunnel related functions.
@@ -108,4 +108,4 @@ public:
 	static bool RemoveTunnel(TileIndex tile);
 };
 
-#endif /* AI_TUNNEL_HPP */
+#endif /* SCRIPT_TUNNEL_HPP */
diff --git a/src/ai/api/ai_types.hpp b/src/script/api/script_types.hpp
index e1f76bcc0..a797d3e29 100644
--- a/src/ai/api/ai_types.hpp
+++ b/src/script/api/script_types.hpp
@@ -8,7 +8,7 @@
  */
 
 /**
- * @file ai_types.hpp Defines all the types of the game, like IDs of various objects.
+ * @file script_types.hpp Defines all the types of the game, like IDs of various objects.
  *
  * IDs are used to identify certain objects. They are only unique within the object type, so for example a vehicle may have VehicleID 2009,
  * while a station has StationID 2009 at the same time. Also IDs are assigned arbitrary, you cannot assume them to be consecutive.
@@ -75,8 +75,8 @@
  *  \li \anchor dynamic_engines (2) engine IDs are reassigned/invalidated on changing 'allow multiple newgrf engine sets' (only allowed as long as no vehicles are built).
  */
 
-#ifndef AI_TYPES_HPP
-#define AI_TYPES_HPP
+#ifndef SCRIPT_TYPES_HPP
+#define SCRIPT_TYPES_HPP
 
 #include "../../core/overflowsafe_type.hpp"
 #include "../../company_type.h"
@@ -103,4 +103,4 @@ typedef uint32 VehicleID;    ///< The ID of a vehicle.
 typedef uint AIErrorType;    ///< The types of errors inside the NoAI framework.
 typedef BridgeType BridgeID; ///< The ID of a bridge.
 
-#endif /* AI_TYPES_HPP */
+#endif /* SCRIPT_TYPES_HPP */
diff --git a/src/ai/api/ai_vehicle.cpp b/src/script/api/script_vehicle.cpp
index 02b463c86..e1b997252 100644
--- a/src/ai/api/ai_vehicle.cpp
+++ b/src/script/api/script_vehicle.cpp
@@ -7,14 +7,14 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_vehicle.cpp Implementation of AIVehicle. */
+/** @file script_vehicle.cpp Implementation of AIVehicle. */
 
 #include "../../stdafx.h"
-#include "ai_engine.hpp"
-#include "ai_cargo.hpp"
-#include "ai_gamesettings.hpp"
-#include "ai_group.hpp"
-#include "../ai_instance.hpp"
+#include "script_engine.hpp"
+#include "script_cargo.hpp"
+#include "script_gamesettings.hpp"
+#include "script_group.hpp"
+#include "../../ai/ai_instance.hpp"
 #include "../../company_func.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
diff --git a/src/ai/api/ai_vehicle.hpp b/src/script/api/script_vehicle.hpp
index b994c810a..e9b403f54 100644
--- a/src/ai/api/ai_vehicle.hpp
+++ b/src/script/api/script_vehicle.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_vehicle.hpp Everything to query and build vehicles. */
+/** @file script_vehicle.hpp Everything to query and build vehicles. */
 
-#ifndef AI_VEHICLE_HPP
-#define AI_VEHICLE_HPP
+#ifndef SCRIPT_VEHICLE_HPP
+#define SCRIPT_VEHICLE_HPP
 
-#include "ai_road.hpp"
+#include "script_road.hpp"
 
 /**
  * Class that handles all vehicle related functions.
@@ -538,4 +538,4 @@ private:
 	static bool _MoveWagonInternal(VehicleID source_vehicle_id, int source_wagon, bool move_attached_wagons, int dest_vehicle_id, int dest_wagon);
 };
 
-#endif /* AI_VEHICLE_HPP */
+#endif /* SCRIPT_VEHICLE_HPP */
diff --git a/src/ai/api/ai_vehiclelist.cpp b/src/script/api/script_vehiclelist.cpp
index dd1c55245..dde717e30 100644
--- a/src/ai/api/ai_vehiclelist.cpp
+++ b/src/script/api/script_vehiclelist.cpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_vehiclelist.cpp Implementation of AIVehicleList and friends. */
+/** @file script_vehiclelist.cpp Implementation of AIVehicleList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_vehiclelist.hpp"
-#include "ai_group.hpp"
-#include "ai_map.hpp"
-#include "ai_station.hpp"
+#include "script_vehiclelist.hpp"
+#include "script_group.hpp"
+#include "script_map.hpp"
+#include "script_station.hpp"
 #include "../../company_func.h"
 #include "../../depot_map.h"
 #include "../../vehicle_base.h"
diff --git a/src/ai/api/ai_vehiclelist.hpp b/src/script/api/script_vehiclelist.hpp
index e6b01c360..059041f3b 100644
--- a/src/ai/api/ai_vehiclelist.hpp
+++ b/src/script/api/script_vehiclelist.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_vehiclelist.hpp List all the vehicles (you own). */
+/** @file script_vehiclelist.hpp List all the vehicles (you own). */
 
-#ifndef AI_VEHICLELIST_HPP
-#define AI_VEHICLELIST_HPP
+#ifndef SCRIPT_VEHICLELIST_HPP
+#define SCRIPT_VEHICLELIST_HPP
 
-#include "ai_list.hpp"
-#include "ai_vehicle.hpp"
+#include "script_list.hpp"
+#include "script_vehicle.hpp"
 
 /**
  * Creates a list of vehicles of which you are the owner.
@@ -89,4 +89,4 @@ public:
 	AIVehicleList_DefaultGroup(AIVehicle::VehicleType vehicle_type);
 };
 
-#endif /* AI_VEHICLELIST_HPP */
+#endif /* SCRIPT_VEHICLELIST_HPP */
diff --git a/src/ai/api/ai_waypoint.cpp b/src/script/api/script_waypoint.cpp
index 7e902a951..29357cd1d 100644
--- a/src/ai/api/ai_waypoint.cpp
+++ b/src/script/api/script_waypoint.cpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_waypoint.cpp Implementation of AIWaypoint. */
+/** @file script_waypoint.cpp Implementation of AIWaypoint. */
 
 #include "../../stdafx.h"
-#include "ai_waypoint.hpp"
-#include "ai_rail.hpp"
-#include "ai_marine.hpp"
+#include "script_waypoint.hpp"
+#include "script_rail.hpp"
+#include "script_marine.hpp"
 #include "../../company_func.h"
 #include "../../waypoint_base.h"
 
diff --git a/src/ai/api/ai_waypoint.hpp b/src/script/api/script_waypoint.hpp
index 413035a46..b42c33487 100644
--- a/src/ai/api/ai_waypoint.hpp
+++ b/src/script/api/script_waypoint.hpp
@@ -7,12 +7,12 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_waypoint.hpp Everything to query and build waypoints. */
+/** @file script_waypoint.hpp Everything to query and build waypoints. */
 
-#ifndef AI_WAYPOINT_HPP
-#define AI_WAYPOINT_HPP
+#ifndef SCRIPT_WAYPOINT_HPP
+#define SCRIPT_WAYPOINT_HPP
 
-#include "ai_basestation.hpp"
+#include "script_basestation.hpp"
 
 /**
  * Class that handles all waypoint related functions.
@@ -69,4 +69,4 @@ public:
 
 DECLARE_ENUM_AS_BIT_SET(AIWaypoint::WaypointType)
 
-#endif /* AI_WAYPOINT_HPP */
+#endif /* SCRIPT_WAYPOINT_HPP */
diff --git a/src/ai/api/ai_waypointlist.cpp b/src/script/api/script_waypointlist.cpp
index ff1f81cb1..83db15cb3 100644
--- a/src/ai/api/ai_waypointlist.cpp
+++ b/src/script/api/script_waypointlist.cpp
@@ -7,11 +7,11 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_waypointlist.cpp Implementation of AIWaypointList and friends. */
+/** @file script_waypointlist.cpp Implementation of AIWaypointList and friends. */
 
 #include "../../stdafx.h"
-#include "ai_waypointlist.hpp"
-#include "ai_vehicle.hpp"
+#include "script_waypointlist.hpp"
+#include "script_vehicle.hpp"
 #include "../../company_func.h"
 #include "../../vehicle_base.h"
 #include "../../waypoint_base.h"
diff --git a/src/ai/api/ai_waypointlist.hpp b/src/script/api/script_waypointlist.hpp
index 83642238f..9bbbd2731 100644
--- a/src/ai/api/ai_waypointlist.hpp
+++ b/src/script/api/script_waypointlist.hpp
@@ -7,13 +7,13 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file ai_waypointlist.hpp List all the waypoints (you own). */
+/** @file script_waypointlist.hpp List all the waypoints (you own). */
 
-#ifndef AI_WAYPOINTLIST_HPP
-#define AI_WAYPOINTLIST_HPP
+#ifndef SCRIPT_WAYPOINTLIST_HPP
+#define SCRIPT_WAYPOINTLIST_HPP
 
-#include "ai_list.hpp"
-#include "ai_waypoint.hpp"
+#include "script_list.hpp"
+#include "script_waypoint.hpp"
 
 /**
  * Creates a list of waypoints of which you are the owner.
@@ -39,4 +39,4 @@ public:
 	AIWaypointList_Vehicle(VehicleID vehicle_id);
 };
 
-#endif /* AI_WAYPOINTLIST_HPP */
+#endif /* SCRIPT_WAYPOINTLIST_HPP */