(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header

13 files changed, 12 insertions, 14 deletions

diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index a7399431d..f7989849f 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -15,7 +15,6 @@
 #include "../depot_base.h"
 #include "../window_func.h"
 #include "../fios.h"
-#include "../gamelog.h"
 #include "../gamelog_internal.h"
 #include "../network/network.h"
 #include "../gfxinit.h"
@@ -23,8 +22,6 @@
 #include "../industry.h"
 #include "../clear_map.h"
 #include "../vehicle_func.h"
-#include "../newgrf_station.h"
-#include "../openttd.h"
 #include "../debug.h"
 #include "../string_func.h"
 #include "../date_func.h"
@@ -49,6 +46,10 @@
 #include "../animated_tile_func.h"
 #include "../subsidy_base.h"
 #include "../subsidy_func.h"
+#include "../company_base.h"
+#include "../newgrf.h"
+#include "../engine_base.h"
+#include "../engine_func.h"
 
 #include "table/strings.h"
 
diff --git a/src/saveload/autoreplace_sl.cpp b/src/saveload/autoreplace_sl.cpp
index 295cd77d4..afc2304b2 100644
--- a/src/saveload/autoreplace_sl.cpp
+++ b/src/saveload/autoreplace_sl.cpp
@@ -10,8 +10,6 @@
 /** @file autoreplace_sl.cpp Code handling saving and loading of autoreplace rules */
 
 #include "../stdafx.h"
-#include "../engine_type.h"
-#include "../group_type.h"
 #include "../autoreplace_base.h"
 
 #include "saveload.h"
diff --git a/src/saveload/gamelog_sl.cpp b/src/saveload/gamelog_sl.cpp
index dc0bebc5d..59820db4e 100644
--- a/src/saveload/gamelog_sl.cpp
+++ b/src/saveload/gamelog_sl.cpp
@@ -10,7 +10,6 @@
 /** @file gamelog_sl.cpp Code handling saving and loading of gamelog data */
 
 #include "../stdafx.h"
-#include "../gamelog.h"
 #include "../gamelog_internal.h"
 #include "../core/alloc_func.hpp"
 
diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp
index ab2b24f31..9fef37935 100644
--- a/src/saveload/industry_sl.cpp
+++ b/src/saveload/industry_sl.cpp
@@ -10,7 +10,6 @@
 /** @file industry_sl.cpp Code handling saving and loading of industries */
 
 #include "../stdafx.h"
-#include "../strings_type.h"
 #include "../industry.h"
 #include "../newgrf_commons.h"
 
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index 06775d4e9..67ca38976 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -20,7 +20,7 @@
 #include "../viewport_func.h"
 #include "../gfx_func.h"
 #include "../company_base.h"
-#include "../town.h"
+#include "../core/random_func.hpp"
 
 #include "saveload.h"
 
diff --git a/src/saveload/oldloader.h b/src/saveload/oldloader.h
index eabf1332d..d1908e136 100644
--- a/src/saveload/oldloader.h
+++ b/src/saveload/oldloader.h
@@ -13,6 +13,7 @@
 #define OLDLOADER_H
 
 #include "saveload.h"
+#include "../tile_type.h"
 
 enum {
 	BUFFER_SIZE = 4096,
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index a78a45244..d21a3975c 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -22,13 +22,15 @@
 #include "../subsidy_base.h"
 #include "../debug.h"
 #include "../depot_base.h"
-#include "../zoom_func.h"
 #include "../date_func.h"
 #include "../vehicle_func.h"
 #include "../variables.h"
 #include "../effectvehicle_base.h"
 #include "../core/mem_func.hpp"
 #include "../core/alloc_type.hpp"
+#include "../engine_base.h"
+#include "../engine_func.h"
+#include "../company_base.h"
 #include "saveload_internal.h"
 #include "oldloader.h"
 
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 00d06ab30..c3e719bac 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -21,7 +21,6 @@
  * </ol>
  */
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../debug.h"
 #include "../station_base.h"
 #include "../thread/thread.h"
@@ -30,7 +29,6 @@
 #include "../variables.h"
 #include "../window_func.h"
 #include "../strings_func.h"
-#include "../gfx_func.h"
 #include "../core/endian_func.hpp"
 #include "../vehicle_base.h"
 #include "../company_func.h"
@@ -42,6 +40,7 @@
 #include "../gamelog.h"
 #include "../string_func.h"
 #include "../engine_base.h"
+#include "../company_base.h"
 
 #include "table/strings.h"
 
diff --git a/src/saveload/saveload_internal.h b/src/saveload/saveload_internal.h
index 04e01de33..b400861b4 100644
--- a/src/saveload/saveload_internal.h
+++ b/src/saveload/saveload_internal.h
@@ -12,7 +12,6 @@
 #ifndef SAVELOAD_INTERNAL_H
 #define SAVELOAD_INTERNAL_H
 
-#include "../strings_type.h"
 #include "../company_manager_face.h"
 #include "../order_base.h"
 #include "../engine_type.h"
diff --git a/src/saveload/signs_sl.cpp b/src/saveload/signs_sl.cpp
index 8eff01293..cdd43303b 100644
--- a/src/saveload/signs_sl.cpp
+++ b/src/saveload/signs_sl.cpp
@@ -10,7 +10,6 @@
 /** @file signs_sl.cpp Code handling saving and loading of economy data */
 
 #include "../stdafx.h"
-#include "../company_func.h"
 #include "../signs_base.h"
 
 #include "saveload.h"
diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp
index a25eb556d..99161ae1c 100644
--- a/src/saveload/station_sl.cpp
+++ b/src/saveload/station_sl.cpp
@@ -15,7 +15,6 @@
 #include "../roadstop_base.h"
 #include "../vehicle_base.h"
 #include "../newgrf_station.h"
-#include "../station_map.h"
 
 #include "saveload.h"
 #include "table/strings.h"
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index e78742073..7fdb78e61 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -17,6 +17,7 @@
 #include "../aircraft.h"
 #include "../station_base.h"
 #include "../effectvehicle_base.h"
+#include "../engine_base.h"
 
 #include "saveload.h"
 
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index be7bf01e5..2cd95e104 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -14,6 +14,7 @@
 #include "../newgrf_station.h"
 #include "../vehicle_base.h"
 #include "../town.h"
+#include "../newgrf.h"
 
 #include "table/strings.h"