(svn r17693) -Cleanup: remove some unneeded includes

author: rubidium <rubidium@openttd.org> 2009-10-04 17:16:41 +0000
committer: rubidium <rubidium@openttd.org> 2009-10-04 17:16:41 +0000
commit: d6cded53803de692eebc6dd41e9648f3399c9f7d (patch)
tree: 420d39582d566fdb314cb4bfdd1e1389d4fd7510 /src
parent: 32cbe57178129d371752e29e857fa454a046f7c3 (diff)
download: openttd-d6cded53803de692eebc6dd41e9648f3399c9f7d.tar.xz
185 files changed, 16 insertions, 370 deletions
diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp
index 00e31b845..8854f06b3 100644
--- a/src/3rdparty/md5/md5.cpp
+++ b/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"
 
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index 298a8e3c0..a8e96085b 100644
--- a/src/ai/ai_core.cpp
+++ b/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"
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index c1139bbcf..b4808061b 100644
--- a/src/ai/ai_gui.cpp
+++ b/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"
 
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 1405f6226..d55ca085d 100644
--- a/src/ai/ai_instance.cpp
+++ b/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"
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 1d865fbfc..7467f773a 100644
--- a/src/ai/ai_scanner.cpp
+++ b/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"
diff --git a/src/ai/api/ai_abstractlist.cpp b/src/ai/api/ai_abstractlist.cpp
index 6647b725e..6194558eb 100644
--- a/src/ai/api/ai_abstractlist.cpp
+++ b/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"
 
 /**
diff --git a/src/ai/api/ai_airport.cpp b/src/ai/api/ai_airport.cpp
index d3a5f90b6..27870cb3a 100644
--- a/src/ai/api/ai_airport.cpp
+++ b/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)
 {
diff --git a/src/ai/api/ai_basestation.cpp b/src/ai/api/ai_basestation.cpp
index e6c7fb6b4..137829cf8 100644
--- a/src/ai/api/ai_basestation.cpp
+++ b/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)
diff --git a/src/ai/api/ai_bridge.cpp b/src/ai/api/ai_bridge.cpp
index d62924a53..4fb9e1778 100644
--- a/src/ai/api/ai_bridge.cpp
+++ b/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)
diff --git a/src/ai/api/ai_bridgelist.cpp b/src/ai/api/ai_bridgelist.cpp
index 75e2d42c2..82d857d07 100644
--- a/src/ai/api/ai_bridgelist.cpp
+++ b/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()
 {
diff --git a/src/ai/api/ai_cargolist.cpp b/src/ai/api/ai_cargolist.cpp
index 9546bb578..d04af550f 100644
--- a/src/ai/api/ai_cargolist.cpp
+++ b/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()
diff --git a/src/ai/api/ai_company.cpp b/src/ai/api/ai_company.cpp
index cf85a3644..f6fe91878 100644
--- a/src/ai/api/ai_company.cpp
+++ b/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"
diff --git a/src/ai/api/ai_depotlist.cpp b/src/ai/api/ai_depotlist.cpp
index 4c926c00c..558b6c31d 100644
--- a/src/ai/api/ai_depotlist.cpp
+++ b/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"
diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp
index 5500d15cb..2c2b8cb91 100644
--- a/src/ai/api/ai_event_types.cpp
+++ b/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"
diff --git a/src/ai/api/ai_group.cpp b/src/ai/api/ai_group.cpp
index cebb7f334..c9d3795cb 100644
--- a/src/ai/api/ai_group.cpp
+++ b/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"
diff --git a/src/ai/api/ai_industry.cpp b/src/ai/api/ai_industry.cpp
index 2002374e6..7a5489470 100644
--- a/src/ai/api/ai_industry.cpp
+++ b/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"
diff --git a/src/ai/api/ai_industrylist.cpp b/src/ai/api/ai_industrylist.cpp
index e8af79c5d..323012fcc 100644
--- a/src/ai/api/ai_industrylist.cpp
+++ b/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()
diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp
index ce19235c8..1f2084565 100644
--- a/src/ai/api/ai_industrytype.cpp
+++ b/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"
 
diff --git a/src/ai/api/ai_industrytypelist.cpp b/src/ai/api/ai_industrytypelist.cpp
index e31fbe2aa..d5c3fe56a 100644
--- a/src/ai/api/ai_industrytypelist.cpp
+++ b/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()
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index 45012c20c..e30f0c388 100644
--- a/src/ai/api/ai_object.cpp
+++ b/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"
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 1e18333fa..5ecdb27a6 100644
--- a/src/ai/api/ai_order.cpp
+++ b/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"
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index b8f4706b0..c43eb64ec 100644
--- a/src/ai/api/ai_road.cpp
+++ b/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"
 
diff --git a/src/ai/api/ai_sign.cpp b/src/ai/api/ai_sign.cpp
index 90603859d..ce36b1848 100644
--- a/src/ai/api/ai_sign.cpp
+++ b/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"
diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp
index ce9dc62a8..670355dff 100644
--- a/src/ai/api/ai_station.cpp
+++ b/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)
 {
diff --git a/src/ai/api/ai_subsidy.cpp b/src/ai/api/ai_subsidy.cpp
index 5b4f0f980..3d1edbb9b 100644
--- a/src/ai/api/ai_subsidy.cpp
+++ b/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)
 {
diff --git a/src/ai/api/ai_subsidylist.cpp b/src/ai/api/ai_subsidylist.cpp
index 9bad869f7..25a11f2d6 100644
--- a/src/ai/api/ai_subsidylist.cpp
+++ b/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()
diff --git a/src/ai/api/ai_tile.cpp b/src/ai/api/ai_tile.cpp
index 35eed526b..b7e41d7fa 100644
--- a/src/ai/api/ai_tile.cpp
+++ b/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"
diff --git a/src/ai/api/ai_tilelist.cpp b/src/ai/api/ai_tilelist.cpp
index d77dcd827..22ce7968d 100644
--- a/src/ai/api/ai_tilelist.cpp
+++ b/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)
 {
diff --git a/src/ai/api/ai_town.cpp b/src/ai/api/ai_town.cpp
index 78144b998..7f8dc3090 100644
--- a/src/ai/api/ai_town.cpp
+++ b/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"
diff --git a/src/ai/api/ai_tunnel.cpp b/src/ai/api/ai_tunnel.cpp
index 3cd5cf0c5..71b700e9b 100644
--- a/src/ai/api/ai_tunnel.cpp
+++ b/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)
 {
diff --git a/src/ai/api/ai_vehiclelist.cpp b/src/ai/api/ai_vehiclelist.cpp
index 61cbc9198..616c8cc12 100644
--- a/src/ai/api/ai_vehiclelist.cpp
+++ b/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"
 
diff --git a/src/ai/api/ai_waypoint.cpp b/src/ai/api/ai_waypoint.cpp
index 5eeb7143a..8f7eadf50 100644
--- a/src/ai/api/ai_waypoint.cpp
+++ b/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)
 {
diff --git a/src/ai/api/ai_waypointlist.cpp b/src/ai/api/ai_waypointlist.cpp
index c75f4340d..13087df81 100644
--- a/src/ai/api/ai_waypointlist.cpp
+++ b/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"
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 3defb067e..03756aed8 100644
--- a/src/aircraft_cmd.cpp
+++ b/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"
diff --git a/src/airport.cpp b/src/airport.cpp
index a90f3fb35..97ab711ba 100644
--- a/src/airport.cpp
+++ b/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"
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 74e946640..9ae53029c 100644
--- a/src/airport_gui.cpp
+++ b/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"
 
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index 650cae2d2..6bef8dcc8 100644
--- a/src/autoreplace_cmd.cpp
+++ b/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"
 
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index 9ce53f474..ef42ee0a3 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/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"
diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp
index 9c42b6a44..bfc8bd422 100644
--- a/src/blitter/32bpp_optimized.cpp
+++ b/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;
diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp
index a1a9897dc..4cc86673a 100644
--- a/src/blitter/8bpp_optimized.cpp
+++ b/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"
 
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 30d0b43db..806f1fd2c 100644
--- a/src/bridge_gui.cpp
+++ b/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"
diff --git a/src/bridge_map.cpp b/src/bridge_map.cpp
index de856d21f..2817346ef 100644
--- a/src/bridge_map.cpp
+++ b/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"
 
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index c0e04a00e..bcdb8fb55 100644
--- a/src/build_vehicle_gui.cpp
+++ b/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"
 
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index 3ef1bf426..f0c579121 100644
--- a/src/cheat_gui.cpp
+++ b/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"
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index 8cc8aaee2..bce21924a 100644
--- a/src/clear_cmd.cpp
+++ b/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"
diff --git a/src/command.cpp b/src/command.cpp
index f3c552658..00e1d32d1 100644
--- a/src/command.cpp
+++ b/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"
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 7d05ffb93..a2dbbab7b 100644
--- a/src/company_cmd.cpp
+++ b/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"
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 465910853..52bfcf480 100644
--- a/src/company_gui.cpp
+++ b/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"
 
diff --git a/src/console.cpp b/src/console.cpp
index e1913071f..c37d995d4 100644
--- a/src/console.cpp
+++ b/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"
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 581f4151a..83ec9a3ef 100644
--- a/src/console_cmds.cpp
+++ b/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"
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index 81026ac68..9fbc015f5 100644
--- a/src/console_gui.cpp
+++ b/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,
diff --git a/src/core/alloc_func.cpp b/src/core/alloc_func.cpp
index c2cbcc448..d2b3a4b6c 100644
--- a/src/core/alloc_func.cpp
+++ b/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
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index 2a46866d1..d1973c52b 100644
--- a/src/crashlog.cpp
+++ b/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"
diff --git a/src/date.cpp b/src/date.cpp
index 4d3c27b2e..51ff6e426 100644
--- a/src/date.cpp
+++ b/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"
diff --git a/src/depot.cpp b/src/depot.cpp
index 58fc86e09..f5c134b4b 100644
--- a/src/depot.cpp
+++ b/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"
 
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index a2af30d55..b157f65d7 100644
--- a/src/dock_gui.cpp
+++ b/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"
diff --git a/src/dummy_land.cpp b/src/dummy_land.cpp
index 63b77f20d..305be368c 100644
--- a/src/dummy_land.cpp
+++ b/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"
diff --git a/src/effectvehicle.cpp b/src/effectvehicle.cpp
index 94d729297..f6f912b35 100644
--- a/src/effectvehicle.cpp
+++ b/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"
diff --git a/src/elrail.cpp b/src/elrail.cpp
index 6964917ca..d121679e6 100644
--- a/src/elrail.cpp
+++ b/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"
diff --git a/src/engine.cpp b/src/engine.cpp
index c7f6b440b..7219d27a1 100644
--- a/src/engine.cpp
+++ b/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"
 
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 958d3938a..15df2de24 100644
--- a/src/engine_gui.cpp
+++ b/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.
diff --git a/src/fios.cpp b/src/fios.cpp
index 6310f4553..269b99dd2 100644
--- a/src/fios.cpp
+++ b/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"
 
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 4116705c0..2e227c674 100644
--- a/src/fontcache.cpp
+++ b/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"
diff --git a/src/genworld.cpp b/src/genworld.cpp
index f2d9075d3..b0bdfe8d2 100644
--- a/src/genworld.cpp
+++ b/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"
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index db71ce835..63cc32f71 100644
--- a/src/genworld_gui.cpp
+++ b/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"
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 4498b08b6..328e6da1c 100644
--- a/src/gfx.cpp
+++ b/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"
 
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 1a722a9a8..70e01886b 100644
--- a/src/gfxinit.cpp
+++ b/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"
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 0d4bb2e53..59b799d9e 100644
--- a/src/group_cmd.cpp
+++ b/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"
diff --git a/src/heightmap.cpp b/src/heightmap.cpp
index 1d72cc0f5..f5f71338c 100644
--- a/src/heightmap.cpp
+++ b/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"
diff --git a/src/highscore.cpp b/src/highscore.cpp
index 0f6529456..51fb841a6 100644
--- a/src/highscore.cpp
+++ b/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"
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
index 0772f9a50..c2f63ee60 100644
--- a/src/highscore_gui.cpp
+++ b/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"
 
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index a8b54c1fd..84b5b1104 100644
--- a/src/industry_gui.cpp
+++ b/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"
diff --git a/src/ini.cpp b/src/ini.cpp
index f65cf45e6..f249f7b93 100644
--- a/src/ini.cpp
+++ b/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"
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index c0b32b3f0..7f7bd72d0 100644
--- a/src/intro_gui.cpp
+++ b/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"
 
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 1877f9be8..fad4551e3 100644
--- a/src/landscape.cpp
+++ b/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"
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 83a84fee2..e9152cda5 100644
--- a/src/main_gui.cpp
+++ b/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"
diff --git a/src/map.cpp b/src/map.cpp
index e6b0dcb42..435874598 100644
--- a/src/map.cpp
+++ b/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)
diff --git a/src/misc.cpp b/src/misc.cpp
index d5847eacc..34a2285f2 100644
--- a/src/misc.cpp
+++ b/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"
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 22c40f2ff..e43ed87a5 100644
--- a/src/misc_cmd.cpp
+++ b/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"
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 0ba65a92e..d7ce58e74 100644
--- a/src/misc_gui.cpp
+++ b/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"
 
diff --git a/src/mixer.cpp b/src/mixer.cpp
index a3cfb6b0d..7a94f6eda 100644
--- a/src/mixer.cpp
+++ b/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 {
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index aed617587..4e3023d2f 100644
--- a/src/music_gui.cpp
+++ b/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"
diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp
index 676fc66c3..4e1237577 100644
--- a/src/network/core/address.cpp
+++ b/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()
diff --git a/src/network/core/core.cpp b/src/network/core/core.cpp
index 76f62bced..76049f6fb 100644
--- a/src/network/core/core.cpp
+++ b/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"
 
 
diff --git a/src/network/core/host.cpp b/src/network/core/host.cpp
index d622e2e8c..0af0f7992 100644
--- a/src/network/core/host.cpp
+++ b/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.
diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp
index 032af3c50..2064945a7 100644
--- a/src/network/core/tcp.cpp
+++ b/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) :
diff --git a/src/network/core/tcp_connect.cpp b/src/network/core/tcp_connect.cpp
index 5d5d2feba..5585ae5a7 100644
--- a/src/network/core/tcp_connect.cpp
+++ b/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"
diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index a56f31d8d..423516f2e 100644
--- a/src/network/core/tcp_content.cpp
+++ b/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()
diff --git a/src/network/core/tcp_game.cpp b/src/network/core/tcp_game.cpp
index ffa2b07f9..b0c685378 100644
--- a/src/network/core/tcp_game.cpp
+++ b/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"
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index 6c03343d0..6ab412d84 100644
--- a/src/network/core/udp.cpp
+++ b/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"
 
 /**
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 6e3640692..55794fa4d 100644
--- a/src/network/network.cpp
+++ b/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"
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index f1c7e7d1a..95b34ef1b 100644
--- a/src/network/network_client.cpp
+++ b/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"
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index bff93ba40..d0aeb081e 100644
--- a/src/network/network_command.cpp
+++ b/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 */
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 1507c900f..529ece802 100644
--- a/src/network/network_content.cpp
+++ b/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"
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 8f94dd07e..906796eb8 100644
--- a/src/network/network_content_gui.cpp
+++ b/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"
diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp
index 5ac4ad1df..cef15affa 100644
--- a/src/network/network_gamelist.cpp
+++ b/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"
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 12a3aacb4..41685aab9 100644
--- a/src/network/network_gui.cpp
+++ b/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"
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 46fd1e480..86f4739be 100644
--- a/src/network/network_server.cpp
+++ b/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"
 
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 7785f635b..7f65d1658 100644
--- a/src/network/network_udp.cpp
+++ b/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"
 
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 9ce5dde8e..ae49f1da4 100644
--- a/src/newgrf.cpp
+++ b/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"
diff --git a/src/newgrf_canal.cpp b/src/newgrf_canal.cpp
index 7ad2feff2..ab2dddac7 100644
--- a/src/newgrf_canal.cpp
+++ b/src/newgrf_canal.cpp
@@ -10,7 +10,6 @@
 /** @file newgrf_canal.cpp Implementation of NewGRF canals. */
 
 #include "stdafx.h"
