(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers

src/ai/ai_core.cpp

@@ -14,7 +14,6 @@
 #include "../core/bitmath_func.hpp"
 #include "../company_base.h"
 #include "../company_func.h"
-#include "../debug.h"
 #include "../network/network.h"
 #include "../window_func.h"
 #include "../command_func.h"

src/ai/ai_gui.cpp

@@ -13,7 +13,6 @@
 #include "../openttd.h"
 #include "../table/sprites.h"
 #include "../gui.h"
-#include "../window_gui.h"
 #include "../querystring_gui.h"
 #include "../company_func.h"
 #include "../company_base.h"
@@ -23,7 +22,6 @@
 #include "../gfx_func.h"
 #include "../command_func.h"
 #include "../network/network.h"
-#include "../textbuf_gui.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
 #include "../core/backup_type.hpp"

src/ai/ai_info.cpp

@@ -11,8 +11,6 @@
 
 #include "../stdafx.h"
 
-#include <squirrel.h>
-#include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"

src/ai/ai_instance.cpp

@@ -14,9 +14,6 @@
 #include "../saveload/saveload.h"
 #include "../gui.h"
 
-#include <squirrel.h>
-#include "../script/squirrel.hpp"
-#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 
 #include "ai_config.hpp"

src/ai/ai_scanner.cpp

@@ -15,9 +15,6 @@
 #include "../network/network.h"
 #include "../core/random_func.hpp"
 
-#include <squirrel.h>
-#include "../script/squirrel.hpp"
-#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"

src/ai/api/ai_basestation.cpp

@@ -11,7 +11,6 @@
 
 #include "ai_basestation.hpp"
 #include "../../station_base.h"
-#include "../../command_func.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"

src/ai/api/ai_gamesettings.cpp

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

src/ai/api/ai_industrytype.cpp

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

src/ai/api/ai_marine.cpp

@@ -13,7 +13,6 @@
 #include "ai_station.hpp"
 #include "../../station_base.h"
 #include "../../tile_cmd.h"
-#include "../../economy_func.h"
 
 
 /* static */ bool AIMarine::IsWaterDepotTile(TileIndex tile)

src/ai/api/ai_object.cpp

@@ -10,7 +10,6 @@
 /** @file ai_object.cpp Implementation of AIObject. */
 
 #include "../../stdafx.h"
-#include <squirrel.h>
 #include "../../script/squirrel.hpp"
 #include "../../company_base.h"
 

src/ai/api/ai_rail.cpp

@@ -13,14 +13,12 @@
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_industrytype.hpp"
-#include "../../command_type.h"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
-#include "../../economy_func.h"
 
 /* static */ bool AIRail::IsRailTile(TileIndex tile)
 {

src/ai/api/ai_road.cpp

@@ -13,7 +13,6 @@
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
 #include "../../station_base.h"
-#include "../../command_type.h"
 #include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
 

src/ai/api/ai_town.cpp

@@ -14,7 +14,6 @@
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
 #include "../../town.h"
-#include "../../town_type.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
 #include "../../station_base.h"

src/ai/api/ai_vehicle.cpp

@@ -15,14 +15,12 @@
 #include "ai_group.hpp"
 #include "../ai_instance.hpp"
 #include "../../company_func.h"
-#include "../../aircraft.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../command_func.h"
 #include "../../roadveh.h"
 #include "../../train.h"
 #include "../../vehicle_func.h"
-#include "../../engine_base.h"
 #include "table/strings.h"
 
 /* static */ bool AIVehicle::IsValidVehicle(VehicleID vehicle_id)

src/aircraft_cmd.cpp

@@ -14,7 +14,6 @@
 
 #include "stdafx.h"
 #include "aircraft.h"
-#include "debug.h"
 #include "landscape.h"
 #include "news_func.h"
 #include "vehicle_gui.h"
@@ -30,18 +29,15 @@
 #include "functions.h"
 #include "cheat_type.h"
 #include "company_base.h"
-#include "autoreplace_gui.h"
 #include "ai/ai.hpp"
 #include "company_func.h"
 #include "effectvehicle_func.h"
 #include "station_base.h"
 #include "engine_base.h"
-#include "engine_func.h"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 void Aircraft::UpdateDeltaXY(Direction direction)
 {

src/aircraft_gui.cpp

@@ -18,7 +18,6 @@
 #include "window_gui.h"
 #include "spritecache.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 /**

src/airport.cpp

@@ -10,13 +10,6 @@
 /** @file airport.cpp Functions related to airports. */
 
 #include "stdafx.h"
-#include "debug.h"
-#include "airport.h"
-#include "map_type.h"
-#include "core/alloc_func.hpp"
-#include "date_func.h"
-#include "settings_type.h"
-#include "newgrf_airport.h"
 #include "station_base.h"
 #include "table/strings.h"
 #include "table/airport_movement.h"

src/airport_gui.cpp

@@ -13,12 +13,10 @@
 #include "window_gui.h"
 #include "station_gui.h"
 #include "terraform_gui.h"
-#include "airport.h"
 #include "sound_func.h"
 #include "window_func.h"
 #include "strings_func.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "company_func.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
@@ -30,7 +28,6 @@
 #include "hotkeys.h"
 #include "sprite.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 static AirportClassID _selected_airport_class; ///< the currently visible airport class

src/articulated_vehicles.cpp

@@ -12,9 +12,7 @@
 #include "stdafx.h"
 #include "train.h"
 #include "roadveh.h"
-#include "newgrf_engine.h"
 #include "vehicle_func.h"
-#include "engine_base.h"
 #include "engine_func.h"
 
 #include "table/strings.h"

src/autoreplace_cmd.cpp

@@ -12,9 +12,7 @@
 #include "stdafx.h"
 #include "company_func.h"
 #include "train.h"
-#include "rail.h"
 #include "command_func.h"
-#include "engine_base.h"
 #include "engine_func.h"
 #include "vehicle_func.h"
 #include "functions.h"

src/bridge_gui.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "gui.h"
 #include "command_func.h"
-#include "economy_func.h"
 #include "bridge.h"
 #include "rail.h"
 #include "strings_func.h"

src/build_vehicle_gui.cpp

@@ -29,7 +29,6 @@
 #include "engine_gui.h"
 #include "cargotype.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 /**

src/command.cpp

@@ -23,7 +23,6 @@
 #include "functions.h"
 #include "town.h"
 #include "date_func.h"
-#include "debug.h"
 #include "company_func.h"
 #include "company_base.h"
 #include "signal_func.h"

src/company_cmd.cpp

@@ -25,7 +25,6 @@
 #include "company_manager_face.h"
 #include "window_func.h"
 #include "strings_func.h"
-#include "gfx_func.h"
 #include "date_func.h"
 #include "sound_func.h"
 #include "rail.h"

src/company_gui.cpp

@@ -19,7 +19,6 @@
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "network/network_func.h"
-#include "economy_func.h"
 #include "vehicle_func.h"
 #include "newgrf.h"
 #include "company_manager_face.h"
@@ -30,7 +29,8 @@
 #include "sprite.h"
 #include "company_base.h"
 #include "core/geometry_func.hpp"
-#include "object.h"
+#include "economy_func.h"
+#include "object_type.h"
 
 #include "table/strings.h"
 

src/console_cmds.cpp

@@ -30,7 +30,6 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
-#include "company_base.h"
 #include "gamelog.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"

src/date.cpp

@@ -17,7 +17,6 @@
 #include "settings_type.h"
 #include "date_func.h"
 #include "vehicle_base.h"
-#include "debug.h"
 #include "rail_gui.h"
 #include "saveload/saveload.h"
 

src/depot_gui.cpp

@@ -10,7 +10,6 @@
 /** @file depot_gui.cpp The GUI for depots. */
 
 #include "stdafx.h"
-#include "engine_base.h"
 #include "train.h"
 #include "ship.h"
 #include "aircraft.h"
@@ -21,7 +20,6 @@
 #include "command_func.h"
 #include "depot_base.h"
 #include "vehicle_gui.h"
-#include "newgrf_engine.h"
 #include "spritecache.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ -33,7 +31,6 @@
 #include "order_backup.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 /*
  * Since all depot window sizes aren't the same, we need to modify sizes a little.

src/disaster_cmd.cpp

@@ -25,7 +25,6 @@
 
 
 #include "stdafx.h"
-#include "landscape.h"
 
 #include "industry.h"
 #include "station_base.h"
@@ -46,7 +45,6 @@
 #include "core/backup_type.hpp"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 /** Delay counter for considering the next disaster. */
 uint16 _disaster_delay;

src/dock_gui.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "tile_map.h"
 #include "terraform_gui.h"
 #include "window_gui.h"
 #include "station_gui.h"

src/economy.cpp

@@ -22,7 +22,6 @@
 #include "aircraft.h"
 #include "train.h"
 #include "newgrf_cargo.h"
-#include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
@@ -46,11 +45,9 @@
 #include "economy_base.h"
 #include "core/pool_func.hpp"
 #include "newgrf.h"
-#include "engine_base.h"
 #include "core/backup_type.hpp"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 #include "table/pricebase.h"
 
 

src/elrail.cpp

@@ -57,18 +57,14 @@
 #include "stdafx.h"
 #include "station_map.h"
 #include "viewport_func.h"
-#include "landscape.h"
 #include "train.h"
 #include "rail_gui.h"
 #include "tunnelbridge_map.h"
 #include "tunnelbridge.h"
 #include "elrail_func.h"
-#include "engine_base.h"
 #include "company_base.h"
-#include "rail.h"
 #include "newgrf_railtype.h"
 
-#include "table/sprites.h"
 #include "table/elrail_data.h"
 
 static inline TLG GetTLG(TileIndex t)

src/fios.cpp

@@ -14,7 +14,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "core/sort_func.hpp"
 #include "fios.h"
 #include "fileio_func.h"
 #include "tar_type.h"

src/fios.h

@@ -12,13 +12,7 @@
 #ifndef FIOS_H
 #define FIOS_H
 
-#include "strings_type.h"
-#include "core/smallvec_type.hpp"
-#include "core/smallmap_type.hpp"
-#include "core/enum_type.hpp"
 #include "gfx_type.h"
-#include "date_type.h"
-#include "settings_type.h"
 #include "company_base.h"
 #include "newgrf_config.h"
 

src/gamelog.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "saveload/saveload.h"
-#include "core/alloc_func.hpp"
 #include "string_func.h"
 #include "settings_type.h"
 #include "gamelog_internal.h"

src/genworld.cpp

@@ -14,7 +14,6 @@
 #include "landscape.h"
 #include "company_func.h"
 #include "thread/thread.h"
-#include "command_func.h"
 #include "genworld.h"
 #include "gfxinit.h"
 #include "window_func.h"

src/genworld_gui.cpp

@@ -15,7 +15,6 @@
 #include "debug.h"
 #include "genworld.h"
 #include "network/network.h"
-#include "newgrf_config.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "date_func.h"

src/gfx.cpp

@@ -18,7 +18,6 @@
 #include "video/video_driver.hpp"
 #include "strings_func.h"
 #include "settings_type.h"
-#include "landscape_type.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "thread/thread.h"

src/gfxinit.cpp

@@ -15,7 +15,6 @@
 #include "3rdparty/md5/md5.h"
 #include "fontcache.h"
 #include "gfx_func.h"
-#include "settings_type.h"
 
 /* The type of set we're replacing */
 #define SET_TYPE "graphics"

src/ground_vehicle.cpp

@@ -12,8 +12,6 @@
 #include "stdafx.h"
 #include "train.h"
 #include "roadveh.h"
-#include "ground_vehicle.hpp"
-#include "window_type.h"
 #include "vehicle_gui.h"
 #include "window_func.h"
 

src/group_cmd.cpp

@@ -14,7 +14,6 @@
 #include "command_func.h"
 #include "group.h"
 #include "train.h"
-#include "engine_base.h"
 #include "vehicle_gui.h"
 #include "window_func.h"
 #include "vehicle_func.h"

src/group_gui.cpp

@@ -21,7 +21,6 @@
 #include "vehicle_func.h"
 #include "autoreplace_gui.h"
 #include "company_func.h"
-#include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "tilehighlight_func.h"
 #include "vehicle_gui_base.h"

src/hotkeys.cpp

@@ -14,9 +14,7 @@
 #include "hotkeys.h"
 #include "ini_type.h"
 #include "string_func.h"
-#include "gfx_type.h"
 #include "window_gui.h"
-#include <string.h>
 
 char *_hotkeys_file;
 

src/industry_cmd.cpp

@@ -14,7 +14,6 @@
 #include "industry.h"
 #include "station_base.h"
 #include "train.h"
-#include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
@@ -22,9 +21,7 @@
 #include "cheat_type.h"
 #include "genworld.h"
 #include "tree_map.h"
-#include "newgrf.h"
 #include "newgrf_cargo.h"
-#include "newgrf_commons.h"
 #include "newgrf_debug.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"

src/industry_gui.cpp

@@ -21,7 +21,6 @@
 #include "industry.h"
 #include "town.h"
 #include "cheat_type.h"
-#include "newgrf.h"
 #include "newgrf_industries.h"
 #include "newgrf_text.h"
 #include "newgrf_debug.h"

src/intro_gui.cpp

@@ -20,7 +20,6 @@
 #include "network/network_content.h"
 #include "landscape_type.h"
 #include "strings_func.h"
-#include "window_func.h"
 #include "fios.h"
 #include "functions.h"
 #include "ai/ai_gui.hpp"

src/map.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "debug.h"
 #include "core/alloc_func.hpp"
-#include "core/math_func.hpp"
 #include "tile_map.h"
 
 #if defined(_MSC_VER)

src/misc/binaryheap.hpp

@@ -12,6 +12,8 @@
 #ifndef  BINARYHEAP_HPP
 #define  BINARYHEAP_HPP
 
+#include "../core/alloc_func.hpp"
+
 /* Enable it if you suspect binary heap doesn't work well */
 #define BINARYHEAP_CHECK 0
 

src/misc/hashtable.hpp

@@ -12,6 +12,8 @@
 #ifndef  HASHTABLE_HPP
 #define  HASHTABLE_HPP
 
+#include "../core/math_func.hpp"
+
 template <class Titem_>
 struct CHashTableSlotT
 {

src/misc_gui.cpp

@@ -10,7 +10,6 @@
 /** @file misc_gui.cpp GUIs for a number of misc windows. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "debug.h"
 #include "landscape.h"
 #include "newgrf_text.h"

src/network/core/tcp_http.cpp

@@ -18,7 +18,6 @@
 #include "../../rev.h"
 #include "../network_func.h"
 
-#include "tcp.h"
 #include "tcp_http.h"
 
 /** List of open HTTP connections. */

src/network/core/tcp_http.h

@@ -14,7 +14,7 @@
 #ifndef NETWORK_CORE_TCP_HTTP_H
 #define NETWORK_CORE_TCP_HTTP_H
 
-#include "address.h"
+#include "tcp.h"
 
 #ifdef ENABLE_NETWORK
 

src/network/network_gui.cpp

@@ -26,7 +26,6 @@
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
 #include "../sortlist_type.h"
-#include "../company_base.h"
 #include "../company_func.h"
 #include "../core/geometry_func.hpp"
 

src/newgrf.cpp

@@ -29,23 +29,19 @@
 #include "newgrf_house.h"
 #include "newgrf_sound.h"
 #include "newgrf_station.h"
-#include "industry.h"
+#include "industrytype.h"
 #include "newgrf_canal.h"
-#include "newgrf_commons.h"
 #include "newgrf_townname.h"
 #include "newgrf_industries.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_airport.h"
 #include "rev.h"
 #include "fios.h"
-#include "rail.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "string_func.h"
 #include "network/network.h"
 #include <map>
-#include "core/alloc_type.hpp"
-#include "core/mem_func.hpp"
 #include "smallmap_gui.h"
 #include "genworld.h"
 #include "gui.h"

src/newgrf_airport.cpp

@@ -11,17 +11,11 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "airport.h"
-#include "newgrf_airport.h"
 #include "date_func.h"
-#include "settings_type.h"
-#include "core/alloc_type.hpp"
 #include "newgrf.h"
-#include "newgrf_commons.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_text.h"
 #include "station_base.h"
-#include "table/strings.h"
 #include "newgrf_class_func.h"
 
 /**

src/newgrf_airport.h

@@ -12,6 +12,7 @@
 #ifndef NEWGRF_AIRPORT_H
 #define NEWGRF_AIRPORT_H
 
+#include "airport.h"
 #include "date_type.h"
 #include "map_type.h"
 #include "newgrf_class.h"

src/newgrf_airporttiles.cpp

@@ -11,23 +11,18 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "airport.h"
 #include "newgrf.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_sound.h"
-#include "animated_tile_func.h"
 #include "station_base.h"
 #include "water.h"
 #include "viewport_func.h"
 #include "landscape.h"
 #include "company_base.h"
 #include "town.h"
-#include "functions.h"
-#include "core/random_func.hpp"
 #include "table/strings.h"
 #include "table/airporttiles.h"
-#include "date_func.h"
 #include "newgrf_animation_base.h"
 
 

src/newgrf_animation_base.h

@@ -11,6 +11,13 @@
 
 /* No inclusion guards as this file must only be included from .cpp files. */
 
+#include "animated_tile_func.h"
+#include "core/random_func.hpp"
+#include "date_func.h"
+#include "functions.h"
+#include "newgrf_animation_type.h"
+#include "newgrf_callbacks.h"
+
 /**
  * Helper class for a unified approach to NewGRF animation.
  * @tparam Tbase       Instantiation of this class.

src/newgrf_canal.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "newgrf_commons.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_canal.h"
 #include "water_map.h"

src/newgrf_class_func.h

@@ -9,8 +9,6 @@
 
 /** @file newgrf_class_func.h Implementation of the NewGRF class' functions. */
 
-#include "stdafx.h"
-#include "core/alloc_func.hpp"
 #include "newgrf_class.h"
 
 #include "table/strings.h"

src/newgrf_commons.cpp

@@ -17,7 +17,6 @@
 #include "house.h"
 #include "industrytype.h"
 #include "newgrf.h"
-#include "newgrf_commons.h"
 #include "clear_map.h"
 #include "station_map.h"
 #include "tree_map.h"

src/newgrf_commons.h

@@ -15,7 +15,7 @@
 #ifndef NEWGRF_COMMONS_H
 #define NEWGRF_COMMONS_H
 
-#include "tile_cmd.h"
+#include "tile_type.h"
 
 /** Contextx for tile accesses */
 enum TileContext {

src/newgrf_config.cpp

@@ -13,7 +13,6 @@
 #include "debug.h"
 #include "3rdparty/md5/md5.h"
 #include "newgrf.h"
-#include "gamelog.h"
 #include "network/network_func.h"
 #include "gfx_func.h"
 #include "newgrf_text.h"

src/newgrf_debug_gui.cpp

@@ -14,17 +14,13 @@
 #include "window_gui.h"
 #include "window_func.h"
 #include "fileio_func.h"
-#include "gfx_func.h"
 #include "spritecache.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "textbuf_gui.h"
-#include "tunnelbridge_map.h"
 
 #include "engine_base.h"
-#include "house.h"
 #include "industry.h"
-#include "rail.h"
 #include "station_base.h"
 #include "town.h"
 #include "vehicle_base.h"

src/newgrf_engine.cpp

@@ -16,15 +16,12 @@
 #include "company_func.h"
 #include "newgrf.h"
 #include "newgrf_cargo.h"
-#include "newgrf_engine.h"
 #include "newgrf_spritegroup.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "core/random_func.hpp"
 #include "aircraft.h"
-#include "core/smallmap_type.hpp"
 #include "station_base.h"
-#include "engine_base.h"
 #include "company_base.h"
 #include "newgrf_railtype.h"
 

src/newgrf_house.cpp

@@ -18,16 +18,11 @@
 #include "newgrf_spritegroup.h"
 #include "newgrf_town.h"
 #include "newgrf_sound.h"
-#include "newgrf_commons.h"
-#include "functions.h"
 #include "company_func.h"
-#include "animated_tile_func.h"
 #include "company_base.h"
 #include "town.h"
-#include "core/random_func.hpp"
 #include "sprite.h"
 #include "genworld.h"
-#include "date_func.h"
 #include "newgrf_animation_base.h"
 
 static BuildingCounts<uint32> _building_counts;

src/newgrf_industries.cpp

@@ -14,7 +14,6 @@
 #include "industry.h"
 #include "newgrf.h"
 #include "newgrf_industries.h"
-#include "newgrf_commons.h"
 #include "newgrf_text.h"
 #include "newgrf_town.h"
 #include "newgrf_cargo.h"

src/newgrf_industries.h

@@ -13,6 +13,7 @@
 #define NEWGRF_INDUSTRIES_H
 
 #include "command_type.h"
+#include "company_type.h"
 #include "newgrf_spritegroup.h"
 
 /** When should the industry(tile) be triggered for random bits? */

src/newgrf_industrytiles.cpp

@@ -14,19 +14,15 @@
 #include "viewport_func.h"
 #include "landscape.h"
 #include "newgrf.h"
-#include "newgrf_commons.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
 #include "industry.h"
-#include "functions.h"
 #include "town.h"
 #include "command_func.h"
-#include "animated_tile_func.h"
 #include "water.h"
 #include "sprite.h"
-#include "date_func.h"
 #include "newgrf_animation_base.h"
 
 #include "table/strings.h"

src/newgrf_railtype.cpp

@@ -10,20 +10,11 @@
 /** @file newgrf_railtype.cpp NewGRF handling of rail types. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "debug.h"
-#include "strings_type.h"
-#include "rail.h"
-#include "road_map.h"
 #include "newgrf.h"
-#include "newgrf_callbacks.h"
-#include "newgrf_commons.h"
-#include "newgrf_railtype.h"
 #include "newgrf_spritegroup.h"
-#include "core/bitmath_func.hpp"
 #include "date_func.h"
 #include "depot_base.h"
-#include "rail_map.h"
 
 static uint32 RailTypeGetRandomBits(const ResolverObject *object)
 {

src/newgrf_spritegroup.cpp

@@ -13,7 +13,6 @@
 #include "newgrf.h"
 #include "newgrf_spritegroup.h"
 #include "sprite.h"
-#include "core/bitmath_func.hpp"
 #include "core/pool_func.hpp"
 
 SpriteGroupPool _spritegroup_pool("SpriteGroup");

src/newgrf_spritegroup.h

@@ -15,7 +15,6 @@
 #include "town_type.h"
 #include "gfx_type.h"
 #include "engine_type.h"
-#include "tile_type.h"
 #include "core/pool_type.hpp"
 #include "house_type.h"
 

src/newgrf_station.cpp

@@ -15,24 +15,18 @@
 #include "waypoint_base.h"
 #include "roadstop_base.h"
 #include "newgrf_cargo.h"
-#include "newgrf_commons.h"
 #include "newgrf_station.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_sound.h"
 #include "newgrf_railtype.h"
 #include "town.h"
 #include "newgrf_town.h"
-#include "date_func.h"
 #include "company_func.h"
-#include "animated_tile_func.h"
-#include "functions.h"
 #include "tunnelbridge_map.h"
 #include "newgrf.h"
-#include "core/random_func.hpp"
 #include "newgrf_animation_base.h"
 #include "newgrf_class_func.h"
 
-#include "table/strings.h"
 
 template <typename Tspec, typename Tid, Tid Tmax>
 /* static */ void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults()

src/object_cmd.cpp

@@ -18,10 +18,8 @@
 #include "bridge_map.h"
 #include "genworld.h"
 #include "autoslope.h"
-#include "transparency.h"
 #include "functions.h"
 #include "window_func.h"
-#include "vehicle_func.h"
 #include "company_gui.h"
 #include "cheat_type.h"
 #include "landscape_type.h"
@@ -35,7 +33,6 @@
 #include "date_func.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 #include "table/object_land.h"
 
 ObjectPool _object_pool("Object");

src/object_map.h

@@ -12,7 +12,6 @@
 #ifndef OBJECT_MAP_H
 #define OBJECT_MAP_H
 
-#include "tile_map.h"
 #include "water_map.h"
 #include "object_type.h"
 

src/openttd.cpp

@@ -23,7 +23,6 @@
 
 #include "base_media_base.h"
 #include "saveload/saveload.h"
-#include "landscape.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
@@ -55,15 +54,12 @@
 #include "thread/thread.h"
 #include "station_base.h"
 #include "crashlog.h"
-#include "company_base.h"
-#include "engine_base.h"
 #include "engine_func.h"
 #include "core/random_func.hpp"
 #include "rail_gui.h"
 #include "core/backup_type.hpp"
 #include "hotkeys.h"
 
-#include "newgrf_commons.h"
 
 #include "town.h"
 #include "industry.h"

src/order_backup.cpp

@@ -15,9 +15,7 @@
 #include "network/network.h"
 #include "network/network_func.h"
 #include "order_backup.h"
-#include "order_base.h"
 #include "vehicle_base.h"
-#include "settings_type.h"
 
 OrderBackupPool _order_backup_pool("BackupOrder");
 INSTANTIATE_POOL_METHODS(OrderBackup)

src/order_backup.h

@@ -13,11 +13,11 @@
 #define ORDER_BACKUP_H
 
 #include "core/pool_type.hpp"
+#include "date_type.h"
+#include "group_type.h"
 #include "order_type.h"
-#include "vehicle_type.h"
 #include "tile_type.h"
-#include "group_type.h"
-#include "company_type.h"
+#include "vehicle_type.h"
 
 /** Unique identifier for an order backup. */
 typedef uint8 OrderBackupID;

src/order_gui.cpp

@@ -12,11 +12,10 @@
 #include "stdafx.h"
 #include "command_func.h"
 #include "viewport_func.h"
-#include "depot_base.h"
+#include "depot_map.h"
 #include "vehicle_gui.h"
 #include "roadveh.h"
 #include "timetable.h"
-#include "cargotype.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
@@ -31,7 +30,6 @@
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 /** Widget numbers of the order window. */

src/pathfinder/npf/npf.cpp

@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "../../debug.h"
-#include "../../landscape.h"
 #include "../../network/network.h"
 #include "../../functions.h"
 #include "../../ship.h"

src/pathfinder/yapf/yapf.h

@@ -13,7 +13,6 @@
 #define  YAPF_H
 
 #include "../../direction_type.h"
-#include "../../station_type.h"
 #include "../../track_type.h"
 #include "../../vehicle_type.h"
 #include "../pathfinder_type.h"

src/rail_cmd.cpp

@@ -11,17 +11,12 @@
 
 #include "stdafx.h"
 #include "cmd_helper.h"
-#include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
-#include "engine_base.h"
 #include "depot_base.h"
 #include "pathfinder/yapf/yapf_cache.h"
-#include "newgrf_engine.h"
-#include "landscape_type.h"
 #include "newgrf_debug.h"
 #include "newgrf_railtype.h"
-#include "newgrf_commons.h"
 #include "train.h"
 #include "autoslope.h"
 #include "water.h"
@@ -39,7 +34,6 @@
 #include "date_func.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 #include "table/railtypes.h"
 #include "table/track_land.h"
 

src/rail_gui.cpp

@@ -35,7 +35,6 @@
 #include "station_map.h"
 #include "tunnelbridge_map.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 static RailType _cur_railtype;               ///< Rail type of the current build-rail toolbar.

src/rail_gui.h

@@ -14,7 +14,7 @@
 
 #include "rail_type.h"
 
-Window *ShowBuildRailToolbar(RailType railtype);
+struct Window *ShowBuildRailToolbar(RailType railtype);
 void ReinitGuiAfterToggleElrail(bool disable);
 bool ResetSignalVariant(int32 = 0);
 void InitializeRailGUI();

src/road_cmd.cpp

@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "cmd_helper.h"
 #include "road_internal.h"
-#include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "pathfinder/yapf/yapf_cache.h"

src/road_gui.cpp

@@ -17,7 +17,6 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "road_cmd.h"
-#include "road_map.h"
 #include "station_func.h"
 #include "functions.h"
 #include "window_func.h"
@@ -30,7 +29,6 @@
 #include "company_base.h"
 #include "hotkeys.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 static void ShowRVStationPicker(Window *parent, RoadStopType rs);

src/road_gui.h

@@ -14,7 +14,7 @@
 
 #include "road_type.h"
 
-Window *ShowBuildRoadToolbar(RoadType roadtype);
-Window *ShowBuildRoadScenToolbar();
+struct Window *ShowBuildRoadToolbar(RoadType roadtype);
+struct Window *ShowBuildRoadScenToolbar();
 
 #endif /* ROAD_GUI_H */

src/roadstop.cpp

@@ -15,7 +15,6 @@
 #include "roadstop_base.h"
 #include "station_base.h"
 #include "vehicle_func.h"
-#include "landscape.h"
 
 RoadStopPool _roadstop_pool("RoadStop");
 INSTANTIATE_POOL_METHODS(RoadStop)

src/roadveh.h

@@ -12,11 +12,11 @@
 #ifndef ROADVEH_H
 #define ROADVEH_H
 
-#include "road_type.h"
 #include "ground_vehicle.hpp"
 #include "engine_base.h"
 #include "cargotype.h"
-#include "road_map.h"
+#include "track_func.h"
+#include "road_type.h"
 
 struct RoadVehicle;
 

src/roadveh_cmd.cpp

@@ -10,7 +10,6 @@
 /** @file roadveh_cmd.cpp Handling of road vehicles. */
 
 #include "stdafx.h"
-#include "landscape.h"
 #include "roadveh.h"
 #include "command_func.h"
 #include "news_func.h"
@@ -29,22 +28,17 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "autoreplace_gui.h"
 #include "ai/ai.hpp"
 #include "depot_map.h"
 #include "effectvehicle_func.h"
 #include "effectvehicle_base.h"
 #include "roadstop_base.h"
-#include "cargotype.h"
 #include "spritecache.h"
 #include "core/random_func.hpp"
-#include "engine_base.h"
 #include "company_base.h"
-#include "engine_func.h"
 #include "core/backup_type.hpp"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 static const uint16 _roadveh_images[63] = {
 	0xCD4, 0xCDC, 0xCE4, 0xCEC, 0xCF4, 0xCFC, 0xD0C, 0xD14,

src/saveload/afterload.cpp

@@ -22,7 +22,6 @@
 #include "../industry.h"
 #include "../clear_map.h"
 #include "../vehicle_func.h"
-#include "../debug.h"
 #include "../string_func.h"
 #include "../date_func.h"
 #include "../roadveh.h"
@@ -31,7 +30,6 @@
 #include "../waypoint_base.h"
 #include "../roadstop_base.h"
 #include "../tunnelbridge_map.h"
-#include "../landscape.h"
 #include "../pathfinder/yapf/yapf_cache.h"
 #include "../elrail_func.h"
 #include "../signs_func.h"
@@ -48,9 +46,7 @@
 #include "../animated_tile_func.h"
 #include "../subsidy_base.h"
 #include "../subsidy_func.h"
-#include "../company_base.h"
 #include "../newgrf.h"
-#include "../engine_base.h"
 #include "../engine_func.h"
 #include "../rail_gui.h"
 #include "../core/backup_type.hpp"

src/saveload/company_sl.cpp

@@ -10,7 +10,6 @@
 /** @file company_sl.cpp Code handling saving and loading of company data */
 
 #include "../stdafx.h"
-#include "../company_base.h"
 #include "../company_func.h"
 #include "../company_manager_face.h"
 #include "../fios.h"

src/saveload/gamelog_sl.cpp

@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../gamelog_internal.h"
-#include "../core/alloc_func.hpp"
 
 #include "saveload.h"
 

src/saveload/map_sl.cpp

@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../map_func.h"
-#include "../core/alloc_type.hpp"
 #include "../core/bitmath_func.hpp"
 #include "../fios.h"
 

src/saveload/misc_sl.cpp

@@ -18,7 +18,6 @@
 #include "../window_func.h"
 #include "../viewport_func.h"
 #include "../gfx_func.h"
-#include "../company_base.h"
 #include "../core/random_func.hpp"
 #include "../fios.h"
 

src/saveload/newgrf_sl.cpp

@@ -10,10 +10,7 @@
 /** @file newgrf_sl.cpp Code handling saving and loading of newgrf config */
 
 #include "../stdafx.h"
-#include "../newgrf_config.h"
 #include "../core/bitmath_func.hpp"
-#include "../core/alloc_func.hpp"
-#include "../gfx_func.h"
 #include "../fios.h"
 
 #include "saveload.h"

src/saveload/oldloader_sl.cpp

@@ -25,9 +25,6 @@
 #include "../date_func.h"
 #include "../vehicle_func.h"
 #include "../effectvehicle_base.h"
-#include "../core/mem_func.hpp"
-#include "../core/alloc_type.hpp"
-#include "../engine_base.h"
 #include "../engine_func.h"
 #include "../company_base.h"
 #include "saveload_internal.h"

src/saveload/saveload.cpp

@@ -40,7 +40,6 @@
 #include "../gamelog.h"
 #include "../string_func.h"
 #include "../engine_base.h"
-#include "../company_base.h"
 #include "../fios.h"
 
 #include "table/strings.h"

src/saveload/vehicle_sl.cpp

@@ -17,7 +17,6 @@
 #include "../aircraft.h"
 #include "../station_base.h"
 #include "../effectvehicle_base.h"
-#include "../engine_base.h"
 
 #include "saveload.h"
 

src/script/script_info.cpp

@@ -11,8 +11,6 @@
 
 #include "../stdafx.h"
 
-#include <squirrel.h>
-#include "squirrel.hpp"
 #include "squirrel_helper.hpp"
 
 #include "script_info.hpp"