(svn r17693) -Cleanup: remove some unneeded includes

src/3rdparty/md5/md5.cpp

@@ -57,7 +57,6 @@
  */
 
 #include "../../stdafx.h"
-#include "../../core/bitmath_func.hpp"
 #include "../../core/endian_func.hpp"
 #include "md5.h"
 

src/ai/ai_core.cpp

@@ -15,7 +15,6 @@
 #include "../company_func.h"
 #include "../debug.h"
 #include "../network/network.h"
-#include "../settings_type.h"
 #include "../window_func.h"
 #include "../command_func.h"
 #include "ai.hpp"

src/ai/ai_gui.cpp

@@ -20,9 +20,7 @@
 #include "../gfx_func.h"
 #include "../command_func.h"
 #include "../network/network.h"
-#include "../string_func.h"
 #include "../textbuf_gui.h"
-#include "../settings_type.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
 

src/ai/ai_instance.cpp

@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../settings_type.h"
 #include "../vehicle_base.h"
 #include "../saveload/saveload.h"
 #include "../gui.h"
@@ -21,11 +20,9 @@
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
-#include "../script/squirrel_std.hpp"
 
 #define DEFINE_SCRIPT_FILES
 
-#include "ai_info.hpp"
 #include "ai_config.hpp"
 #include "ai_storage.hpp"
 #include "ai_instance.hpp"

src/ai/ai_scanner.cpp

@@ -11,12 +11,9 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../string_func.h"
 #include "../fileio_func.h"
-#include "../fios.h"
 #include "../network/network.h"
 #include "../core/random_func.hpp"
-#include <sys/stat.h>
 
 #include <squirrel.h>
 #include "../script/squirrel.hpp"

src/ai/api/ai_abstractlist.cpp

@@ -12,7 +12,6 @@
 #include <squirrel.h>
 #include "ai_abstractlist.hpp"
 #include "../../debug.h"
