(svn r15299) -Cleanup: remove many redundant includes

src/saveload/afterload.cpp

@@ -3,38 +3,24 @@
 /** @file afterload.cpp Code updating data after game load */
 
 #include "../stdafx.h"
-#include "../strings_type.h"
-#include "../tile_type.h"
-#include "../tile_map.h"
-#include "../map_type.h"
-#include "../town.h"
 #include "../void_map.h"
 #include "../signs_base.h"
 #include "../window_func.h"
 #include "../fios.h"
-#include "../date_func.h"
 #include "../train.h"
 #include "../string_func.h"
-#include "../newgrf_config.h"
 #include "../gamelog.h"
-#include "../waypoint.h"
-#include "../station_map.h"
-#include "../tunnelbridge_map.h"
-#include "../debug.h"
 #include "../network/network.h"
-#include "../openttd.h"
 #include "../gfxinit.h"
 #include "../functions.h"
 #include "../industry_map.h"
 #include "../town_map.h"
 #include "../clear_map.h"
-#include "../engine_base.h"
 #include "../vehicle_func.h"
 #include "../newgrf_station.h"
 #include "../yapf/yapf.hpp"
 #include "../elrail_func.h"
 #include "../signs_func.h"
-#include "../newgrf_house.h"
 #include "../aircraft.h"
 #include "../unmovable_map.h"
 #include "../tree_map.h"
@@ -44,7 +30,6 @@
 
 #include "table/strings.h"
 
-#include "saveload.h"
 #include "saveload_internal.h"
 
 #include <signal.h>

src/saveload/ai_sl.cpp

@@ -3,12 +3,10 @@
 /** @file ai_sl.cpp Handles the saveload part of the AIs */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../debug.h"
 #include "saveload.h"
-#include "../settings_type.h"
 #include "../string_func.h"
 #include "../ai/ai.hpp"
 #include "../ai/ai_config.hpp"

src/saveload/autoreplace_sl.cpp

@@ -3,7 +3,6 @@
 /** @file autoreplace_sl.cpp Code handling saving and loading of autoreplace rules */
 
 #include "../stdafx.h"
-#include "../autoreplace_type.h"
 #include "../engine_type.h"
 #include "../group_type.h"
 #include "../autoreplace_base.h"

src/saveload/cargopacket_sl.cpp

@@ -3,7 +3,6 @@
 /** @file cargopacket_sl.cpp Code handling saving and loading of cargo packets */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../cargopacket.h"
 
 #include "saveload.h"

src/saveload/company_sl.cpp

@@ -5,8 +5,6 @@
 #include "../stdafx.h"
 #include "../company_base.h"
 #include "../company_func.h"
-#include "../network/network.h"
-#include "../ai/ai.hpp"
 #include "../company_manager_face.h"
 
 #include "saveload.h"

src/saveload/engine_sl.cpp

@@ -3,7 +3,6 @@
 /** @file engine_sl.cpp Code handling saving and loading of engines */
 
 #include "../stdafx.h"
-#include "saveload.h"
 #include "saveload_internal.h"
 #include "../engine_base.h"
 #include <map>

src/saveload/map_sl.cpp

@@ -3,7 +3,6 @@
 /** @file map_sl.cpp Code handling saving and loading of map */
 
 #include "../stdafx.h"
-#include "../tile_type.h"
 #include "../map_func.h"
 #include "../core/alloc_type.hpp"
 #include "../core/bitmath_func.hpp"

src/saveload/misc_sl.cpp

@@ -7,7 +7,6 @@
 #include "../variables.h"
 #include "../core/random_func.hpp"
 #include "../openttd.h"
-#include "../tile_type.h"
 #include "../zoom_func.h"
 #include "../vehicle_func.h"
 #include "../window_gui.h"

src/saveload/oldloader.cpp

@@ -12,7 +12,6 @@
 
 #include "table/strings.h"
 
-#include "saveload.h"
 #include "saveload_internal.h"
 #include "oldloader.h"
 

src/saveload/oldloader_sl.cpp

@@ -3,7 +3,6 @@
 /** @file oldloader_sl.cpp Chunks and fix-ups for TTO/TTD/TTDP savegames. TTO loader code is based on SVXConverter by Roman Vetter. */
 
 #include "../stdafx.h"
-#include "../station_map.h"
 #include "../town.h"
 #include "../industry.h"
 #include "../company_func.h"
@@ -19,9 +18,7 @@
 #include "../date_func.h"
 #include "../vehicle_func.h"
 #include "../variables.h"
-#include "../strings_func.h"
 #include "../effectvehicle_base.h"
-#include "../string_func.h"
 #include "../core/mem_func.hpp"
 #include "../core/alloc_type.hpp"
 #include "saveload_internal.h"

src/saveload/saveload.cpp

@@ -25,7 +25,6 @@
 #include "../strings_func.h"
 #include "../gfx_func.h"
 #include "../core/alloc_func.hpp"
-#include "../functions.h"
 #include "../core/endian_func.hpp"
 #include "../vehicle_base.h"
 #include "../company_func.h"
@@ -37,11 +36,8 @@
 
 #include "table/strings.h"
 
-#include "saveload.h"
 #include "saveload_internal.h"
 
-#include <list>
-
 extern const uint16 SAVEGAME_VERSION = 112;
 
 SavegameType _savegame_type; ///< type of savegame we are loading
@@ -1160,7 +1156,6 @@ static void UninitNoComp()
  ********** START OF MEMORY CODE (in ram)****
  ********************************************/
 
-#include "../table/sprites.h"
 #include "../gui.h"
 
 struct ThreadedSave {

src/saveload/signs_sl.cpp

@@ -3,12 +3,9 @@
 /** @file signs_sl.cpp Code handling saving and loading of economy data */
 
 #include "../stdafx.h"
-#include "../strings_func.h"
 #include "../company_func.h"
 #include "../signs_base.h"
-#include "../signs_func.h"
 
-#include "saveload_internal.h"
 #include "saveload.h"
 
 static const SaveLoad _sign_desc[] = {

src/saveload/strings_sl.cpp

@@ -3,17 +3,12 @@
 /** @file strings_sl.cpp Code handling saving and loading of strings */
 
 #include "../stdafx.h"
-#include "../strings_type.h"
-#include "../core/math_func.hpp"
-#include "../core/bitmath_func.hpp"
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "saveload_internal.h"
 
 #include "table/strings.h"
 
-#include "saveload.h"
-
 /**
  * Remap a string ID from the old format to the new format
  * @param s StringID that requires remapping

src/saveload/town_sl.cpp

@@ -3,11 +3,9 @@
 /** @file town_sl.cpp Code handling saving and loading of towns and houses */
 
 #include "../stdafx.h"
-#include "../town.h"
 #include "../newgrf_house.h"
 #include "../newgrf_commons.h"
 #include "../variables.h"
-#include "../tile_map.h"
 #include "../town_map.h"
 
 #include "saveload.h"

src/saveload/vehicle_sl.cpp

@@ -3,7 +3,6 @@
 /** @file vehicle_sl.cpp Code handling saving and loading of vehicles */
 
 #include "../stdafx.h"
-#include "../vehicle_base.h"
 #include "../vehicle_func.h"
 #include "../train.h"
 #include "../roadveh.h"