-#include "core/overflowsafe_type.hpp"
 #include "tile_type.h"
 #include "debug.h"
 #include "newgrf_commons.h"
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index b6d1a6b26..e0f7b05b5 100644
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -13,7 +13,6 @@
 #include "debug.h"
 #include "newgrf.h"
 #include "newgrf_spritegroup.h"
-#include "newgrf_cargo.h"
 
 static uint32 CargoGetRandomBits(const ResolverObject *object)
 {
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp
index 8ab457192..cf8683498 100644
--- a/src/newgrf_commons.cpp
+++ b/src/newgrf_commons.cpp
@@ -13,8 +13,8 @@
 
 #include "stdafx.h"
 #include "landscape.h"
-#include "town.h"
-#include "industry.h"
+#include "house.h"
+#include "industrytype.h"
 #include "newgrf.h"
 #include "newgrf_commons.h"
 #include "station_map.h"
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp
index 655010244..0ff34158e 100644
--- a/src/newgrf_config.cpp
+++ b/src/newgrf_config.cpp
@@ -10,13 +10,10 @@
 /** @file newgrf_config.cpp Finding NewGRFs and configuring them. */
 
 #include "stdafx.h"
-#include "core/sort_func.hpp"
 #include "debug.h"
 #include "3rdparty/md5/md5.h"
 #include "newgrf.h"
-#include "string_func.h"
 #include "gamelog.h"
-#include "network/network_type.h"
 #include "network/network_func.h"
 #include "gfx_func.h"
 
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index a5ee58d47..1103bf3b3 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -22,7 +22,6 @@
 #include "core/random_func.hpp"
 #include "aircraft.h"
 #include "core/smallmap_type.hpp"
-#include "settings_type.h"
 #include "station_base.h"
 
 struct WagonOverride {
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 07c97fc8d..5f4171c81 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -11,12 +11,9 @@
 
 #include "stdafx.h"
 #include "gui.h"
-#include "window_gui.h"
-#include "textbuf_gui.h"
 #include "newgrf.h"
 #include "strings_func.h"
 #include "window_func.h"
-#include "string_func.h"
 #include "gfx_func.h"
 #include "gamelog.h"
 #include "settings_func.h"
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index da57d68d9..681abe4dc 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -15,7 +15,6 @@
 #include "debug.h"
 #include "viewport_func.h"
 #include "landscape.h"
-#include "town_map.h"
 #include "sprite.h"
 #include "newgrf.h"
 #include "newgrf_house.h"
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 1be3ee64e..42f0f4fc7 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -11,9 +11,7 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "tile_type.h"
 #include "strings_type.h"
-#include "company_type.h"
 #include "industry.h"
 #include "newgrf.h"
 #include "newgrf_industries.h"
diff --git a/src/newgrf_sound.cpp b/src/newgrf_sound.cpp
index 7b029554e..a386f5b58 100644
--- a/src/newgrf_sound.cpp
+++ b/src/newgrf_sound.cpp
@@ -16,7 +16,6 @@
 #include "newgrf_sound.h"
 #include "vehicle_base.h"
 #include "sound_func.h"
-#include "core/smallvec_type.hpp"
 #include "core/mem_func.hpp"
 
 static SmallVector<SoundEntry, ORIGINAL_SAMPLE_COUNT> _sounds;
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index f704ca1d4..c9992eb1a 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -15,8 +15,7 @@
 #include "window_gui.h"
 #include "viewport_func.h"
 #include "news_type.h"
-#include "settings_type.h"
-#include "transparency.h"
+#include "gfx_func.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "date_func.h"
@@ -31,7 +30,6 @@
 #include "statusbar_gui.h"
 #include "company_manager_face.h"
 #include "company_func.h"
-#include "map_func.h"
 #include "engine_gui.h"
 
 #include "table/strings.h"
diff --git a/src/npf.cpp b/src/npf.cpp
index 5c02e1b40..a69625222 100644
--- a/src/npf.cpp
+++ b/src/npf.cpp
@@ -14,14 +14,11 @@
 #include "debug.h"
 #include "landscape.h"
 #include "depot_base.h"
-#include "depot_map.h"
 #include "network/network.h"
 #include "tunnelbridge_map.h"
 #include "functions.h"
-#include "vehicle_base.h"
 #include "tunnelbridge.h"
 #include "pbs.h"
-#include "settings_type.h"
 #include "pathfind.h"
 #include "train.h"
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 1391c7d95..d4bb54a1c 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -23,7 +23,6 @@
 #include "video/video_driver.hpp"
 
 #include "fontcache.h"
-#include "gfxinit.h"
 #include "gui.h"
 #include "sound_func.h"
 #include "window_func.h"
@@ -34,7 +33,6 @@
 #include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
-#include "fileio_func.h"
 #include "fios.h"
 #include "aircraft.h"
 #include "roadveh.h"
@@ -61,7 +59,8 @@
 #include "rev.h"
 #include "highscore.h"
 #include "thread/thread.h"
-#include "station_base.h"
+#include "base_station_base.h"
+#include "airport.h"
 #include "crashlog.h"
 
 #include "newgrf_commons.h"
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 0f0c37a5b..6660c07b3 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -16,8 +16,6 @@
 #include "news_func.h"
 #include "vehicle_gui.h"
 #include "cargotype.h"
-#include "station_map.h"
-#include "vehicle_base.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
@@ -25,7 +23,6 @@
 #include "timetable.h"
 #include "vehicle_func.h"
 #include "depot_base.h"
-#include "settings_type.h"
 #include "roadstop_base.h"
 #include "core/pool_func.hpp"
 #include "aircraft.h"
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 751d1a8f6..fc6d60cef 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -10,7 +10,6 @@
 /** @file order_gui.cpp GUI related to orders. */
 
 #include "stdafx.h"
-#include "station_map.h"
 #include "window_gui.h"
 #include "command_func.h"
 #include "viewport_func.h"
@@ -30,7 +29,6 @@
 #include "string_func.h"
 #include "tilehighlight_func.h"
 #include "network/network.h"
-#include "settings_type.h"
 #include "station_base.h"
 #include "waypoint_base.h"
 
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 54d18b8cf..7d51b7549 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -10,14 +10,10 @@
 /** @file unix.cpp Implementation of Unix specific file handling. */
 
 #include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../variables.h"
 #include "../../textbuf_gui.h"
 #include "../../functions.h"
-#include "../../core/random_func.hpp"
 #include "../../crashlog.h"
 
-#include "table/strings.h"
 
 #include <dirent.h>
 #include <unistd.h>
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index eb03694c1..fdf89ab21 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -10,7 +10,6 @@
 /** @file osk_gui.cpp The On Screen Keyboard GUI */
 
 #include "stdafx.h"
-#include "core/math_func.hpp"
 #include "string_func.h"
 #include "strings_func.h"
 #include "debug.h"
diff --git a/src/pathfind.cpp b/src/pathfind.cpp
index e9c0c9e3e..6f9899bc1 100644
--- a/src/pathfind.cpp
+++ b/src/pathfind.cpp
@@ -10,7 +10,6 @@
 /** @file pathfind.cpp Implementation of the oldest supported pathfinder. */
 
 #include "stdafx.h"
-#include "settings_type.h"
 #include "pathfind.h"
 #include "debug.h"
 #include "tunnelbridge_map.h"
diff --git a/src/pbs.cpp b/src/pbs.cpp
index 9ec580b52..7a66180d2 100644
--- a/src/pbs.cpp
+++ b/src/pbs.cpp
@@ -9,7 +9,6 @@
 
 /** @file pbs.cpp */
 #include "stdafx.h"
-#include "pbs.h"
 #include "functions.h"
 #include "vehicle_func.h"
 #include "yapf/follow_track.hpp"
diff --git a/src/rail.cpp b/src/rail.cpp
index 7b6e1ccb6..663753e9f 100644
--- a/src/rail.cpp
+++ b/src/rail.cpp
@@ -16,7 +16,6 @@
 #include "company_func.h"
 #include "company_base.h"
 #include "engine_base.h"
-#include "settings_type.h"
 
 /* XXX: Below 3 tables store duplicate data. Maybe remove some? */
 /* Maps a trackdir to the bit that stores its status in the map arrays, in the
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index c32fc76b1..fbf914e52 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -13,14 +13,13 @@
 #include "openttd.h"
 #include "cmd_helper.h"
 #include "landscape.h"
-#include "town_map.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "engine_base.h"
 #include "depot_base.h"
 #include "yapf/yapf.h"
 #include "newgrf_engine.h"
-#include "newgrf_station.h"
+#include "landscape_type.h"
 #include "newgrf_commons.h"
 #include "train.h"
 #include "variables.h"
@@ -31,7 +30,6 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "tunnelbridge.h"
-#include "station_map.h"
 #include "functions.h"
 #include "elrail_func.h"
 #include "town.h"
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 7c0641002..b435eb626 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -29,7 +29,6 @@
 #include "widgets/dropdown_type.h"
 #include "tunnelbridge.h"
 #include "tilehighlight_func.h"
-#include "settings_type.h"
 #include "spritecache.h"
 
 #include "station_map.h"
diff --git a/src/road.cpp b/src/road.cpp
index e9268504f..5e802f786 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -19,7 +19,6 @@
 #include "company_base.h"
 #include "engine_base.h"
 #include "date_func.h"
-#include "settings_type.h"
 #include "landscape.h"
 
 bool IsPossibleCrossing(const TileIndex tile, Axis ax)
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index b3e8e4889..bea59bd4d 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -14,13 +14,11 @@
 #include "cmd_helper.h"
 #include "road_internal.h"
 #include "landscape.h"
-#include "town_map.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "yapf/yapf.h"
 #include "depot_base.h"
 #include "newgrf.h"
-#include "station_map.h"
 #include "variables.h"
 #include "autoslope.h"
 #include "tunnelbridge_map.h"
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 38d15b00c..0b4939cfc 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -30,7 +30,6 @@
 #include "tunnelbridge.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
-#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/roadstop.cpp b/src/roadstop.cpp
index b224f70a9..ac7ece2ad 100644
--- a/src/roadstop.cpp
+++ b/src/roadstop.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "roadveh.h"
-#include "station_map.h"
 #include "core/pool_func.hpp"
 #include "roadstop_base.h"
 #include "station_base.h"
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 52eb9387a..ef265a675 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "landscape.h"
 #include "roadveh.h"
-#include "station_base.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "pathfind.h"
@@ -30,13 +29,11 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "variables.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
 #include "ai/ai.hpp"
-#include "depot_base.h"
+#include "depot_map.h"
 #include "effectvehicle_func.h"
-#include "settings_type.h"
 #include "roadstop_base.h"
 #include "cargotype.h"
 #include "newgrf_cargo.h"
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index e4a70a9f7..20f213d75 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -16,15 +16,12 @@
 #include "../depot_base.h"
 #include "../window_func.h"
 #include "../fios.h"
-#include "../train.h"
-#include "../string_func.h"
 #include "../gamelog.h"
 #include "../gamelog_internal.h"
 #include "../network/network.h"
 #include "../gfxinit.h"
 #include "../functions.h"
 #include "../industry.h"
-#include "../town_map.h"
 #include "../clear_map.h"
 #include "../vehicle_func.h"
 #include "../newgrf_station.h"
diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp
index b1299b444..95fd95575 100644
--- a/src/saveload/ai_sl.cpp
+++ b/src/saveload/ai_sl.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../company_base.h"
-#include "../company_func.h"
 #include "../debug.h"
 #include "saveload.h"
 #include "../string_func.h"
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp
index f81c51a40..ec7268e46 100644
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -13,7 +13,6 @@
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../company_manager_face.h"
-#include "../settings_type.h"
 
 #include "saveload.h"
 
diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp
index a38eff147..40b170c04 100644
--- a/src/saveload/industry_sl.cpp
+++ b/src/saveload/industry_sl.cpp
@@ -10,9 +10,7 @@
 /** @file industry_sl.cpp Code handling saving and loading of industries */
 
 #include "../stdafx.h"
-#include "../tile_type.h"
 #include "../strings_type.h"
-#include "../company_type.h"
 #include "../industry.h"
 #include "../newgrf_commons.h"
 
diff --git a/src/saveload/labelmaps_sl.cpp b/src/saveload/labelmaps_sl.cpp
index 162416a5b..093f7a680 100644
--- a/src/saveload/labelmaps_sl.cpp
+++ b/src/saveload/labelmaps_sl.cpp
@@ -10,17 +10,8 @@
 /** @file labelmaps_sl.cpp Code handling saving and loading of rail type label mappings */
 
 #include "../stdafx.h"
-#include "../strings_type.h"
-#include "../rail.h"
-#include "../map_func.h"
-#include "../tile_map.h"
-#include "../rail_map.h"
-#include "../road_map.h"
 #include "../station_map.h"
 #include "../tunnelbridge_map.h"
-#include "../core/alloc_func.hpp"
-#include "../core/smallvec_type.hpp"
-#include "../settings_type.h"
 
 #include "saveload.h"
 
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index ba118c69b..052c63360 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../date_func.h"
 #include "../variables.h"
-#include "../core/random_func.hpp"
 #include "../openttd.h"
 #include "../zoom_func.h"
 #include "../vehicle_func.h"
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index 43abe291f..c7cff7279 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../openttd.h"
-#include "../tile_type.h"
 #include "../debug.h"
 #include "../strings_type.h"
 #include "../string_func.h"
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index 9b5303c0e..a0c8d06af 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -22,7 +22,6 @@
 #include "../subsidy_base.h"
 #include "../debug.h"
 #include "../depot_base.h"
-#include "../newgrf_config.h"
 #include "../zoom_func.h"
 #include "../date_func.h"
 #include "../vehicle_func.h"
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 5dd4367ba..2c5eab3d0 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -31,7 +31,6 @@
 #include "../window_func.h"
 #include "../strings_func.h"
 #include "../gfx_func.h"
-#include "../core/alloc_func.hpp"
 #include "../core/endian_func.hpp"
 #include "../vehicle_base.h"
 #include "../company_func.h"
diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp
index 30dffa27f..5ddb9f69f 100644
--- a/src/saveload/station_sl.cpp
+++ b/src/saveload/station_sl.cpp
@@ -13,11 +13,7 @@
 #include "../station_base.h"
 #include "../waypoint_base.h"
 #include "../roadstop_base.h"
-#include "../order_base.h"
 #include "../vehicle_base.h"
-#include "../core/bitmath_func.hpp"
-#include "../core/alloc_func.hpp"
-#include "../variables.h"
 #include "../newgrf_station.h"
 
 #include "saveload.h"
diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index 6f992d3f0..47a7fb6c0 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../newgrf_house.h"
 #include "../newgrf_commons.h"
-#include "../variables.h"
 #include "../town.h"
 
 #include "saveload.h"
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 122126cb7..be7bf01e5 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -14,11 +14,9 @@
 #include "../newgrf_station.h"
 #include "../vehicle_base.h"
 #include "../town.h"
-#include "../station_map.h"
 
 #include "table/strings.h"
 
-#include "saveload.h"
 #include "saveload_internal.h"
 
 /** Helper structure to convert from the old waypoint system. */
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index 91bb08378..ea73c1f58 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -15,10 +15,8 @@
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "screenshot.h"
-#include "variables.h"
 #include "blitter/factory.hpp"
 #include "zoom_func.h"
-#include "core/alloc_func.hpp"
 #include "core/endian_func.hpp"
 #include "map_func.h"
 #include "saveload/saveload.h"
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index 8a6491461..308aea8fe 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -16,7 +16,6 @@
 
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
-#include "script_info.hpp"
 #include "script_scanner.hpp"
 
 void ScriptScanner::ScanDir(const char *dirname, const char *info_file_name)
diff --git a/src/sdl.cpp b/src/sdl.cpp
index 389659e56..da3ae5b54 100644
--- a/src/sdl.cpp
+++ b/src/sdl.cpp
@@ -13,7 +13,6 @@
 
 #ifdef WITH_SDL
 
-#include "openttd.h"
 #include "sdl.h"
 #include <SDL.h>
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 7ea4ff194..9dfac0e32 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -57,14 +57,11 @@
 #include "blitter/factory.hpp"
 #include "base_media_base.h"
 #include "gamelog.h"
-#include "station_func.h"
-#include "map_type.h"
 #include "settings_func.h"
 #include "ini_type.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"
 #include "newgrf.h"
-#include "engine_base.h"
 #include "ship.h"
 
 #include "void_map.h"
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 585223509..20864302c 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -16,11 +16,9 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "engine_func.h"
 #include "screenshot.h"
 #include "network/network.h"
 #include "town.h"
-#include "variables.h"
 #include "settings_internal.h"
 #include "newgrf_townname.h"
 #include "strings_func.h"
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index cbfcb8d34..82ccba38e 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -14,7 +14,6 @@
 #include "landscape.h"
 #include "timetable.h"
 #include "command_func.h"
-#include "station_base.h"
 #include "news_func.h"
 #include "company_func.h"
 #include "npf.h"
@@ -30,11 +29,9 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "variables.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
 #include "effectvehicle_func.h"
-#include "settings_type.h"
 #include "ai/ai.hpp"
 #include "pathfind.h"
 #include "landscape_type.h"
diff --git a/src/signs.cpp b/src/signs.cpp
index c787b1299..a86d79e9f 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -14,9 +14,6 @@
 #include "signs_base.h"
 #include "signs_func.h"
 #include "strings_func.h"
-#include "viewport_func.h"
-#include "zoom_func.h"
-#include "functions.h"
 #include "core/pool_func.hpp"
 
 #include "table/strings.h"
diff --git a/src/signs_cmd.cpp b/src/signs_cmd.cpp
index 5704f4e1c..dff599b65 100644
--- a/src/signs_cmd.cpp
+++ b/src/signs_cmd.cpp
@@ -17,7 +17,6 @@
 #include "command_func.h"
 #include "tilehighlight_func.h"
 #include "window_func.h"
-#include "map_func.h"
 #include "string_func.h"
 
 #include "table/strings.h"
diff --git a/src/sound.cpp b/src/sound.cpp
index 80eb8f2ea..5be043eee 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -12,11 +12,9 @@
 #include "stdafx.h"
 #include "landscape.h"
 #include "mixer.h"
-#include "fileio_func.h"
 #include "newgrf_sound.h"
 #include "fios.h"
 #include "window_gui.h"
-#include "map_func.h"
 #include "vehicle_base.h"
 #include "debug.h"
 
diff --git a/src/spritecache.cpp b/src/spritecache.cpp
index a9a99fbb2..b7104290e 100644
--- a/src/spritecache.cpp
+++ b/src/spritecache.cpp
@@ -13,7 +13,6 @@
 #include "gfx_type.h"
 #include "fileio_func.h"
 #include "spriteloader/grf.hpp"
-#include "core/alloc_func.hpp"
 #include "gfx_func.h"
 #ifdef WITH_PNG
 #include "spriteloader/png.hpp"
diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp
index d6e8a374e..14151dce3 100644
--- a/src/spriteloader/grf.cpp
+++ b/src/spriteloader/grf.cpp
@@ -13,7 +13,6 @@
 #include "../gfx_func.h"
 #include "../fileio_func.h"
 #include "../debug.h"
-#include "../core/alloc_func.hpp"
 #include "../strings_func.h"
 #include "table/strings.h"
 #include "../gui.h"
diff --git a/src/spriteloader/png.cpp b/src/spriteloader/png.cpp
index 1660f818c..e82ccf968 100644
--- a/src/spriteloader/png.cpp
+++ b/src/spriteloader/png.cpp
@@ -15,7 +15,6 @@
 #include "../gfx_func.h"
 #include "../fileio_func.h"
 #include "../debug.h"
-#include "../core/alloc_func.hpp"
 #include "png.hpp"
 #include <png.h>
 
diff --git a/src/station.cpp b/src/station.cpp
index bbd66af27..1ac0341c0 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -12,12 +12,8 @@
 #include "stdafx.h"
 #include "company_func.h"
 #include "newgrf_cargo.h"
-#include "yapf/yapf.h"
 #include "cargotype.h"
 #include "roadveh.h"
-#include "window_type.h"
-#include "station_gui.h"
-#include "zoom_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
@@ -25,8 +21,6 @@
 #include "news_func.h"
 #include "aircraft.h"
 #include "vehicle_gui.h"
-#include "settings_type.h"
-#include "subsidy_func.h"
 #include "core/pool_func.hpp"
 #include "station_base.h"
 #include "roadstop_base.h"
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 997402305..dc5174380 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -29,10 +29,8 @@
 #include "station_base.h"
 #include "waypoint_base.h"
 #include "tilehighlight_func.h"
-#include "core/smallmap_type.hpp"
 #include "company_base.h"
 #include "sortlist_type.h"
-#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index f1847ab02..ac9ab4351 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "settings_type.h"
 #include "date_func.h"
 #include "gfx_func.h"
 #include "news_func.h"
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 533c00a2b..a871a3266 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -17,14 +17,10 @@
 #include "strgen.h"
 #include "../table/control_codes.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdarg.h>
 
 #if (!defined(WIN32) && !defined(WIN64)) || defined(__CYGWIN__)
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #endif
 
diff --git a/src/strings.cpp b/src/strings.cpp
index ecf3b6294..66eb6b92b 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -12,8 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "currency.h"
-#include "spritecache.h"
-#include "townname_func.h"
 #include "station_base.h"
 #include "town.h"
 #include "screenshot.h"
@@ -23,7 +21,6 @@
 #include "music.h"
 #include "fileio_func.h"
 #include "group.h"
-#include "newgrf_townname.h"
 #include "signs_base.h"
 #include "cargotype.h"
 #include "fontcache.h"
@@ -33,7 +30,6 @@
 #include "core/endian_func.hpp"
 #include "date_func.h"
 #include "vehicle_base.h"
-#include "company_func.h"
 #include "video/video_driver.hpp"
 #include "engine_base.h"
 #include "strgen/strgen.h"
diff --git a/src/subsidy.cpp b/src/subsidy.cpp
index 0a07f723a..605be8411 100644
--- a/src/subsidy.cpp
+++ b/src/subsidy.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "company_func.h"
 #include "industry.h"
-#include "map_func.h"
 #include "town.h"
 #include "news_func.h"
 #include "ai/ai.hpp"
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index 878f50a53..5754464a3 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -10,11 +10,9 @@
 /** @file subsidy_gui.cpp GUI for subsidies. */
 
 #include "stdafx.h"
-#include "station_base.h"
+#include "strings_type.h"
 #include "industry.h"
 #include "town.h"
-#include "economy_func.h"
-#include "cargotype.h"
 #include "window_gui.h"
 #include "strings_func.h"
 #include "date_func.h"
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index 9270592fd..5a82bf669 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -17,7 +17,6 @@
 #include "variables.h"
 #include "functions.h"
 #include "economy_func.h"
-#include "settings_type.h"
 
 #include "table/strings.h"
 
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 1fee3d21c..94c0c43de 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -29,10 +29,8 @@
 #include "textbuf_gui.h"
 #include "genworld.h"
 #include "tree_map.h"
-#include "station_map.h"
 #include "landscape_type.h"
 #include "tilehighlight_func.h"
-#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/texteff.cpp b/src/texteff.cpp
index db88adfd6..0f6bf526b 100644
--- a/src/texteff.cpp
+++ b/src/texteff.cpp
@@ -17,7 +17,6 @@
 #include "transparency.h"
 #include "strings_func.h"
 #include "core/alloc_func.hpp"
-#include "functions.h"
 #include "viewport_func.h"
 #include "settings_type.h"
 
diff --git a/src/tgp.cpp b/src/tgp.cpp
index f4157ecf0..ba223938f 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -17,7 +17,6 @@
 #include "core/alloc_func.hpp"
 #include "core/random_func.hpp"
 #include "landscape_type.h"
-#include "settings_type.h"
 
 /*
  *
diff --git a/src/tile_map.cpp b/src/tile_map.cpp
index 81e4f469a..b2158e85c 100644
--- a/src/tile_map.cpp
+++ b/src/tile_map.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "tile_map.h"
 #include "core/math_func.hpp"
-#include "settings_type.h"
 
 /**
  * Return the slope of a given tile
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp
index 2175b884d..66e2da480 100644
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -14,7 +14,6 @@
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_base.h"
-#include "settings_type.h"
 
 #include "table/strings.h"
 
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index c9267eed1..29f4b76af 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -20,7 +20,6 @@
 #include "string_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
-#include "settings_type.h"
 
 #include "table/strings.h"
 
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 4d4556e9d..e63e68f75 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -41,8 +41,6 @@
 #include "tilehighlight_func.h"
 #include "rail.h"
 #include "widgets/dropdown_type.h"
-#include "settings_type.h"
-#include "newgrf_config.h"
 
 #include "network/network.h"
 #include "network/network_gui.h"
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 3be7dd19f..85920161e 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -15,7 +15,6 @@
 #include "road_internal.h" /* Cleaning up road bits */
 #include "road_cmd.h"
 #include "landscape.h"
-#include "town_map.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "industry.h"
@@ -24,14 +23,11 @@
 #include "news_func.h"
 #include "gui.h"
 #include "unmovable_map.h"
-#include "water_map.h"
 #include "variables.h"
-#include "slope_func.h"
 #include "genworld.h"
 #include "newgrf.h"
 #include "newgrf_house.h"
 #include "newgrf_commons.h"
-#include "newgrf_townname.h"
 #include "newgrf_text.h"
 #include "autoslope.h"
 #include "transparency.h"
@@ -40,8 +36,6 @@
 #include "window_func.h"
 #include "string_func.h"
 #include "newgrf_cargo.h"
-#include "economy_func.h"
-#include "station_func.h"
 #include "cheat_type.h"
 #include "functions.h"
 #include "animated_tile_func.h"
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 398bf628a..8c39e42e2 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -13,11 +13,8 @@
 #include "openttd.h"
 #include "town.h"
 #include "viewport_func.h"
-#include "window_func.h"
 #include "gfx_func.h"
 #include "gui.h"
-#include "window_gui.h"
-#include "textbuf_gui.h"
 #include "command_func.h"
 #include "company_func.h"
 #include "company_base.h"
@@ -30,13 +27,10 @@
 #include "tilehighlight_func.h"
 #include "sortlist_type.h"
 #include "road_cmd.h"
-#include "landscape_type.h"
 #include "landscape.h"
 #include "cargotype.h"
-#include "tile_map.h"
 #include "querystring_gui.h"
 #include "window_func.h"
-#include "string_func.h"
 #include "townname_func.h"
 #include "townname_type.h"
 
diff --git a/src/townname.cpp b/src/townname.cpp
index e444f2dc6..8193e3516 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -10,9 +10,7 @@
 /** @file townname.cpp Town name generators. */
 
 #include "stdafx.h"
-#include "townname_func.h"
 #include "string_func.h"
-#include "townname_func.h"
 #include "townname_type.h"
 #include "town.h"
 #include "core/alloc_func.hpp"
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index acad557a6..eaaf92524 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -15,12 +15,8 @@
 #include "command_func.h"
 #include "npf.h"
 #include "news_func.h"
-#include "engine_func.h"
-#include "engine_base.h"
 #include "company_func.h"
-#include "depot_base.h"
 #include "vehicle_gui.h"
-#include "train.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
@@ -32,7 +28,6 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "variables.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
 #include "ai/ai.hpp"
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index c77b34b91..b939584c2 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -15,12 +15,10 @@
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "train.h"
-#include "newgrf_engine.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "engine_base.h"
 #include "window_func.h"
-#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp
index 3e454cc93..043b1d145 100644
--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@@ -14,7 +14,6 @@
 #include "window_gui.h"
 #include "transparency.h"
 #include "sound_func.h"
-#include "core/math_func.hpp"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index e09b0e17f..38fcd0282 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -18,7 +18,6 @@
 #include "company_base.h"
 #include "command_func.h"
 #include "sound_func.h"
-#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index a6b98c29b..aafae7fdc 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -35,7 +35,6 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "tunnelbridge.h"
-#include "engine_base.h"
 #include "cheat_type.h"
 #include "elrail_func.h"
 #include "landscape_type.h"
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index 3509217da..0bbce5952 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -18,7 +18,6 @@
 #include "town.h"
 #include "sprite.h"
 #include "bridge_map.h"
-#include "unmovable_map.h"
 #include "genworld.h"
 #include "autoslope.h"
 #include "transparency.h"
@@ -26,7 +25,6 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "company_gui.h"
-#include "economy_func.h"
 #include "cheat_type.h"
 #include "landscape_type.h"
 #include "unmovable.h"
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 7bb6ffd94..2bde108f5 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -42,7 +42,6 @@
 #include "ai/ai.hpp"
 #include "core/smallmap_type.hpp"
 #include "depot_func.h"
-#include "settings_type.h"
 #include "network/network.h"
 #include "core/pool_func.hpp"
 #include "economy_base.h"
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 3fee59bcc..9184e778d 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -37,7 +37,6 @@
 #include "widgets/dropdown_func.h"
 #include "timetable.h"
 #include "vehiclelist.h"
-#include "settings_type.h"
 #include "articulated_vehicles.h"
 #include "cargotype.h"
 
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 723260a1f..dc6c94989 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -43,7 +43,6 @@
 #include "zoom_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
-#include "station_func.h"
 #include "waypoint_func.h"
 #include "window_func.h"
 #include "tilehighlight_func.h"
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 65040837e..7d626c5e1 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -23,7 +23,7 @@
 #include "train.h"
 #include "roadveh.h"
 #include "water.h"
-#include "industry.h"
+#include "industry_map.h"
 #include "cargotype.h"
 #include "newgrf_canal.h"
 #include "transparency.h"
diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index b3e86ed3e..eeb3bcccf 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 
-#include "strings_type.h"
 #include "order_func.h"
 #include "window_func.h"
 #include "newgrf_station.h"
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index d490be078..b96805104 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -13,13 +13,11 @@
 
 #include "command_func.h"
 #include "landscape.h"
-#include "economy_func.h"
 #include "bridge_map.h"
 #include "town.h"
 #include "waypoint_base.h"
 #include "yapf/yapf.h"
 #include "strings_func.h"
-#include "gfx_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
@@ -27,8 +25,7 @@
 #include "string_func.h"
 #include "company_func.h"
 #include "newgrf_station.h"
-#include "viewport_func.h"
-#include "train.h"
+#include "company_base.h"
 #include "water.h"
 
 #include "table/strings.h"
diff --git a/src/widget.cpp b/src/widget.cpp
index c84269ce1..640f650d3 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "company_func.h"
-#include "gfx_func.h"
 #include "window_gui.h"
 #include "viewport_func.h"
 #include "zoom_func.h"
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index 94c3b2b73..8123554b5 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -14,7 +14,6 @@
 #include "../strings_func.h"
 #include "../gfx_func.h"
 #include "../window_func.h"
-#include "../core/math_func.hpp"
 #include "dropdown_type.h"
 
 #include "table/strings.h"
diff --git a/src/window.cpp b/src/window.cpp
index 99aa5f2cf..9da50f6b2 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -23,7 +23,6 @@
 #include "zoom_func.h"
 #include "map_func.h"
 #include "vehicle_base.h"
-#include "settings_type.h"
 #include "cheat_type.h"
 #include "window_func.h"
 #include "tilehighlight_func.h"
diff --git a/src/yapf/yapf_rail.cpp b/src/yapf/yapf_rail.cpp
index bca86c0d2..c7c1e500b 100644
--- a/src/yapf/yapf_rail.cpp
+++ b/src/yapf/yapf_rail.cpp
@@ -15,7 +15,6 @@
 #include "yapf_node_rail.hpp"
 #include "yapf_costrail.hpp"
 #include "yapf_destrail.hpp"
-#include "../vehicle_func.h"
 #include "../functions.h"
 
 #define DEBUG_YAPF_CACHE 0
diff --git a/src/yapf/yapf_road.cpp b/src/yapf/yapf_road.cpp
index 63cce55d2..f4bfae46d 100644
--- a/src/yapf/yapf_road.cpp
+++ b/src/yapf/yapf_road.cpp
@@ -10,8 +10,6 @@
 /** @file yapf_road.cpp The road pathfinding. */
 
 #include "../stdafx.h"
-#include "../depot_base.h"
-#include "../roadveh.h"
 #include "../roadstop_base.h"
 #include "../cargotype.h"
 #include "../newgrf_cargo.h"
author	rubidium <rubidium@openttd.org>	2009-10-04 17:16:41 +0000
committer	rubidium <rubidium@openttd.org>	2009-10-04 17:16:41 +0000
commit	d6cded53803de692eebc6dd41e9648f3399c9f7d (patch)
tree	420d39582d566fdb314cb4bfdd1e1389d4fd7510 /src
parent	32cbe57178129d371752e29e857fa454a046f7c3 (diff)
download	openttd-d6cded53803de692eebc6dd41e9648f3399c9f7d.tar.xz