-#include "../../core/alloc_func.hpp"
 #include "../../script/squirrel.hpp"
 
 /**

src/ai/api/ai_airport.cpp

@@ -13,9 +13,7 @@
 #include "ai_station.hpp"
 #include "../../station_base.h"
 #include "../../company_func.h"
-#include "../../command_type.h"
 #include "../../town.h"
-#include "../../economy_func.h"
 
 /* static */ bool AIAirport::IsValidAirportType(AirportType type)
 {

src/ai/api/ai_basestation.cpp

@@ -10,13 +10,11 @@
 /** @file ai_basestation.cpp Implementation of AIBaseStation. */
 
 #include "ai_basestation.hpp"
-#include "../../base_station_base.h"
 #include "../../station_base.h"
 #include "../../command_func.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
-#include "../../core/alloc_func.hpp"
 #include "table/strings.h"
 
 /* static */ bool AIBaseStation::IsValidBaseStation(StationID station_id)

src/ai/api/ai_bridge.cpp

@@ -16,7 +16,6 @@
 #include "../../strings_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../economy_func.h"
-#include "../../settings_type.h"
 #include "../../date_func.h"
 
 /* static */ bool AIBridge::IsValidBridge(BridgeID bridge_id)

src/ai/api/ai_bridgelist.cpp

@@ -12,7 +12,6 @@
 #include "ai_bridgelist.hpp"
 #include "ai_bridge.hpp"
 #include "../../bridge.h"
-#include "../../date_func.h"
 
 AIBridgeList::AIBridgeList()
 {

src/ai/api/ai_cargolist.cpp

@@ -12,7 +12,6 @@
 #include "ai_cargolist.hpp"
 #include "ai_industry.hpp"
 #include "../../cargotype.h"
-#include "../../tile_type.h"
 #include "../../industry.h"
 
 AICargoList::AICargoList()

src/ai/api/ai_company.cpp

@@ -11,7 +11,6 @@
 
 #include "ai_company.hpp"
 #include "ai_error.hpp"
-#include "ai_log.hpp"
 #include "../../command_func.h"
 #include "../../company_func.h"
 #include "../../company_base.h"
@@ -19,7 +18,6 @@
 #include "../../economy_func.h"
 #include "../../strings_func.h"
 #include "../../tile_map.h"
-#include "../../core/alloc_func.hpp"
 #include "../../string_func.h"
 #include "../../settings_func.h"
 #include "table/strings.h"

src/ai/api/ai_depotlist.cpp

@@ -10,7 +10,6 @@
 /** @file ai_depotlist.cpp Implementation of AIDepotList and friends. */
 
 #include "ai_depotlist.hpp"
-#include "../../tile_map.h"
 #include "../../company_func.h"
 #include "../../depot_base.h"
 #include "../../station_base.h"

src/ai/api/ai_event_types.cpp

@@ -14,7 +14,6 @@
 #include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../settings_type.h"
-#include "../../rail.h"
 #include "../../engine_base.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"

src/ai/api/ai_group.cpp

@@ -16,7 +16,6 @@
 #include "../../group.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../command_func.h"
 #include "../../autoreplace_func.h"
 #include "../../settings_func.h"

src/ai/api/ai_industry.cpp

@@ -12,7 +12,6 @@
 #include "ai_industry.hpp"
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
-#include "../../tile_type.h"
 #include "../../industry.h"
 #include "../../strings_func.h"
 #include "../../station_base.h"

src/ai/api/ai_industrylist.cpp

@@ -10,7 +10,6 @@
 /** @file ai_industrylist.cpp Implementation of AIIndustryList and friends. */
 
 #include "ai_industrylist.hpp"
-#include "../../tile_type.h"
 #include "../../industry.h"
 
 AIIndustryList::AIIndustryList()

src/ai/api/ai_industrytype.cpp

@@ -12,7 +12,6 @@
 #include "ai_industrytype.hpp"
 #include "ai_map.hpp"
 #include "../../command_type.h"
-#include "../../settings_type.h"
 #include "../../strings_func.h"
 #include "../../industry.h"
 

src/ai/api/ai_industrytypelist.cpp

@@ -10,7 +10,6 @@
 /** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */
 
 #include "ai_industrytypelist.hpp"
-#include "../../tile_type.h"
 #include "../../industry.h"
 
 AIIndustryTypeList::AIIndustryTypeList()

src/ai/api/ai_object.cpp

@@ -14,7 +14,6 @@
 #include "../../script/squirrel.hpp"
 #include "../../company_base.h"
 
-#include "ai_log.hpp"
 #include "table/strings.h"
 #include "../ai.hpp"
 #include "../ai_storage.hpp"

src/ai/api/ai_order.cpp

@@ -9,9 +9,7 @@
 
 /** @file ai_order.cpp Implementation of AIOrder. */
 
-#include "ai_order.hpp"
 #include "ai_vehicle.hpp"
-#include "ai_log.hpp"
 #include "../ai_instance.hpp"
 #include "../../debug.h"
 #include "../../vehicle_base.h"

src/ai/api/ai_road.cpp

@@ -9,13 +9,11 @@
 
 /** @file ai_road.cpp Implementation of AIRoad. */
 
-#include "ai_road.hpp"
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
 #include "../../station_base.h"
 #include "../../command_type.h"
-#include "../../settings_type.h"
 #include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
 

src/ai/api/ai_sign.cpp

@@ -10,7 +10,6 @@
 /** @file ai_sign.cpp Implementation of AISign. */
 
 #include "ai_sign.hpp"
-#include "ai_log.hpp"
 #include "table/strings.h"
 #include "../ai_instance.hpp"
 #include "../../command_func.h"

src/ai/api/ai_station.cpp

@@ -13,15 +13,11 @@
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "../../command_func.h"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../roadstop_base.h"
-#include "../../string_func.h"
-#include "../../strings_func.h"
 #include "../../company_func.h"
 #include "../../town.h"
-#include "table/strings.h"
 
 /* static */ bool AIStation::IsValidStation(StationID station_id)
 {

src/ai/api/ai_subsidy.cpp

@@ -11,10 +11,8 @@
 
 #include "ai_subsidy.hpp"
 #include "ai_date.hpp"
-#include "ai_log.hpp"
 #include "../../subsidy_base.h"
 #include "../../station_base.h"
-#include "../../cargotype.h"
 
 /* static */ bool AISubsidy::IsValidSubsidy(SubsidyID subsidy_id)
 {

src/ai/api/ai_subsidylist.cpp

@@ -10,7 +10,6 @@
 /** @file ai_subsidylist.cpp Implementation of AISubsidyList. */
 
 #include "ai_subsidylist.hpp"
-#include "ai_subsidy.hpp"
 #include "../../subsidy_base.h"
 
 AISubsidyList::AISubsidyList()

src/ai/api/ai_tile.cpp

@@ -12,7 +12,6 @@
 #include "ai_tile.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "ai_log.hpp"
 #include "../../station_func.h"
 #include "../../company_func.h"
 #include "../../road_map.h"

src/ai/api/ai_tilelist.cpp

@@ -11,10 +11,8 @@
 
 #include "ai_tilelist.hpp"
 #include "ai_industry.hpp"
-#include "../../tile_map.h"
 #include "../../industry.h"
 #include "../../station_base.h"
-#include "../../settings_type.h"
 
 void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2)
 {

src/ai/api/ai_town.cpp

@@ -13,10 +13,8 @@
 #include "ai_map.hpp"
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
-#include "../../command_type.h"
 #include "../../town.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../company_func.h"
 #include "../../station_base.h"
 #include "table/strings.h"

src/ai/api/ai_tunnel.cpp

@@ -14,8 +14,6 @@
 #include "../ai_instance.hpp"
 #include "../../tunnel_map.h"
 #include "../../command_func.h"
-#include "../../tunnelbridge.h"
-#include "../../road_func.h"
 
 /* static */ bool AITunnel::IsTunnelTile(TileIndex tile)
 {

src/ai/api/ai_vehiclelist.cpp

@@ -13,9 +13,7 @@
 #include "ai_group.hpp"
 #include "ai_map.hpp"
 #include "ai_station.hpp"
-#include "ai_vehicle.hpp"
 #include "../../company_func.h"
-#include "../../depot_base.h"
 #include "../../depot_map.h"
 #include "../../vehicle_base.h"
 

src/ai/api/ai_waypoint.cpp

@@ -11,13 +11,8 @@
 
 #include "ai_waypoint.hpp"
 #include "ai_rail.hpp"
-#include "../../command_func.h"
-#include "../../string_func.h"
-#include "../../strings_func.h"
 #include "../../company_func.h"
 #include "../../waypoint_base.h"
-#include "../../core/alloc_func.hpp"
-#include "table/strings.h"
 
 /* static */ bool AIWaypoint::IsValidWaypoint(StationID waypoint_id)
 {

src/ai/api/ai_waypointlist.cpp

@@ -11,7 +11,6 @@
 
 #include "ai_waypointlist.hpp"
 #include "ai_vehicle.hpp"
-#include "ai_waypoint.hpp"
 #include "../../company_func.h"
 #include "../../vehicle_base.h"
 #include "../../waypoint_base.h"

src/aircraft_cmd.cpp

@@ -26,7 +26,6 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "functions.h"
-#include "variables.h"
 #include "cheat_type.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
@@ -34,7 +33,6 @@
 #include "ai/ai.hpp"
 #include "company_func.h"
 #include "effectvehicle_func.h"
-#include "settings_type.h"
 #include "station_base.h"
 #include "cargotype.h"
 #include "newgrf_cargo.h"

src/airport.cpp

@@ -13,7 +13,6 @@
 #include "debug.h"
 #include "airport.h"
 #include "airport_movement.h"
-#include "core/bitmath_func.hpp"
 #include "core/alloc_func.hpp"
 #include "date_func.h"
 #include "settings_type.h"

src/airport_gui.cpp

@@ -17,11 +17,9 @@
 #include "sound_func.h"
 #include "window_func.h"
 #include "strings_func.h"
-#include "settings_type.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
-#include "station_type.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
 

src/autoreplace_cmd.cpp

@@ -20,7 +20,6 @@
 #include "functions.h"
 #include "autoreplace_func.h"
 #include "articulated_vehicles.h"
-#include "core/alloc_func.hpp"
 
 #include "table/strings.h"
 

src/blitter/32bpp_anim.cpp

@@ -10,7 +10,6 @@
 /** @file 32bpp_anim.cpp Implementation of the optimized 32 bpp blitter with animation support. */
 
 #include "../stdafx.h"
-#include "../core/alloc_func.hpp"
 #include "../core/math_func.hpp"
 #include "../gfx_func.h"
 #include "../video/video_driver.hpp"

src/blitter/32bpp_optimized.cpp

@@ -13,7 +13,6 @@
 #include "../zoom_func.h"
 #include "../gfx_func.h"
 #include "../core/math_func.hpp"
-#include "../core/alloc_func.hpp"
 #include "32bpp_optimized.hpp"
 
 static FBlitter_32bppOptimized iFBlitter_32bppOptimized;

src/blitter/8bpp_optimized.cpp

@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../zoom_func.h"
-#include "../core/alloc_func.hpp"
 #include "../core/math_func.hpp"
 #include "8bpp_optimized.hpp"
 

src/bridge_gui.cpp

@@ -18,7 +18,6 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "sound_func.h"
-#include "map_func.h"
 #include "gfx_func.h"
 #include "tunnelbridge.h"
 #include "sortlist_type.h"

src/bridge_map.cpp

@@ -10,7 +10,6 @@
 /** @file bridge_map.cpp Map accessor functions for bridges. */
 
 #include "stdafx.h"
-#include "bridge_map.h"
 #include "landscape.h"
 #include "tunnelbridge_map.h"
 

src/build_vehicle_gui.cpp

@@ -30,7 +30,6 @@
 #include "widgets/dropdown_func.h"
 #include "window_gui.h"
 #include "engine_gui.h"
-#include "settings_type.h"
 #include "cargotype.h"
 #include "newgrf_cargo.h"
 

src/cheat_gui.cpp

@@ -19,7 +19,6 @@
 #include "saveload/saveload.h"
 #include "window_gui.h"
 #include "newgrf.h"
-#include "settings_type.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "rail_gui.h"

src/clear_cmd.cpp

@@ -16,12 +16,11 @@
 #include "landscape.h"
 #include "variables.h"
 #include "genworld.h"
-#include "industry.h"
+#include "landscape_type.h"
 #include "functions.h"
 #include "economy_func.h"
 #include "viewport_func.h"
 #include "water.h"
-#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/command.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "landscape.h"
-#include "tile_map.h"
 #include "gui.h"
 #include "command_func.h"
 #include "network/network.h"

src/company_cmd.cpp

@@ -24,15 +24,12 @@
 #include "company_manager_face.h"
 #include "group.h"
 #include "window_func.h"
-#include "tile_map.h"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "date_func.h"
 #include "sound_func.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
-#include "string_func.h"
-#include "road_func.h"
 #include "rail.h"
 #include "sprite.h"
 #include "core/pool_func.hpp"

src/company_gui.cpp

@@ -20,17 +20,15 @@
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "network/network_func.h"
-#include "roadveh.h"
-#include "train.h"
-#include "aircraft.h"
+#include "sprite.h"
+#include "economy_func.h"
+#include "vehicle_base.h"
 #include "newgrf.h"
 #include "company_manager_face.h"
 #include "strings_func.h"
 #include "date_func.h"
-#include "string_func.h"
 #include "widgets/dropdown_type.h"
 #include "tilehighlight_func.h"
-#include "settings_type.h"
 
 #include "table/strings.h"
 

src/console.cpp

@@ -10,9 +10,6 @@
 /** @file console.cpp Handling of the in-game console. */
 
 #include "stdafx.h"
-#include "core/alloc_func.hpp"
-#include "core/math_func.hpp"
-#include "string_func.h"
 #include "console_internal.h"
 #include "network/network.h"
 #include "network/network_func.h"

src/console_cmds.cpp

@@ -16,7 +16,6 @@
 #include "engine_func.h"
 #include "landscape.h"
 #include "saveload/saveload.h"
-#include "variables.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "network/network_base.h"
@@ -29,13 +28,10 @@
 #include "strings_func.h"
 #include "viewport_func.h"
 #include "window_func.h"
-#include "map_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
-#include "string_func.h"
 #include "company_func.h"
 #include "company_base.h"
-#include "settings_type.h"
 #include "gamelog.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"

src/console_gui.cpp

@@ -17,11 +17,9 @@
 #include "window_func.h"
 #include "string_func.h"
 #include "gfx_func.h"
-#include "core/math_func.hpp"
 #include "settings_type.h"
 #include "rev.h"
 
-#include "table/strings.h"
 
 enum {
 	ICON_HISTORY_SIZE       = 20,

src/core/alloc_func.cpp

@@ -10,7 +10,6 @@
 /** @file alloc_func.cpp Functions to 'handle' memory allocation errors */
 
 #include "../stdafx.h"
-#include "alloc_func.hpp"
 
 /**
  * Function to exit with an error message after malloc() or calloc() have failed

src/crashlog.cpp

@@ -14,7 +14,6 @@
 #include "gamelog.h"
 #include "map_func.h"
 #include "rev.h"
-#include "string_func.h"
 #include "strings_func.h"
 #include "blitter/factory.hpp"
 #include "base_media_base.h"

src/date.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "variables.h"
-#include "settings_type.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "currency.h"

src/depot.cpp

@@ -11,12 +11,8 @@
 
 #include "stdafx.h"
 #include "depot_base.h"
-#include "company_type.h"
 #include "order_func.h"
 #include "window_func.h"
-#include "core/bitmath_func.hpp"
-#include "tile_map.h"
-#include "water_map.h"
 #include "core/pool_func.hpp"
 #include "vehicle_gui.h"
 

src/dock_gui.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "tile_map.h"
-#include "station_type.h"
 #include "terraform_gui.h"
 #include "window_gui.h"
 #include "station_gui.h"
@@ -27,7 +26,6 @@
 #include "slope_func.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
-#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/dummy_land.cpp

@@ -13,7 +13,6 @@
 #include "tile_cmd.h"
 #include "command_func.h"
 #include "viewport_func.h"
-#include "tile_map.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/effectvehicle.cpp

@@ -11,11 +11,11 @@
 
 #include "stdafx.h"
 #include "landscape.h"
-#include "industry.h"
+#include "core/random_func.hpp"
+#include "industry_map.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "animated_tile_func.h"
-#include "effectvehicle_base.h"
 #include "effectvehicle_func.h"
 
 #include "table/sprites.h"

src/elrail.cpp

@@ -61,7 +61,6 @@
 #include "train.h"
 #include "rail_gui.h"
 #include "tunnelbridge_map.h"
-#include "vehicle_func.h"
 #include "tunnelbridge.h"
 #include "elrail_func.h"
 #include "engine_base.h"

src/engine.cpp

@@ -10,11 +10,9 @@
 /** @file engine.cpp Base for all engine handling. */
 
 #include "stdafx.h"
-#include "debug.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
-#include "variables.h"
 #include "aircraft.h"
 #include "newgrf.h"
 #include "newgrf_engine.h"
@@ -27,8 +25,6 @@
 #include "autoreplace_gui.h"
 #include "string_func.h"
 #include "ai/ai.hpp"
-#include "vehicle_func.h"
-#include "settings_type.h"
 #include "core/pool_func.hpp"
 #include "engine_gui.h"
 

src/engine_gui.cpp

@@ -15,18 +15,14 @@
 #include "engine_func.h"
 #include "engine_base.h"
 #include "command_func.h"
-#include "news_type.h"
-#include "newgrf_engine.h"
 #include "strings_func.h"
 #include "engine_gui.h"
 #include "articulated_vehicles.h"
 #include "vehicle_func.h"
 #include "company_func.h"
 #include "rail.h"
-#include "core/sort_func.hpp"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 /** Return the category of an engine.
  * @param engine Engine to examine.

src/fios.cpp

@@ -527,7 +527,6 @@ void FiosGetHeightmapList(SaveLoadDialogMode mode)
 }
 
 #if defined(ENABLE_NETWORK)
-#include "core/smallvec_type.hpp"
 #include "network/network_content.h"
 #include "3rdparty/md5/md5.h"
 

src/fontcache.cpp

@@ -10,11 +10,9 @@
 /** @file fontcache.cpp Cache for characters from fonts. */
 
 #include "stdafx.h"
-#include "spritecache.h"
 #include "fontcache.h"
 #include "blitter/factory.hpp"
 #include "gfx_func.h"
-#include "core/alloc_func.hpp"
 #include "core/math_func.hpp"
 
 #include "table/sprites.h"

src/genworld.cpp

@@ -24,7 +24,6 @@
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "date_func.h"
-#include "core/random_func.hpp"
 #include "engine_func.h"
 #include "newgrf_storage.h"
 #include "water.h"
@@ -32,7 +31,6 @@
 #include "tilehighlight_func.h"
 #include "saveload/saveload.h"
 #include "void_map.h"
-#include "settings_type.h"
 #include "town.h"
 
 #include "table/sprites.h"

src/genworld_gui.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "heightmap.h"
-#include "gui.h"
 #include "variables.h"
 #include "debug.h"
 #include "genworld.h"
@@ -25,10 +24,8 @@
 #include "fios.h"
 #include "string_func.h"
 #include "gfx_func.h"
-#include "settings_type.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
-#include "core/random_func.hpp"
 #include "landscape_type.h"
 #include "querystring_gui.h"
 #include "town.h"

src/gfx.cpp

@@ -13,7 +13,6 @@
 #include "openttd.h"
 #include "gfx_func.h"
 #include "variables.h"
-#include "spritecache.h"
 #include "fontcache.h"
 #include "genworld.h"
 #include "zoom_func.h"
@@ -21,11 +20,8 @@
 #include "video/video_driver.hpp"
 #include "strings_func.h"
 #include "settings_type.h"
-#include "core/alloc_func.hpp"
-#include "core/sort_func.hpp"
 #include "landscape_type.h"
 #include "network/network_func.h"
-#include "core/smallvec_type.hpp"
 #include "thread/thread.h"
 #include "window_func.h"
 

src/gfxinit.cpp

@@ -12,14 +12,12 @@
 #include "stdafx.h"
 #include "debug.h"
 #include "spritecache.h"
-#include "fileio_func.h"
 #include "fios.h"
 #include "newgrf.h"
 #include "3rdparty/md5/md5.h"
 #include "fontcache.h"
 #include "gfx_func.h"
 #include "settings_type.h"
-#include "string_func.h"
 
 /* The type of set we're replacing */
 #define SET_TYPE "graphics"

src/group_cmd.cpp

@@ -21,7 +21,6 @@
 #include "autoreplace_func.h"
 #include "string_func.h"
 #include "company_func.h"
-#include "core/alloc_func.hpp"
 #include "core/pool_func.hpp"
 
 #include "table/strings.h"

src/heightmap.cpp

@@ -18,7 +18,6 @@
 #include "bmp.h"
 #include "gfx_func.h"
 #include "fios.h"
-#include "settings_type.h"
 #include "fileio_func.h"
 
 #include "table/strings.h"

src/highscore.cpp

@@ -10,7 +10,6 @@
 /** @file highscore.cpp Definition of functions used for highscore handling */
 
 #include "highscore.h"
-#include "settings_type.h"
 #include "company_base.h"
 #include "company_func.h"
 #include "cheat_func.h"

src/highscore_gui.cpp

@@ -19,7 +19,6 @@
 #include "command_func.h"
 #include "company_func.h"
 #include "company_base.h"
-#include "settings_type.h"
 #include "strings_func.h"
 #include "openttd.h"
 

src/industry_gui.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "debug.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"
@@ -26,7 +25,6 @@
 #include "newgrf_industries.h"
 #include "newgrf_text.h"
 #include "strings_func.h"
-#include "map_func.h"
 #include "company_func.h"
 #include "tilehighlight_func.h"
 #include "string_func.h"

src/ini.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "core/alloc_func.hpp"
-#include "core/math_func.hpp"
 #include "core/mem_func.hpp"
 #include "debug.h"
 #include "ini_type.h"

src/intro_gui.cpp

@@ -15,7 +15,6 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "network/network.h"
-#include "variables.h"
 #include "genworld.h"
 #include "network/network_gui.h"
 #include "network/network_content.h"
@@ -23,9 +22,7 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "fios.h"
-#include "settings_type.h"
 #include "functions.h"
-#include "newgrf_config.h"
 #include "ai/ai_gui.hpp"
 #include "gfx_func.h"
 

src/landscape.cpp

@@ -28,7 +28,6 @@
 #include "water.h"
 #include "effectvehicle_func.h"
 #include "landscape_type.h"
-#include "settings_type.h"
 #include "animated_tile_func.h"
 
 #include "table/sprites.h"

src/main_gui.cpp

@@ -19,7 +19,6 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "console_gui.h"
-#include "map_func.h"
 #include "genworld.h"
 #include "transparency_gui.h"
 #include "functions.h"
@@ -29,7 +28,6 @@
 #include "zoom_func.h"
 #include "company_base.h"
 #include "company_func.h"
-#include "settings_type.h"
 #include "toolbar_gui.h"
 #include "statusbar_gui.h"
 #include "tilehighlight_func.h"

src/map.cpp

@@ -11,10 +11,8 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "core/bitmath_func.hpp"
 #include "core/alloc_func.hpp"
 #include "core/math_func.hpp"
-#include "map_func.h"
 #include "tile_map.h"
 
 #if defined(_MSC_VER)

src/misc.cpp

@@ -16,18 +16,13 @@
 #include "variables.h"
 #include "ai/ai.hpp"
 #include "newgrf_house.h"
-#include "cargotype.h"
 #include "group.h"
 #include "economy_func.h"
-#include "functions.h"
-#include "map_func.h"
 #include "date_func.h"
-#include "vehicle_func.h"
 #include "texteff.hpp"
 #include "gfx_func.h"
 #include "gamelog.h"
 #include "animated_tile_func.h"
-#include "settings_type.h"
 #include "tilehighlight_func.h"
 #include "network/network_func.h"
 #include "window_func.h"

src/misc_cmd.cpp

@@ -24,7 +24,6 @@
 #include "string_func.h"
 #include "company_func.h"
 #include "company_gui.h"
-#include "settings_type.h"
 #include "vehicle_base.h"
 
 #include "table/strings.h"

src/misc_gui.cpp

@@ -11,11 +11,9 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "debug.h"
 #include "landscape.h"
 #include "newgrf_text.h"
 #include "saveload/saveload.h"
-#include "tile_map.h"
 #include "gui.h"
 #include "station_gui.h"
 #include "viewport_func.h"
@@ -26,7 +24,6 @@
 #include "town.h"
 #include "network/network.h"
 #include "network/network_content.h"
-#include "variables.h"
 #include "company_base.h"
 #include "texteff.hpp"
 #include "cargotype.h"
@@ -36,11 +33,9 @@
 #include "fios.h"
 #include "zoom_func.h"
 #include "window_func.h"
-#include "string_func.h"
 #include "newgrf_cargo.h"
 #include "tilehighlight_func.h"
 #include "querystring_gui.h"
-#include "core/sort_func.hpp"
 
 #include "table/strings.h"
 

src/mixer.cpp

@@ -10,7 +10,6 @@
 /** @file mixer.cpp Mixing of sound samples. */
 
 #include "stdafx.h"
-#include "mixer.h"
 #include "core/math_func.hpp"
 
 struct MixerChannel {

src/music_gui.cpp

@@ -19,7 +19,6 @@
 #include "window_func.h"
 #include "sound_func.h"
 #include "gfx_func.h"
-#include "core/math_func.hpp"
 #include "core/random_func.hpp"
 
 #include "table/strings.h"

src/network/core/address.cpp

@@ -14,9 +14,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "address.h"
-#include "config.h"
-#include "host.h"
-#include "../../string_func.h"
 #include "../../debug.h"
 
 const char *NetworkAddress::GetHostname()

src/network/core/core.cpp

@@ -15,8 +15,6 @@
 
 #include "../../stdafx.h"
 #include "../../debug.h"
-#include "os_abstraction.h"
-#include "core.h"
 #include "packet.h"
 
 

src/network/core/host.cpp

@@ -13,10 +13,7 @@
 
 #include "../../stdafx.h"
 #include "../../debug.h"
-#include "os_abstraction.h"
 #include "address.h"
-#include "../../core/alloc_func.hpp"
-#include "../../string_func.h"
 
 /**
  * Internal implementation for finding the broadcast IPs.

src/network/core/tcp.cpp

@@ -16,7 +16,6 @@
 #include "../../stdafx.h"
 #include "../../debug.h"
 
-#include "packet.h"
 #include "tcp.h"
 
 NetworkTCPSocketHandler::NetworkTCPSocketHandler(SOCKET s) :

src/network/core/tcp_connect.cpp

@@ -14,8 +14,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "../../stdafx.h"
-#include "../../debug.h"
-#include "../../core/smallvec_type.hpp"
 #include "../../thread/thread.h"
 
 #include "tcp.h"

src/network/core/tcp_content.cpp

@@ -14,7 +14,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "../../stdafx.h"
-#include "../../debug.h"
 #include "tcp_content.h"
 
 ContentInfo::ContentInfo()

src/network/core/tcp_game.cpp

@@ -15,11 +15,8 @@
 
 #include "../../stdafx.h"
 #include "../../openttd.h"
-#include "../../variables.h"
 
 #include "../network_internal.h"
-#include "packet.h"
-#include "tcp_game.h"
 #include "../../core/pool_func.hpp"
 
 #include "table/strings.h"

src/network/core/udp.cpp

@@ -14,12 +14,7 @@
 #ifdef ENABLE_NETWORK
 
 #include "../../stdafx.h"
-#include "../../debug.h"
-#include "../../core/bitmath_func.hpp"
-#include "../../core/math_func.hpp"
-#include "../../core/alloc_func.hpp"
 #include "../../date_func.h"
-#include "packet.h"
 #include "udp.h"
 
 /**

src/network/network.cpp

@@ -10,14 +10,12 @@
 /** @file network.cpp Base functions for networking support. */
 
 #include "../stdafx.h"
-#include "../company_type.h"
 
 #ifdef ENABLE_NETWORK
 
 #include "../openttd.h"
 #include "../strings_func.h"
 #include "../command_func.h"
-#include "../variables.h"
 #include "../date_func.h"
 #include "network_internal.h"
 #include "network_client.h"
@@ -32,13 +30,10 @@
 #include "../3rdparty/md5/md5.h"
 #include "../core/random_func.hpp"
 #include "../window_func.h"
-#include "../string_func.h"
 #include "../company_func.h"
 #include "../company_base.h"
-#include "../settings_type.h"
 #include "../landscape_type.h"
 #include "../rev.h"
-#include "../core/alloc_func.hpp"
 #include "../core/pool_func.hpp"
 #ifdef DEBUG_DUMP_COMMANDS
 	#include "../fileio_func.h"

src/network/network_client.cpp

@@ -14,7 +14,6 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../openttd.h"
-#include "../gfx_func.h"
 #include "network_internal.h"
 #include "network_gui.h"
 #include "../saveload/saveload.h"
@@ -24,11 +23,9 @@
 #include "../3rdparty/md5/md5.h"
 #include "../strings_func.h"
 #include "../window_func.h"
-#include "../string_func.h"
 #include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
-#include "../settings_type.h"
 #include "../rev.h"
 
 #include "table/strings.h"

src/network/network_command.cpp

@@ -17,8 +17,6 @@
 #include "network_client.h"
 #include "../command_func.h"
 #include "../callback_table.h"
-#include "../core/alloc_func.hpp"
-#include "../string_func.h"
 #include "../company_func.h"
 
 /** Local queue of packets */

src/network/network_content.cpp

@@ -13,8 +13,6 @@
 
 #include "../stdafx.h"
 #include "../rev.h"
-#include "../fileio_func.h"
-#include "../string_func.h"
 #include "../ai/ai.hpp"
 #include "../window_func.h"
 #include "../gui.h"

src/network/network_content_gui.cpp

@@ -11,11 +11,9 @@
 
 #if defined(ENABLE_NETWORK)
 #include "../stdafx.h"
-#include "../string_func.h"
 #include "../strings_func.h"
 #include "../gfx_func.h"
 #include "../window_func.h"
-#include "../window_gui.h"
 #include "../gui.h"
 #include "../ai/ai.hpp"
 #include "../base_media_base.h"

src/network/network_gamelist.cpp

@@ -16,9 +16,7 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../core/alloc_func.hpp"
 #include "../thread/thread.h"
-#include "../string_func.h"
 #include "network_internal.h"
 #include "network_udp.h"
 #include "network_gamelist.h"

src/network/network_gui.cpp

@@ -20,18 +20,14 @@
 #include "network_gui.h"
 #include "network_gamelist.h"
 #include "../gui.h"
-#include "network_server.h"
 #include "network_udp.h"
 #include "../window_func.h"
-#include "../string_func.h"
 #include "../gfx_func.h"
-#include "../settings_type.h"
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
 #include "../sortlist_type.h"
 #include "../company_base.h"
 #include "../company_func.h"
-#include "../core/sort_func.hpp"
 
 #include "table/strings.h"
 #include "../table/sprites.h"

src/network/network_server.cpp

@@ -25,10 +25,8 @@
 #include "../station_base.h"
 #include "../genworld.h"
 #include "../fileio_func.h"
-#include "../string_func.h"
 #include "../company_func.h"
 #include "../company_gui.h"
-#include "../settings_type.h"
 #include "../window_func.h"
 #include "../openttd.h"
 

src/network/network_udp.cpp

@@ -22,12 +22,8 @@
 #include "network_gamelist.h"
 #include "network_internal.h"
 #include "network_udp.h"
-#include "core/host.h"
 #include "../core/endian_func.hpp"
-#include "../core/alloc_func.hpp"
-#include "../string_func.h"
 #include "../company_base.h"
-#include "../settings_type.h"
 #include "../thread/thread.h"
 #include "../rev.h"
 

src/newgrf.cpp

@@ -41,11 +41,8 @@
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "date_func.h"
-#include "vehicle_func.h"
-#include "sound_func.h"
 #include "string_func.h"
 #include "network/network.h"
-#include "map_func.h"
 #include <map>
 #include "core/alloc_type.hpp"
 #include "core/mem_func.hpp"