(svn r15299) -Cleanup: remove many redundant includes

src/ai/ai_config.cpp

@@ -8,7 +8,6 @@
 #include "../core/random_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
-#include "ai_info.hpp"
 
 void AIConfig::ChangeAI(const char *name, int version)
 {

src/ai/ai_core.cpp

@@ -3,18 +3,14 @@
 /** @file ai_core.cpp Implementation of AI. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
-#include "../company_type.h"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../debug.h"
 #include "../network/network.h"
 #include "../settings_type.h"
-#include "../window_type.h"
 #include "../window_func.h"
 #include "../command_func.h"
 #include "ai.hpp"
-#include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"

src/ai/ai_gui.cpp

@@ -3,21 +3,14 @@
 /** @file ai_gui.cpp Window for configuring the AIs */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../gui.h"
 #include "../window_gui.h"
 #include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
-#include "../economy_func.h"
-#include "../variables.h"
-#include "../cargotype.h"
 #include "../strings_func.h"
-#include "../core/alloc_func.hpp"
 #include "../window_func.h"
-#include "../date_func.h"
 #include "../gfx_func.h"
-#include "../debug.h"
 #include "../command_func.h"
 #include "../network/network.h"
 #include "../string_func.h"
@@ -26,15 +19,10 @@
 #include "../network/network_content.h"
 
 #include "ai.hpp"
-#include "api/ai_types.hpp"
-#include "api/ai_controller.hpp"
-#include "api/ai_object.hpp"
 #include "api/ai_log.hpp"
-#include "ai_info.hpp"
 #include "ai_config.hpp"
 
 #include "table/strings.h"
-#include "../table/sprites.h"
 
 /**
  * Window that let you choose an available AI.

src/ai/ai_info.cpp

@@ -3,17 +3,13 @@
 /** @file ai_info.cpp Implementation of AIFileInfo */
 
 #include "../stdafx.h"
-#include "../core/alloc_func.hpp"
 
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
-#include "../script/squirrel_class.hpp"
-#include "../script/squirrel_std.hpp"
 #include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
-#include "api/ai_controller.hpp"
 #include "../settings_type.h"
 #include "../openttd.h"
 

src/ai/ai_instance.cpp

@@ -3,13 +3,8 @@
 /** @file ai_instance.cpp Implementation of AIInstance. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../debug.h"
-#include "../company_func.h"
-#include "../core/alloc_func.hpp"
-#include "../string_func.h"
 #include "../settings_type.h"
-#include "../company_base.h"
 #include "../vehicle_base.h"
 #include "../saveload/saveload.h"
 #include "table/strings.h"
@@ -22,7 +17,6 @@
 
 #define DEFINE_SCRIPT_FILES
 
-#include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_storage.hpp"
 #include "ai_instance.hpp"

src/ai/ai_scanner.cpp

@@ -4,13 +4,11 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../openttd.h"
 #include "../string_func.h"
 #include "../fileio_func.h"
 #include "../fios.h"
 #include "../network/network.h"
 #include "../core/random_func.hpp"
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <squirrel.h>

src/ai/api/ai_airport.cpp

@@ -4,12 +4,8 @@
 
 #include "ai_airport.hpp"
 #include "ai_station.hpp"
-#include "ai_error.hpp"
-#include "../../openttd.h"
-#include "../../variables.h"
 #include "../../station_map.h"
 #include "../../company_func.h"
-#include "../../settings_type.h"
 #include "../../command_type.h"
 #include "../../town.h"
 

src/ai/api/ai_bridge.cpp

@@ -5,14 +5,11 @@
 #include "ai_bridge.hpp"
 #include "ai_rail.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../bridge_map.h"
 #include "../../strings_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../economy_func.h"
 #include "../../settings_type.h"
-#include "../../road_map.h"
-#include "table/strings.h"
 
 /* static */ bool AIBridge::IsValidBridge(BridgeID bridge_id)
 {

src/ai/api/ai_bridgelist.cpp

@@ -4,7 +4,6 @@
 
 #include "ai_bridgelist.hpp"
 #include "ai_bridge.hpp"
-#include "../../openttd.h"
 #include "../../bridge.h"
 #include "../../date_func.h"
 

src/ai/api/ai_cargo.cpp

@@ -3,7 +3,6 @@
 /** @file ai_cargo.cpp Implementation of AICargo. */
 
 #include "ai_cargo.hpp"
-#include "../../openttd.h"
 #include "../../cargotype.h"
 #include "../../economy_func.h"
 #include "../../core/alloc_func.hpp"

src/ai/api/ai_cargolist.cpp

@@ -4,7 +4,6 @@
 
 #include "ai_cargolist.hpp"
 #include "ai_industry.hpp"
-#include "../../openttd.h"
 #include "../../cargotype.h"
 #include "../../tile_type.h"
 #include "../../industry.h"

src/ai/api/ai_company.cpp

@@ -5,14 +5,12 @@
 #include "ai_company.hpp"
 #include "ai_error.hpp"
 #include "ai_log.hpp"
-#include "../../openttd.h"
 #include "../../command_func.h"
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../economy_func.h"
 #include "../../strings_func.h"
 #include "../../tile_map.h"
-#include "../../variables.h"
 #include "../../core/alloc_func.hpp"
 #include "../../string_func.h"
 #include "table/strings.h"

src/ai/api/ai_controller.cpp

@@ -3,18 +3,12 @@
 /** @file ai_controller.cpp Implementation of AIControler. */
 
 #include "../../stdafx.h"
-#include "../../openttd.h"
-#include "../../company_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../string_func.h"
-#include "../../settings_type.h"
 #include "../../company_base.h"
-#include "../../saveload/saveload.h"
 #include "table/strings.h"
 
 #include "../ai.hpp"
 #include "ai_controller.hpp"
-#include "../ai_info.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 #include "../ai_config.hpp"

src/ai/api/ai_depotlist.cpp

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

src/ai/api/ai_engine.cpp

@@ -4,18 +4,10 @@
 
 #include "ai_engine.hpp"
 #include "ai_cargo.hpp"
-#include "ai_rail.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../strings_func.h"
-#include "../../roadveh.h"
-#include "../../train.h"
-#include "../../ship.h"
 #include "../../aircraft.h"
 #include "../../vehicle_func.h"
-#include "../../core/alloc_func.hpp"
-#include "../../economy_func.h"
-#include "../../core/bitmath_func.hpp"
 #include "../../settings_type.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"

src/ai/api/ai_error.cpp

@@ -3,7 +3,6 @@
 /** @file ai_error.cpp Implementation of AIError. */
 
 #include "ai_error.hpp"
-#include "table/strings.h"
 #include "../../core/bitmath_func.hpp"
 
 AIError::AIErrorMap AIError::error_map = AIError::AIErrorMap();

src/ai/api/ai_event.cpp

@@ -2,11 +2,9 @@
 
 /** @file ai_event.cpp Implementation of AIEvent. */
 
-#include "ai_event.hpp"
 #include "ai_event_types.hpp"
 
 #include <queue>
-#include <set>
 
 struct AIEventData {
 	std::queue<AIEvent *> stack;

src/ai/api/ai_event_types.cpp

@@ -3,14 +3,9 @@
 /** @file ai_event_types.cpp Implementation of all EventTypes. */
 
 #include "ai_event_types.hpp"
-#include "../../openttd.h"
-#include "../../core/alloc_func.hpp"
 #include "../../strings_func.h"
-#include "../../roadveh.h"
-#include "../../train.h"
-#include "../../ship.h"
-#include "../../aircraft.h"
 #include "../../settings_type.h"
+#include "../../aircraft.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"
 

src/ai/api/ai_gamesettings.cpp

@@ -4,7 +4,6 @@
 
 #include "ai_gamesettings.hpp"
 #include "../../settings_internal.h"
-#include "../../saveload/saveload.h"
 
 /* static */ bool AIGameSettings::IsValid(const char *setting)
 {

src/ai/api/ai_group.cpp

@@ -3,10 +3,8 @@
 /** @file ai_group.cpp Implementation of AIGroup. */
 
 #include "ai_group.hpp"
-#include "ai_vehicle.hpp"
 #include "ai_engine.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../group.h"
 #include "../../string_func.h"

src/ai/api/ai_grouplist.cpp

@@ -3,7 +3,6 @@
 /** @file ai_grouplist.cpp Implementation of AIGroupList and friends. */
 
 #include "ai_grouplist.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../group.h"
 

src/ai/api/ai_industry.cpp

@@ -5,13 +5,10 @@
 #include "ai_industry.hpp"
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
-#include "../../openttd.h"
 #include "../../tile_type.h"
 #include "../../industry.h"
-#include "../../tile_map.h"
 #include "../../strings_func.h"
 #include "../../station_map.h"
-#include "../../station_func.h"
 #include "table/strings.h"
 
 /* static */ IndustryID AIIndustry::GetMaxIndustryID()

src/ai/api/ai_industrylist.cpp

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

src/ai/api/ai_industrytype.cpp

@@ -4,11 +4,9 @@
 
 #include "ai_industrytype.hpp"
 #include "ai_map.hpp"
-#include "../../openttd.h"
 #include "../../command_type.h"
 #include "../../settings_type.h"
 #include "../../strings_func.h"
-#include "../../tile_type.h"
 #include "../../industry.h"
 
 /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)

src/ai/api/ai_industrytypelist.cpp

@@ -3,7 +3,6 @@
 /** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */
 
 #include "ai_industrytypelist.hpp"
-#include "../../openttd.h"
 #include "../../tile_type.h"
 #include "../../industry.h"
 

src/ai/api/ai_map.cpp

@@ -3,7 +3,6 @@
 /** @file ai_map.cpp Implementation of AIMap. */
 
 #include "ai_map.hpp"
-#include "../../map_func.h"
 #include "../../tile_map.h"
 
 /* static */ bool AIMap::IsValidTile(TileIndex t)

src/ai/api/ai_marine.cpp

@@ -3,11 +3,7 @@
 /** @file ai_marine.cpp Implementation of AIMarine. */
 
 #include "ai_marine.hpp"
-#include "../../openttd.h"
-#include "../../command_type.h"
-#include "../../variables.h"
 #include "../../station_map.h"
-#include "../../water_map.h"
 #include "../../tile_cmd.h"
 
 

src/ai/api/ai_object.cpp

@@ -2,26 +2,12 @@
 
 /** @file ai_object.cpp Implementation of AIObject. */
 
-#include "ai_object.hpp"
 #include "ai_log.hpp"
-#include "ai_error.hpp"
 #include "table/strings.h"
-#include "../../openttd.h"
-#include "../../command_func.h"
-#include "../../map_func.h"
-#include "../../network/network.h"
-#include "../../company_func.h"
-#include "../../signs_func.h"
-#include "../../tunnelbridge.h"
-#include "../../vehicle_func.h"
-#include "../../group.h"
 #include "../ai.hpp"
-#include "ai_controller.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 
-#include <vector>
-
 static AIStorage *GetStorage()
 {
 	return AIInstance::GetStorage();

src/ai/api/ai_order.cpp

@@ -3,18 +3,12 @@
 /** @file ai_order.cpp Implementation of AIOrder. */
 
 #include "ai_order.hpp"
-#include "ai_map.hpp"
 #include "ai_vehicle.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../debug.h"
 #include "../../vehicle_base.h"
 #include "../../depot_base.h"
-#include "../../landscape.h"
-#include "../../rail_map.h"
-#include "../../road_map.h"
 #include "../../station_map.h"
-#include "../../water_map.h"
 #include "../../waypoint.h"
 
 /**

src/ai/api/ai_rail.cpp

@@ -3,21 +3,13 @@
 /** @file ai_rail.cpp Implementation of AIRail. */
 
 #include "ai_rail.hpp"
-#include "ai_object.hpp"
 #include "ai_map.hpp"
-#include "../../openttd.h"
 #include "../../debug.h"
-#include "../../rail_map.h"
-#include "../../road_map.h"
-#include "../../command_type.h"
 #include "../../station_map.h"
 #include "../../company_func.h"
-#include "../../core/math_func.hpp"
 #include "../../waypoint.h"
-#include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
-#include "../../newgrf_callbacks.h"
 
 /* static */ bool AIRail::IsRailTile(TileIndex tile)
 {

src/ai/api/ai_road.cpp

@@ -4,14 +4,10 @@
 
 #include "ai_road.hpp"
 #include "ai_map.hpp"
-#include "ai_list.hpp"
-#include "../../openttd.h"
-#include "../../road_map.h"
 #include "../../station_map.h"
-#include "../../tunnelbridge_map.h"
 #include "../../command_type.h"
-#include "../../company_func.h"
 #include "../../settings_type.h"
+#include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
 
 /* static */ bool AIRoad::IsRoadTile(TileIndex tile)

src/ai/api/ai_sign.cpp

@@ -5,7 +5,6 @@
 #include "ai_sign.hpp"
 #include "table/strings.h"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../command_func.h"
 #include "../../core/alloc_func.hpp"
 #include "../../signs_base.h"

src/ai/api/ai_station.cpp

@@ -6,16 +6,12 @@
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "../../openttd.h"
 #include "../../command_func.h"
 #include "../../debug.h"
 #include "../../station_map.h"
-#include "../../variables.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../company_func.h"
-#include "../../settings_type.h"
 #include "../../town.h"
 #include "table/strings.h"
 

src/ai/api/ai_stationlist.cpp

@@ -4,7 +4,6 @@
 
 #include "ai_stationlist.hpp"
 #include "ai_vehicle.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../station_base.h"
 #include "../../vehicle_base.h"

src/ai/api/ai_subsidy.cpp

@@ -3,10 +3,7 @@
 /** @file ai_subsidy.cpp Implementation of AISubsidy. */
 
 #include "ai_subsidy.hpp"
-#include "ai_error.hpp"
-#include "ai_company.hpp"
 #include "ai_date.hpp"
-#include "../../openttd.h"
 #include "../../economy_func.h"
 #include "../../station_base.h"
 #include "../../cargotype.h"

src/ai/api/ai_tile.cpp

@@ -5,14 +5,7 @@
 #include "ai_tile.hpp"
 #include "ai_map.hpp"
 #include "ai_town.hpp"
-#include "../../openttd.h"
-#include "../../tile_map.h"
-#include "../../tile_cmd.h"
-#include "../../map_func.h"
-#include "../../variables.h"
 #include "../../station_func.h"
-#include "../../command_type.h"
-#include "../../settings_type.h"
 #include "../../company_func.h"
 #include "../../road_map.h"
 #include "../../water_map.h"

src/ai/api/ai_tilelist.cpp

@@ -4,15 +4,10 @@
 
 #include "ai_tilelist.hpp"
 #include "ai_industry.hpp"
-#include "../../openttd.h"
-#include "../../landscape.h"
-#include "../../settings_type.h"
-#include "../../station_func.h"
-#include "../../map_func.h"
 #include "../../tile_map.h"
 #include "../../industry_map.h"
-#include "../../station_base.h"
 #include "../../station_map.h"
+#include "../../settings_type.h"
 
 void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2)
 {

src/ai/api/ai_town.cpp

@@ -7,7 +7,6 @@
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
 #include "../../command_type.h"
-#include "../../openttd.h"
 #include "../../town.h"
 #include "../../strings_func.h"
 #include "../../core/alloc_func.hpp"

src/ai/api/ai_townlist.cpp

@@ -3,7 +3,6 @@
 /** @file ai_townlist.cpp Implementation of AITownList and friends. */
 
 #include "ai_townlist.hpp"
-#include "../../openttd.h"
 #include "../../town.h"
 
 AITownList::AITownList()

src/ai/api/ai_tunnel.cpp

@@ -3,13 +3,9 @@
 /** @file ai_tunnel.cpp Implementation of AITunnel. */
 
 #include "ai_tunnel.hpp"
-#include "ai_map.hpp"
 #include "ai_rail.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
-#include "../../landscape.h"
 #include "../../tunnel_map.h"
-#include "../../road_type.h"
 #include "../../command_func.h"
 #include "../../tunnelbridge.h"
 #include "../../road_func.h"

src/ai/api/ai_vehicle.cpp

@@ -2,19 +2,15 @@
 
 /** @file ai_vehicle.cpp Implementation of AIVehicle. */
 
-#include "ai_vehicle.hpp"
 #include "ai_engine.hpp"
 #include "ai_cargo.hpp"
-#include "ai_order.hpp"
 #include "ai_gamesettings.hpp"
 #include "ai_group.hpp"
 #include "../ai_instance.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../aircraft.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../command_func.h"
 #include "../../roadveh.h"
 #include "../../train.h"

src/ai/api/ai_vehiclelist.cpp

@@ -4,7 +4,6 @@
 
 #include "ai_vehiclelist.hpp"
 #include "ai_station.hpp"
-#include "../../openttd.h"
 #include "../../company_func.h"
 #include "../../vehicle_base.h"
 

src/aircraft_cmd.cpp

@@ -4,22 +4,14 @@
  * This file deals with aircraft and airport movements functionalities */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "aircraft.h"
 #include "debug.h"
 #include "landscape.h"
-#include "station_map.h"
-#include "timetable.h"
-#include "depot_func.h"
 #include "news_func.h"
-#include "airport.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
-#include "newgrf_callbacks.h"
-#include "newgrf_text.h"
 #include "newgrf_sound.h"
 #include "spritecache.h"
-#include "cargotype.h"
 #include "strings_func.h"
 #include "command_func.h"
 #include "window_func.h"
@@ -28,15 +20,14 @@
 #include "sound_func.h"
 #include "functions.h"
 #include "variables.h"
-#include "cheat_func.h"
+#include "cheat_type.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "gfx_func.h"
 #include "ai/ai.hpp"
 #include "company_func.h"
-#include "settings_type.h"
-#include "order_func.h"
 #include "effectvehicle_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/aircraft_gui.cpp

@@ -3,16 +3,12 @@
 /** @file aircraft_gui.cpp The GUI of aircraft. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "aircraft.h"
-#include "debug.h"
-#include "gui.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "gfx_func.h"
-#include "order_func.h"
 #include "window_gui.h"
 
 #include "table/sprites.h"

src/airport.cpp

@@ -3,7 +3,6 @@
 /** @file airport.cpp Functions related to airports. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "debug.h"
 #include "airport.h"
 #include "airport_movement.h"

src/airport_gui.cpp

@@ -3,12 +3,9 @@
 /** @file airport_gui.cpp The GUI for airports. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "window_gui.h"
-#include "gui.h"
 #include "station_gui.h"
 #include "terraform_gui.h"
-#include "command_func.h"
 #include "airport.h"
 #include "sound_func.h"
 #include "window_func.h"
@@ -17,7 +14,6 @@
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
-#include "order_func.h"
 #include "station_type.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"

src/animated_tile.cpp

@@ -3,8 +3,6 @@
 /** @file animated_tile.cpp Everything related to animated tiles. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "landscape.h"
 #include "core/alloc_func.hpp"
 #include "functions.h"
 

src/articulated_vehicles.cpp

@@ -3,11 +3,8 @@
 /** @file articulated_vehicles.cpp Implementation of articulated vehicles. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "articulated_vehicles.h"
 #include "train.h"
 #include "roadveh.h"
-#include "newgrf_callbacks.h"
 #include "newgrf_engine.h"
 #include "vehicle_func.h"
 

src/autoreplace.cpp

@@ -3,8 +3,6 @@
 /** @file autoreplace.cpp Management of replacement lists. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
 #include "command_func.h"
 #include "group.h"
 #include "autoreplace_base.h"

src/autoreplace_cmd.cpp

@@ -3,13 +3,9 @@
 /** @file autoreplace_cmd.cpp Deals with autoreplace execution but not the setup */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "company_func.h"
-#include "debug.h"
 #include "vehicle_gui.h"
 #include "train.h"
-#include "aircraft.h"
-#include "roadveh.h"
 #include "rail.h"
 #include "command_func.h"
 #include "engine_base.h"

src/autoreplace_gui.cpp

@@ -3,29 +3,21 @@
 /** @file autoreplace_gui.cpp GUI for autoreplace handling. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
-#include "gui.h"
 #include "command_func.h"
-#include "variables.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "group.h"
 #include "rail.h"
 #include "strings_func.h"
 #include "window_func.h"
-#include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_type.h"
-#include "widgets/dropdown_func.h"
-#include "engine_func.h"
 #include "engine_base.h"
 #include "window_gui.h"
 #include "engine_gui.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 void DrawEngineList(VehicleType type, int x, int r, int y, const GUIEngineList *eng_list, uint16 min, uint16 max, EngineID selected_id, int count_location, GroupID selected_group);

src/aystar.cpp

@@ -19,7 +19,6 @@
  */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "aystar.h"
 #include "core/alloc_func.hpp"
 

src/blitter/32bpp_anim.cpp

@@ -6,8 +6,6 @@
 #include "../core/alloc_func.hpp"
 #include "../core/math_func.hpp"
 #include "../gfx_func.h"
-#include "../zoom_func.h"
-#include "../debug.h"
 #include "../video/video_driver.hpp"
 #include "32bpp_anim.hpp"
 

src/blitter/32bpp_optimized.cpp

@@ -5,7 +5,6 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../gfx_func.h"
-#include "../debug.h"
 #include "../core/math_func.hpp"
 #include "../core/alloc_func.hpp"
 #include "32bpp_optimized.hpp"

src/blitter/32bpp_simple.cpp

@@ -5,7 +5,6 @@
 #include "../stdafx.h"
 #include "../gfx_func.h"
 #include "../zoom_func.h"
-#include "../debug.h"
 #include "32bpp_simple.hpp"
 
 #include "../table/sprites.h"

src/blitter/8bpp_optimized.cpp

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

src/bridge_gui.cpp

@@ -3,18 +3,15 @@
 /** @file bridge_gui.cpp Graphical user interface for bridge construction */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "command_func.h"
 #include "economy_func.h"
-#include "variables.h"
 #include "bridge.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "sound_func.h"
 #include "map_func.h"
-#include "viewport_func.h"
 #include "gfx_func.h"
 #include "tunnelbridge.h"
 #include "sortlist_type.h"

src/bridge_map.cpp

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

src/build_vehicle_gui.cpp

@@ -2,34 +2,26 @@
 
 /** @file build_vehicle_gui.cpp GUI for building vehicles. */
 
-#include "stdafx.h"
-#include "openttd.h"
 #include "train.h"
 #include "roadveh.h"
 #include "ship.h"
 #include "aircraft.h"
-#include "debug.h"
-#include "gui.h"
 #include "articulated_vehicles.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "company_func.h"
-#include "airport.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
-#include "cargotype.h"
 #include "group.h"
-#include "road_map.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
-#include "settings_type.h"
 #include "gfx_func.h"
 #include "widgets/dropdown_func.h"
-#include "string_func.h"
 #include "window_gui.h"
 #include "engine_gui.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/callback_table.cpp

@@ -3,8 +3,8 @@
 /** @file callback_table.cpp All command callbacks. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "callback_table.h"
+#include "command_type.h"
 
 /* If you add a callback for DoCommandP, also add the callback in here
  *   see below for the full list!

src/cargopacket.cpp

@@ -4,7 +4,6 @@
 
 #include "stdafx.h"
 #include "station_base.h"
-#include "cargopacket.h"
 #include "oldpool_func.h"
 
 /* Initialize the cargopacket-pool */

src/cargotype.cpp

@@ -3,7 +3,6 @@
 /** @file cargotype.cpp Implementation of cargos. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "newgrf_cargo.h"
 #include "cargotype.h"
 #include "core/bitmath_func.hpp"

src/cheat_gui.cpp

@@ -3,9 +3,8 @@
 /** @file cheat_gui.cpp GUI related to cheating. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "command_func.h"
-#include "cheat_func.h"
+#include "cheat_type.h"
 #include "company_base.h"
 #include "company_func.h"
 #include "gfx_func.h"

src/clear_cmd.cpp

@@ -6,19 +6,15 @@
 #include "openttd.h"
 #include "clear_map.h"
 #include "command_func.h"
-#include "bridge.h"
 #include "landscape.h"
 #include "variables.h"
-#include "unmovable_map.h"
 #include "genworld.h"
 #include "industry.h"
-#include "water_map.h"
-#include "tile_cmd.h"
 #include "functions.h"
 #include "economy_func.h"
 #include "viewport_func.h"
-#include "settings_type.h"
 #include "water.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/command.cpp

@@ -9,7 +9,6 @@
 #include "gui.h"
 #include "command_func.h"
 #include "network/network.h"
-#include "variables.h"
 #include "genworld.h"
 #include "newgrf_storage.h"
 #include "strings_func.h"

src/company_cmd.cpp

@@ -4,7 +4,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "engine_func.h"
 #include "engine_base.h"
 #include "company_func.h"
 #include "company_gui.h"
@@ -22,23 +21,18 @@
 #include "tile_map.h"
 #include "strings_func.h"
 #include "gfx_func.h"
-#include "functions.h"
 #include "date_func.h"
-#include "vehicle_func.h"
 #include "sound_func.h"
 #include "core/alloc_func.hpp"
-#include "core/sort_func.hpp"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
 #include "road_func.h"
 #include "rail.h"
 #include "sprite.h"
-#include "debug.h"
 #include "oldpool_func.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 CompanyByte _local_company;
 CompanyByte _current_company;

src/company_gui.cpp

@@ -9,29 +9,22 @@
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
-#include "company_base.h"
 #include "command_func.h"
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "network/network_func.h"
-#include "variables.h"
 #include "roadveh.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf.h"
 #include "company_manager_face.h"
 #include "strings_func.h"
-#include "functions.h"
-#include "window_func.h"
 #include "date_func.h"
 #include "string_func.h"
-#include "settings_type.h"
-#include "widgets/dropdown_func.h"
 #include "widgets/dropdown_type.h"
 #include "tilehighlight_func.h"
-#include "highscore.h"
+#include "settings_type.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 enum {

src/console.cpp

@@ -4,18 +4,14 @@
 
 #include "stdafx.h"
 #include "core/alloc_func.hpp"
-#include "string_func.h"
-#include "strings_type.h"
 #include "core/math_func.hpp"
+#include "string_func.h"
 #include "console_internal.h"
 #include "network/network.h"
 #include "network/network_func.h"
-#include "rev.h"
 
 #include <stdarg.h>
 
-#include "table/strings.h"
-
 #define ICON_BUFFER 79
 #define ICON_HISTORY_SIZE 20
 #define ICON_LINE_HEIGHT 12

src/console_cmds.cpp

@@ -22,7 +22,6 @@
 #include "strings_func.h"
 #include "viewport_func.h"
 #include "window_func.h"
-#include "functions.h"
 #include "map_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"

src/console_gui.cpp

@@ -3,12 +3,9 @@
 /** @file console_gui.cpp Handling the GUI of the in-game console. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "textbuf_gui.h"
 #include "window_gui.h"
 #include "console_gui.h"
-#include <stdarg.h>
-#include <string.h>
 #include "console_internal.h"
 #include "window_func.h"
 #include "string_func.h"

src/core/bitmath_func.cpp

@@ -6,14 +6,14 @@
 #include "bitmath_func.hpp"
 
 const uint8 _ffb_64[64] = {
- 0,  0,  1,  0,  2,  0,  1,  0,
- 3,  0,  1,  0,  2,  0,  1,  0,
- 4,  0,  1,  0,  2,  0,  1,  0,
- 3,  0,  1,  0,  2,  0,  1,  0,
- 5,  0,  1,  0,  2,  0,  1,  0,
- 3,  0,  1,  0,  2,  0,  1,  0,
- 4,  0,  1,  0,  2,  0,  1,  0,
- 3,  0,  1,  0,  2,  0,  1,  0,
+	0,  0,  1,  0,  2,  0,  1,  0,
+	3,  0,  1,  0,  2,  0,  1,  0,
+	4,  0,  1,  0,  2,  0,  1,  0,
+	3,  0,  1,  0,  2,  0,  1,  0,
+	5,  0,  1,  0,  2,  0,  1,  0,
+	3,  0,  1,  0,  2,  0,  1,  0,
+	4,  0,  1,  0,  2,  0,  1,  0,
+	3,  0,  1,  0,  2,  0,  1,  0,
 };
 
 /**

src/currency.cpp

@@ -3,7 +3,6 @@
 /** @file currency.cpp Support for different currencies. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "currency.h"
 #include "news_func.h"
 #include "settings_type.h"

src/debug.cpp

@@ -5,7 +5,6 @@
 #include "stdafx.h"
 #include <stdio.h>
 #include <stdarg.h>
-#include "openttd.h"
 #include "console_func.h"
 #include "debug.h"
 #include "string_func.h"

src/dedicated.cpp

@@ -8,10 +8,8 @@
 
 #if defined(UNIX) && !defined(__MORPHOS__)
 
-#include "openttd.h"
 #include "variables.h"
 
-#include <sys/types.h>
 #include <unistd.h>
 
 #if defined(SUNOS) && !defined(_LP64) && !defined(_I32LPx)

src/depot.cpp

@@ -4,13 +4,10 @@
 
 #include "stdafx.h"
 #include "depot_base.h"
-#include "landscape.h"
 #include "order_func.h"
 #include "window_func.h"
 #include "oldpool_func.h"
 
-#include "table/strings.h"
-
 DEFINE_OLD_POOL_GENERIC(Depot, Depot)
 
 /**

src/depot_gui.cpp

@@ -2,10 +2,7 @@
 
 /** @file depot_gui.cpp The GUI for depots. */
 
-#include "stdafx.h"
-#include "openttd.h"
 #include "train.h"
-#include "roadveh.h"
 #include "ship.h"
 #include "aircraft.h"
 #include "gui.h"
@@ -15,14 +12,12 @@
 #include "command_func.h"
 #include "depot_base.h"
 #include "vehicle_gui.h"
-#include "station_map.h"
 #include "newgrf_engine.h"
 #include "spritecache.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
-#include "order_func.h"
 #include "tilehighlight_func.h"
 #include "window_gui.h"
 #include "vehiclelist.h"

src/disaster_cmd.cpp

@@ -17,27 +17,19 @@
 
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "landscape.h"
 
 #include "industry_map.h"
 #include "station_map.h"
 #include "command_func.h"
-#include "tile_cmd.h"
 #include "news_func.h"
-#include "station_base.h"
-#include "waypoint.h"
 #include "town.h"
-#include "industry.h"
 #include "company_func.h"
-#include "airport.h"
 #include "variables.h"
-#include "settings_type.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "functions.h"
 #include "vehicle_func.h"
-#include "vehicle_base.h"
 #include "sound_func.h"
 #include "effectvehicle_func.h"
 #include "roadveh.h"

src/dock_gui.cpp

@@ -6,12 +6,10 @@
 #include "openttd.h"
 #include "tile_map.h"
 #include "station_type.h"
-#include "gui.h"
 #include "terraform_gui.h"
 #include "window_gui.h"
 #include "station_gui.h"
 #include "command_func.h"
-#include "settings_type.h"
 #include "water.h"
 #include "window_func.h"
 #include "vehicle_func.h"
@@ -22,6 +20,7 @@
 #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/driver.cpp

@@ -3,10 +3,7 @@
 /** @file driver.cpp Base for all driver handling. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "debug.h"
-#include "driver.h"
-
 #include "sound/sound_driver.hpp"
 #include "music/music_driver.hpp"
 #include "video/video_driver.hpp"

src/driver.h

@@ -5,7 +5,6 @@
 #ifndef DRIVER_H
 #define DRIVER_H
 
-#include "debug.h"
 #include "core/enum_type.hpp"
 #include "string_func.h"
 #include <map>

src/dummy_land.cpp

@@ -3,7 +3,6 @@
 /** @file dummy_land.cpp Handling of void (or dummy) tiles. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "tile_cmd.h"
 #include "command_func.h"
 #include "viewport_func.h"

src/economy.cpp

@@ -4,49 +4,34 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "currency.h"
-#include "landscape.h"
-#include "company_base.h"
+#include "tile_cmd.h"
 #include "company_func.h"
 #include "command_func.h"
-#include "industry.h"
 #include "industry_map.h"
 #include "town.h"
 #include "news_func.h"
 #include "network/network.h"
 #include "network/network_func.h"
-#include "variables.h"
 #include "vehicle_gui.h"
 #include "ai/ai.hpp"
-#include "train.h"
-#include "roadveh.h"
 #include "aircraft.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
-#include "newgrf_callbacks.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_station.h"
 #include "unmovable.h"
-#include "cargotype.h"
 #include "group.h"
 #include "strings_func.h"
-#include "tile_cmd.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "track_type.h"
-#include "track_func.h"
-#include "road_func.h"
-#include "rail_map.h"
-#include "signal_func.h"
 #include "gfx_func.h"
 #include "autoreplace_func.h"
 #include "company_gui.h"
 #include "signs_base.h"
-#include "core/smallvec_type.hpp"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/effectvehicle.cpp

@@ -3,54 +3,15 @@
 /** @file effectvehicle.cpp Implementation of everything generic to vehicles. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "road_map.h"
-#include "roadveh.h"
-#include "ship.h"
-#include "spritecache.h"
-#include "tile_cmd.h"
 #include "landscape.h"
-#include "timetable.h"
-#include "viewport_func.h"
-#include "gfx_func.h"
-#include "news_func.h"
-#include "command_func.h"
-#include "company_func.h"
-#include "debug.h"
-#include "vehicle_gui.h"
-#include "rail_type.h"
-#include "train.h"
-#include "aircraft.h"
 #include "industry_map.h"
-#include "station_map.h"
-#include "water_map.h"
-#include "yapf/yapf.h"
-#include "newgrf_callbacks.h"
-#include "newgrf_engine.h"
-#include "newgrf_sound.h"
-#include "group.h"
-#include "order_func.h"
-#include "strings_func.h"
-#include "zoom_func.h"
-#include "functions.h"
-#include "date_func.h"
-#include "window_func.h"
 #include "vehicle_func.h"
-#include "signal_func.h"
 #include "sound_func.h"
-#include "variables.h"
-#include "autoreplace_func.h"
-#include "autoreplace_gui.h"
-#include "string_func.h"
-#include "settings_type.h"
-#include "oldpool_func.h"
-#include "depot_map.h"
 #include "animated_tile_func.h"
 #include "effectvehicle_base.h"
 #include "effectvehicle_func.h"
 
 #include "table/sprites.h"
-#include "table/strings.h"
 
 static void ChimneySmokeInit(Vehicle *v)
 {

src/elrail.cpp

@@ -50,23 +50,12 @@
 #include "openttd.h"
 #include "station_map.h"
 #include "viewport_func.h"
-#include "settings_type.h"
 #include "landscape.h"
-#include "rail_type.h"
-#include "debug.h"
-#include "tunnel_map.h"
-#include "road_map.h"
-#include "bridge_map.h"
-#include "bridge.h"
-#include "rail_map.h"
 #include "train.h"
 #include "rail_gui.h"
-#include "transparency.h"
 #include "tunnelbridge_map.h"
 #include "vehicle_func.h"
-#include "company_base.h"
 #include "tunnelbridge.h"
-#include "engine_func.h"
 #include "elrail_func.h"
 #include "engine_base.h"
 

src/engine.cpp

@@ -3,30 +3,25 @@
 /** @file engine.cpp Base for all engine handling. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "debug.h"
-#include "company_base.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "variables.h"
-#include "train.h"
 #include "aircraft.h"
-#include "newgrf_cargo.h"
 #include "newgrf_engine.h"
 #include "group.h"
 #include "strings_func.h"
 #include "gfx_func.h"
-#include "functions.h"
+#include "core/random_func.hpp"
 #include "window_func.h"
 #include "date_func.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
-#include "settings_type.h"
 #include "oldpool_func.h"
 #include "ai/ai.hpp"
-#include "core/alloc_func.hpp"
 #include "vehicle_func.h"
+#include "settings_type.h"
 
 #include "table/strings.h"
 #include "table/engines.h"

src/engine_gui.cpp

@@ -3,16 +3,12 @@
 /** @file engine_gui.cpp GUI to show engine related information. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "gui.h"
 #include "window_gui.h"
 #include "gfx_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
 #include "command_func.h"
-#include "economy_func.h"
-#include "news_func.h"
-#include "variables.h"
+#include "news_type.h"
 #include "newgrf_engine.h"
 #include "strings_func.h"
 #include "engine_gui.h"

src/fileio.cpp

@@ -3,20 +3,16 @@
 /** @file fileio.cpp Standard In/Out file operations */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "fileio_func.h"
 #include "variables.h"
 #include "debug.h"
 #include "fios.h"
-#include "core/alloc_func.hpp"
-#include "core/math_func.hpp"
 #include "string_func.h"
 #include "tar_type.h"
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <pwd.h>
-#include <unistd.h>
 #endif
 #include <sys/stat.h>
 #include <algorithm>

src/fios.cpp

@@ -6,13 +6,9 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "variables.h"
-#include "heightmap.h"
 #include "fios.h"
 #include "fileio_func.h"
-#include "functions.h"
 #include "string_func.h"
-#include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef WIN32

src/fontcache.cpp

@@ -3,11 +3,8 @@
 /** @file fontcache.cpp Cache for characters from fonts. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
 #include "spritecache.h"
 #include "fontcache.h"
-#include "spriteloader/spriteloader.hpp"
 #include "blitter/factory.hpp"
 #include "gfx_func.h"
 #include "core/alloc_func.hpp"

src/gamelog.cpp

@@ -6,20 +6,15 @@
 #include "openttd.h"
 #include "saveload/saveload.h"
 #include "core/alloc_func.hpp"
-#include "core/bitmath_func.hpp"
-#include "core/math_func.hpp"
-#include "network/core/config.h"
 #include "variables.h"
 #include "string_func.h"
 #include "settings_type.h"
-#include "newgrf_config.h"
 #include "gamelog.h"
 #include "gamelog_internal.h"
 #include "console_func.h"
 #include "debug.h"
 #include "rev.h"
 
-#include <string.h>
 #include <stdarg.h>
 
 extern const uint16 SAVEGAME_VERSION;  ///< current savegame version

src/genworld.cpp

@@ -13,22 +13,19 @@
 #include "gfxinit.h"
 #include "window_func.h"
 #include "network/network.h"
-#include "debug.h"
-#include "settings_func.h"
 #include "heightmap.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
-#include "map_func.h"
 #include "date_func.h"
 #include "core/random_func.hpp"
 #include "engine_func.h"
-#include "settings_type.h"
 #include "newgrf_storage.h"
 #include "water.h"
 #include "blitter/factory.hpp"
 #include "tilehighlight_func.h"
 #include "saveload/saveload.h"
 #include "void_map.h"
+#include "settings_type.h"
 
 #include "table/sprites.h"
 

src/genworld_gui.cpp

@@ -6,16 +6,11 @@
 #include "openttd.h"
 #include "heightmap.h"
 #include "gui.h"
-#include "window_gui.h"
-#include "textbuf_gui.h"
-#include "gfxinit.h"
-#include "command_func.h"
 #include "variables.h"
 #include "settings_func.h"
 #include "debug.h"
 #include "genworld.h"
 #include "network/network.h"
-#include "thread.h"
 #include "newgrf_config.h"
 #include "strings_func.h"
 #include "window_func.h"

src/gfx.cpp

@@ -3,19 +3,15 @@
 /** @file gfx.cpp Handling of drawing text and other gfx related stuff. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "gfx_func.h"
-#include "spritecache.h"
 #include "variables.h"
+#include "spritecache.h"
 #include "fontcache.h"
 #include "genworld.h"
-#include "debug.h"
 #include "zoom_func.h"
-#include "texteff.hpp"
 #include "blitter/factory.hpp"
 #include "video/video_driver.hpp"
 #include "strings_func.h"
-#include "core/math_func.hpp"
 #include "settings_type.h"
 #include "core/alloc_func.hpp"
 #include "core/sort_func.hpp"

src/gfxinit.cpp

@@ -3,21 +3,14 @@
 /** @file gfxinit.cpp Initializing of the (GRF) graphics. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "debug.h"
-#include "gfxinit.h"
 #include "spritecache.h"
 #include "fileio_func.h"
 #include "fios.h"
 #include "newgrf.h"
 #include "md5.h"
-#include "variables.h"
 #include "fontcache.h"
 #include "gfx_func.h"
-#include "core/alloc_func.hpp"
-#include "core/bitmath_func.hpp"
-#include "core/smallvec_type.hpp"
-#include <string.h>
 #include "settings_type.h"
 #include "string_func.h"
 #include "ini_type.h"

src/graph_gui.cpp

@@ -9,17 +9,14 @@
 #include "company_base.h"
 #include "company_gui.h"
 #include "economy_func.h"
-#include "variables.h"
 #include "cargotype.h"
 #include "strings_func.h"
-#include "core/alloc_func.hpp"
 #include "window_func.h"
 #include "date_func.h"
 #include "gfx_func.h"
 #include "sortlist_type.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 /* Bitmasks of company and cargo indices that shouldn't be drawn. */
 static uint _legend_excluded_companies;

src/group_cmd.cpp

@@ -3,23 +3,17 @@
 /** @file group_cmd.cpp Handling of the engine groups */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "variables.h"
 #include "command_func.h"
-#include "debug.h"
 #include "group.h"
 #include "train.h"
-#include "aircraft.h"
+#include "engine_base.h"
 #include "vehicle_gui.h"
-#include "strings_func.h"
-#include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_base.h"
 #include "autoreplace_func.h"
 #include "string_func.h"
 #include "company_func.h"
-#include "order_func.h"
 #include "oldpool_func.h"
 #include "core/alloc_func.hpp"
 

src/group_gui.cpp

@@ -4,22 +4,17 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "vehicle_gui_base.h"
-#include "train.h"
+#include "vehicle_base.h"
 #include "group.h"
-#include "debug.h"
 #include "strings_func.h"
-#include "core/alloc_func.hpp"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_gui.h"
-#include "string_func.h"
-#include "viewport_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_type.h"

src/heightmap.cpp

@@ -3,17 +3,13 @@
 /** @file heightmap.cpp Creating of maps from heightmaps. */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "variables.h"
 #include "heightmap.h"
 #include "clear_map.h"
 #include "void_map.h"
-#include "debug.h"
 #include "gui.h"
 #include "saveload/saveload.h"
 #include "bmp.h"
 #include "gfx_func.h"
-#include "core/alloc_func.hpp"
 #include "fios.h"
 #include "settings_type.h"
 

src/highscore.cpp

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

src/highscore_gui.cpp

@@ -10,7 +10,6 @@
 #include "window_func.h"
 #include "network/network.h"
 #include "command_func.h"
-#include "command_type.h"
 #include "company_func.h"
 #include "company_base.h"
 #include "settings_type.h"