14 files changed, 4 insertions, 11 deletions
diff --git a/src/script/api/script_basestation.cpp b/src/script/api/script_basestation.cpp
index ff4de1cff..bb77f05e1 100644
--- a/src/script/api/script_basestation.cpp
+++ b/src/script/api/script_basestation.cpp
@@ -11,6 +11,7 @@
 
 #include "../../stdafx.h"
 #include "script_basestation.hpp"
+#include "script_error.hpp"
 #include "../../station_base.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
diff --git a/src/script/api/script_basestation.hpp b/src/script/api/script_basestation.hpp
index 02ad4b716..e61028079 100644
--- a/src/script/api/script_basestation.hpp
+++ b/src/script/api/script_basestation.hpp
@@ -12,7 +12,6 @@
 #ifndef SCRIPT_BASESTATION_HPP
 #define SCRIPT_BASESTATION_HPP
 
-#include "script_error.hpp"
 #include "script_text.hpp"
 
 /**
diff --git a/src/script/api/script_cargo.hpp b/src/script/api/script_cargo.hpp
index 1c669191f..f4e430362 100644
--- a/src/script/api/script_cargo.hpp
+++ b/src/script/api/script_cargo.hpp
@@ -14,7 +14,6 @@
 
 #include "script_object.hpp"
 #include "../../cargotype.h"
-#include "../../cargo_type.h"
 
 /**
  * Class that handles all cargo related functions.
diff --git a/src/script/api/script_company.hpp b/src/script/api/script_company.hpp
index 04c3a5abc..e9a0b768c 100644
--- a/src/script/api/script_company.hpp
+++ b/src/script/api/script_company.hpp
@@ -12,7 +12,6 @@
 #ifndef SCRIPT_COMPANY_HPP
 #define SCRIPT_COMPANY_HPP
 
-#include "script_object.hpp"
 #include "script_text.hpp"
 
 /**
diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.hpp
index 9ab73ae0f..f087c0ef7 100644
--- a/src/script/api/script_controller.hpp
+++ b/src/script/api/script_controller.hpp
@@ -12,7 +12,7 @@
 #ifndef SCRIPT_CONTROLLER_HPP
 #define SCRIPT_CONTROLLER_HPP
 
-#include "../../company_type.h"
+#include "script_types.hpp"
 #include "../../core/string_compare_type.hpp"
 #include <map>
 
diff --git a/src/script/api/script_event_types.hpp b/src/script/api/script_event_types.hpp
index 9bce59318..d5a97bbdd 100644
--- a/src/script/api/script_event_types.hpp
+++ b/src/script/api/script_event_types.hpp
@@ -13,7 +13,6 @@
 #define SCRIPT_EVENT_TYPES_HPP
 
 #include "script_event.hpp"
-#include "script_company.hpp"
 #include "script_goal.hpp"
 #include "script_window.hpp"
 
diff --git a/src/script/api/script_gamesettings.cpp b/src/script/api/script_gamesettings.cpp
index 928ec9a96..ed284ae59 100644
--- a/src/script/api/script_gamesettings.cpp
+++ b/src/script/api/script_gamesettings.cpp
@@ -12,6 +12,7 @@
 #include "../../stdafx.h"
 #include "script_gamesettings.hpp"
 #include "../../settings_internal.h"
+#include "../../settings_type.h"
 #include "../../command_type.h"
 
 /* static */ bool ScriptGameSettings::IsValid(const char *setting)
diff --git a/src/script/api/script_goal.hpp b/src/script/api/script_goal.hpp
index ee0077663..781b9bc07 100644
--- a/src/script/api/script_goal.hpp
+++ b/src/script/api/script_goal.hpp
@@ -12,7 +12,6 @@
 #ifndef SCRIPT_GOAL_HPP
 #define SCRIPT_GOAL_HPP
 
-#include "script_object.hpp"
 #include "script_company.hpp"
 #include "../../goal_type.h"
 
diff --git a/src/script/api/script_infrastructure.hpp b/src/script/api/script_infrastructure.hpp
index e4219a678..f2ef641ee 100644
--- a/src/script/api/script_infrastructure.hpp
+++ b/src/script/api/script_infrastructure.hpp
@@ -12,7 +12,6 @@
 #ifndef SCRIPT_INFRASTRUCTURE_HPP
 #define SCRIPT_INFRASTRUCTURE_HPP
 
-#include "script_object.hpp"
 #include "script_road.hpp"
 #include "script_rail.hpp"
 
diff --git a/src/script/api/script_news.hpp b/src/script/api/script_news.hpp
index 8edd80df6..49e72f912 100644
--- a/src/script/api/script_news.hpp
+++ b/src/script/api/script_news.hpp
@@ -13,7 +13,6 @@
 #define SCRIPT_NEWS_HPP
 
 #include "script_company.hpp"
-#include "script_text.hpp"
 #include "../../news_type.h"
 
 /**
diff --git a/src/script/api/script_order.hpp b/src/script/api/script_order.hpp
index ba1b2f3e9..017ee3c91 100644
--- a/src/script/api/script_order.hpp
+++ b/src/script/api/script_order.hpp
@@ -12,7 +12,6 @@
 #ifndef SCRIPT_ORDER_HPP
 #define SCRIPT_ORDER_HPP
 
-#include "script_error.hpp"
 #include "script_vehicle.hpp"
 #include "../../order_type.h"
 
diff --git a/src/script/api/script_town.hpp b/src/script/api/script_town.hpp
index 749bf807e..c10e1f642 100644
--- a/src/script/api/script_town.hpp
+++ b/src/script/api/script_town.hpp
@@ -14,7 +14,6 @@
 
 #include "script_cargo.hpp"
 #include "script_company.hpp"
-#include "script_text.hpp"
 #include "../../town_type.h"
 
 /**
diff --git a/src/script/api/script_viewport.hpp b/src/script/api/script_viewport.hpp
index 1d66c09b3..a3b82a78a 100644
--- a/src/script/api/script_viewport.hpp
+++ b/src/script/api/script_viewport.hpp
@@ -12,7 +12,6 @@
 #ifndef SCRIPT_VIEWPORT_HPP
 #define SCRIPT_VIEWPORT_HPP
 
-#include <string>
 #include "script_object.hpp"
 
 /**
diff --git a/src/script/api/script_waypoint.hpp b/src/script/api/script_waypoint.hpp
index 5151e2ad3..afbc435f6 100644
--- a/src/script/api/script_waypoint.hpp
+++ b/src/script/api/script_waypoint.hpp
@@ -13,6 +13,7 @@
 #define SCRIPT_WAYPOINT_HPP
 
 #include "script_basestation.hpp"
+#include "script_error.hpp"
 #include "../../station_type.h"
 
 /**