(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed

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"

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"
 
 /**

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.

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"
 
 /**

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>
 

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"
 

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)

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"
 

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"
 

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"
 
 /**

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"
 

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"
 
 /**

src/script/api/script_viewport.hpp

@@ -12,7 +12,6 @@
 #ifndef SCRIPT_VIEWPORT_HPP
 #define SCRIPT_VIEWPORT_HPP
 
-#include <string>
 #include "script_object.hpp"
 
 /**

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"
 
 /**