(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header

src/ai/ai_config.hpp

@@ -15,6 +15,7 @@
 #include <map>
 #include "ai_info.hpp"
 #include "../core/string_compare_type.hpp"
+#include "../company_type.h"
 
 class AIConfig {
 private:

src/ai/ai_core.cpp

@@ -17,7 +17,6 @@
 #include "../network/network.h"
 #include "../window_func.h"
 #include "../command_func.h"
-#include "ai.hpp"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"

src/ai/ai_gui.hpp

@@ -12,6 +12,8 @@
 #ifndef AI_GUI_HPP
 #define AI_GUI_HPP
 
+#include "../company_type.h"
+
 void ShowAIDebugWindow(CompanyID show_company = INVALID_COMPANY);
 void ShowAIConfigWindow();
 

src/ai/ai_info.cpp

@@ -14,7 +14,6 @@
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
-#include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "../settings_type.h"

src/ai/ai_instance.cpp

@@ -11,10 +11,8 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../vehicle_base.h"
 #include "../saveload/saveload.h"
 #include "../gui.h"
-#include "table/strings.h"
 
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
@@ -79,6 +77,7 @@
 #include "api/ai_waypoint.hpp.sq"
 #include "api/ai_waypointlist.hpp.sq"
 
+#include "../company_base.h"
 #include "../fileio_func.h"
 
 AIStorage::~AIStorage()

src/ai/ai_instance.hpp

@@ -12,6 +12,8 @@
 #ifndef AI_INSTANCE_HPP
 #define AI_INSTANCE_HPP
 
+#include <squirrel.h>
+
 /**
  * The callback function when an AI suspends.
  */

src/ai/ai_scanner.cpp

@@ -19,7 +19,6 @@
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
-#include "ai.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "api/ai_controller.hpp"

src/ai/ai_scanner.hpp

@@ -12,8 +12,10 @@
 #ifndef AI_SCANNER_HPP
 #define AI_SCANNER_HPP
 
+#include <squirrel.h>
 #include "../script/script_scanner.hpp"
 #include "../core/string_compare_type.hpp"
+#include "ai.hpp"
 #include <map>
 
 class AIScanner : public ScriptScanner {

src/ai/ai_storage.hpp

@@ -19,8 +19,10 @@
 #include "../signs_func.h"
 #include "../tunnelbridge.h"
 #include "../vehicle_func.h"
+#include "../road_type.h"
 #include "../group.h"
 
+#include "table/strings.h"
 #include <vector>
 
 /**

src/ai/api/ai_abstractlist.cpp

@@ -9,7 +9,6 @@
 
 /** @file ai_abstractlist.cpp Implementation of AIAbstractList. */
 
-#include <squirrel.h>
 #include "ai_abstractlist.hpp"
 #include "../../debug.h"
 #include "../../script/squirrel.hpp"

src/ai/api/ai_controller.cpp

@@ -13,9 +13,7 @@
 #include "../../string_func.h"
 #include "../../company_base.h"
 #include "../../rev.h"
-#include "table/strings.h"
 
-#include "../ai.hpp"
 #include "ai_controller.hpp"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"

src/ai/api/ai_engine.cpp

@@ -14,7 +14,6 @@
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../strings_func.h"
-#include "../../settings_type.h"
 #include "../../rail.h"
 #include "../../engine_base.h"
 #include "../../articulated_vehicles.h"

src/ai/api/ai_execmode.cpp

@@ -10,7 +10,6 @@
 /** @file ai_execmode.cpp Implementation of AIExecMode. */
 
 #include "ai_execmode.hpp"
-#include "../../command_type.h"
 #include "../../company_base.h"
 #include "../../company_func.h"
 #include "../ai_instance.hpp"

src/ai/api/ai_group.cpp

@@ -16,7 +16,6 @@
 #include "../../group.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
-#include "../../command_func.h"
 #include "../../autoreplace_func.h"
 #include "../../settings_func.h"
 #include "table/strings.h"

src/ai/api/ai_industrytype.cpp

@@ -14,6 +14,7 @@
 #include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../industry.h"
+#include "../../core/random_func.hpp"
 
 /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)
 {

src/ai/api/ai_list.cpp

@@ -9,7 +9,6 @@
 
 /** @file ai_list.cpp Implementation of AIList. */
 
-#include <squirrel.h>
 #include "ai_list.hpp"
 
 void AIList::AddItem(int32 item, int32 value)

src/ai/api/ai_map.cpp

@@ -9,7 +9,6 @@
 
 /** @file ai_map.cpp Implementation of AIMap. */
 
-#include "../../stdafx.h"
 #include "ai_map.hpp"
 #include "../../tile_map.h"
 

src/ai/api/ai_object.cpp

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

src/ai/api/ai_rail.cpp

@@ -16,6 +16,7 @@
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
+#include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
 

src/ai/api/ai_road.cpp

@@ -9,7 +9,6 @@
 
 /** @file ai_road.cpp Implementation of AIRoad. */
 
-#include "../../stdafx.h"
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"

src/ai/api/ai_station.cpp

@@ -9,7 +9,6 @@
 
 /** @file ai_station.cpp Implementation of AIStation. */
 
-#include "../../stdafx.h"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
 #include "ai_map.hpp"

src/ai/api/ai_testmode.cpp

@@ -10,7 +10,6 @@
 /** @file ai_testmode.cpp Implementation of AITestMode. */
 
 #include "ai_testmode.hpp"
-#include "../../command_type.h"
 #include "../../company_base.h"
 #include "../../company_func.h"
 #include "../ai_instance.hpp"

src/ai/api/ai_tile.cpp

@@ -14,7 +14,6 @@
 #include "ai_town.hpp"
 #include "../../station_func.h"
 #include "../../company_func.h"
-#include "../../road_map.h"
 #include "../../water_map.h"
 #include "../../clear_map.h"
 #include "../../tree_map.h"

src/ai/api/ai_vehicle.cpp

@@ -22,6 +22,7 @@
 #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.h

@@ -14,8 +14,6 @@
 
 #include "station_map.h"
 #include "vehicle_base.h"
-#include "engine_func.h"
-#include "engine_base.h"
 
 struct Aircraft;
 

src/aircraft_cmd.cpp

@@ -27,14 +27,15 @@
 #include "sound_func.h"
 #include "functions.h"
 #include "cheat_type.h"
-#include "autoreplace_func.h"
+#include "company_base.h"
 #include "autoreplace_gui.h"
-#include "gfx_func.h"
 #include "ai/ai.hpp"
 #include "company_func.h"
 #include "effectvehicle_func.h"
 #include "station_base.h"
-#include "cargotype.h"
+#include "engine_base.h"
+#include "engine_func.h"
+#include "core/random_func.hpp"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/aircraft_gui.cpp

@@ -15,7 +15,6 @@
 #include "newgrf_engine.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
-#include "gfx_func.h"
 #include "window_gui.h"
 #include "spritecache.h"
 

src/airport.h

@@ -14,7 +14,6 @@
 
 #include "direction_type.h"
 #include "map_type.h"
-#include "tile_type.h"
 #include "date_type.h"
 
 /** Current limits for airports */

src/airport_gui.cpp

@@ -22,6 +22,7 @@
 #include "company_func.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
+#include "station_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/articulated_vehicles.cpp

@@ -14,6 +14,8 @@
 #include "roadveh.h"
 #include "newgrf_engine.h"
 #include "vehicle_func.h"
+#include "engine_base.h"
+#include "engine_func.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/autoreplace_base.h

@@ -14,6 +14,8 @@
 
 #include "core/pool_type.hpp"
 #include "autoreplace_type.h"
+#include "engine_type.h"
+#include "group_type.h"
 
 typedef uint16 EngineRenewID;
 

src/autoreplace_cmd.cpp

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

src/autoreplace_func.h

@@ -12,8 +12,10 @@
 #ifndef AUTOREPLACE_FUNC_H
 #define AUTOREPLACE_FUNC_H
 
-#include "autoreplace_type.h"
+#include "command_type.h"
 #include "company_base.h"
+#include "engine_type.h"
+#include "group_type.h"
 
 /**
  * Remove all engine replacement settings for the company.

src/autoreplace_gui.cpp

@@ -18,13 +18,13 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "autoreplace_func.h"
-#include "gfx_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "engine_base.h"
 #include "window_gui.h"
 #include "engine_gui.h"
 #include "settings_func.h"
+#include "core/geometry_func.hpp"
 
 #include "table/strings.h"
 

src/autoreplace_gui.h

@@ -12,6 +12,8 @@
 #ifndef AUTOREPLACE_GUI_H
 #define AUTOREPLACE_GUI_H
 
+#include "engine_type.h"
+#include "group_type.h"
 #include "vehicle_type.h"
 
 /**

src/autoslope.h

@@ -12,10 +12,11 @@
 #ifndef AUTOSLOPE_H
 #define AUTOSLOPE_H
 
-#include "settings_type.h"
 #include "company_func.h"
 #include "depot_func.h"
 #include "slope_func.h"
+#include "tile_map.h"
+#include "openttd.h"
 
 /**
  * Autoslope check for tiles with an entrance on an edge.

src/base_media_func.h

@@ -10,8 +10,9 @@
 /** @file base_media_func.h Generic function implementations for base data (graphics, sounds). */
 
 #include "base_media_base.h"
-#include "string_func.h"
+#include "debug.h"
 #include "ini_type.h"
+#include "string_func.h"
 
 template <class Tbase_set> /* static */ const char *BaseMedia<Tbase_set>::ini_set;
 template <class Tbase_set> /* static */ const Tbase_set *BaseMedia<Tbase_set>::used_set;

src/base_station_base.h

@@ -12,12 +12,7 @@
 #ifndef BASE_STATION_BASE_H
 #define BASE_STATION_BASE_H
 
-#include "station_type.h"
 #include "core/pool_type.hpp"
-#include "town_type.h"
-#include "strings_type.h"
-#include "date_type.h"
-#include "company_type.h"
 #include "viewport_type.h"
 #include "station_map.h"
 

src/blitter/32bpp_anim.cpp

@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../core/math_func.hpp"
-#include "../gfx_func.h"
 #include "../video/video_driver.hpp"
 #include "32bpp_anim.hpp"
 

src/blitter/32bpp_anim.hpp

@@ -13,7 +13,6 @@
 #define BLITTER_32BPP_ANIM_HPP
 
 #include "32bpp_optimized.hpp"
-#include "factory.hpp"
 
 class Blitter_32bppAnim : public Blitter_32bppOptimized {
 private:

src/blitter/32bpp_base.cpp

@@ -10,7 +10,6 @@
 /** @file 32bpp_base.cpp Implementation of base for 32 bpp blitters. */
 
 #include "../stdafx.h"
-#include "../gfx_func.h"
 #include "32bpp_base.hpp"
 
 void *Blitter_32bppBase::MoveTo(const void *video, int x, int y)

src/blitter/32bpp_base.hpp

@@ -14,6 +14,7 @@
 
 #include "base.hpp"
 #include "../core/bitmath_func.hpp"
+#include "../gfx_func.h"
 
 class Blitter_32bppBase : public Blitter {
 public:

src/blitter/32bpp_optimized.cpp

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

src/blitter/32bpp_simple.cpp

@@ -10,7 +10,6 @@
 /** @file 32bpp_simple.cpp Implementation of the simple 32 bpp blitter. */
 
 #include "../stdafx.h"
-#include "../gfx_func.h"
 #include "../zoom_func.h"
 #include "32bpp_simple.hpp"
 

src/blitter/base.hpp

@@ -14,7 +14,6 @@
 
 #include "../spritecache.h"
 #include "../spriteloader/spriteloader.hpp"
-#include "../zoom_type.h"
 
 enum BlitterMode {
 	BM_NORMAL,

src/bridge.h

@@ -13,7 +13,6 @@
 #define BRIDGE_H
 
 #include "gfx_type.h"
-#include "direction_type.h"
 #include "tile_cmd.h"
 
 /** This enum is related to the definition of bridge pieces,

src/bridge_gui.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "gui.h"
-#include "window_gui.h"
 #include "command_func.h"
 #include "economy_func.h"
 #include "bridge.h"
@@ -22,6 +21,7 @@
 #include "tunnelbridge.h"
 #include "sortlist_type.h"
 #include "widgets/dropdown_func.h"
+#include "core/geometry_func.hpp"
 
 #include "table/strings.h"
 

src/bridge_map.h

@@ -12,9 +12,6 @@
 #ifndef BRIDGE_MAP_H
 #define BRIDGE_MAP_H
 
-#include "direction_func.h"
-#include "rail_type.h"
-#include "transport_type.h"
 #include "road_map.h"
 #include "bridge.h"
 

src/build_vehicle_gui.cpp

@@ -9,10 +9,9 @@
 
 /** @file build_vehicle_gui.cpp GUI for building vehicles. */
 
-#include "train.h"
-#include "roadveh.h"
-#include "ship.h"
-#include "aircraft.h"
+#include "stdafx.h"
+#include "engine_base.h"
+#include "engine_func.h"
 #include "station_base.h"
 #include "articulated_vehicles.h"
 #include "textbuf_gui.h"
@@ -26,9 +25,7 @@
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
-#include "gfx_func.h"
 #include "widgets/dropdown_func.h"
-#include "window_gui.h"
 #include "engine_gui.h"
 #include "cargotype.h"
 

src/cargopacket.h

@@ -14,7 +14,6 @@
 
 #include "core/pool_type.hpp"
 #include "economy_type.h"
-#include "tile_type.h"
 #include "station_type.h"
 #include "cargo_type.h"
 #include "vehicle_type.h"

src/clear_cmd.cpp

@@ -21,6 +21,7 @@
 #include "economy_func.h"
 #include "viewport_func.h"
 #include "water.h"
+#include "core/random_func.hpp"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/company_base.h

@@ -12,12 +12,9 @@
 #ifndef COMPANY_BASE_H
 #define COMPANY_BASE_H
 
-#include "company_type.h"
 #include "core/pool_type.hpp"
 #include "road_type.h"
 #include "rail_type.h"
-#include "date_type.h"
-#include "engine_type.h"
 #include "livery.h"
 #include "autoreplace_type.h"
 #include "economy_type.h"

src/company_cmd.cpp

@@ -34,6 +34,7 @@
 #include "settings_func.h"
 #include "vehicle_base.h"
 #include "vehicle_func.h"
+#include "sprite.h"
 
 #include "table/strings.h"
 

src/company_func.h

@@ -12,10 +12,8 @@
 #ifndef COMPANY_FUNC_H
 #define COMPANY_FUNC_H
 
-#include "core/math_func.hpp"
 #include "company_type.h"
 #include "tile_type.h"
-#include "strings_type.h"
 #include "gfx_type.h"
 
 void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner);

src/company_gui.cpp

@@ -14,7 +14,6 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "network/network.h"
@@ -28,6 +27,9 @@
 #include "date_func.h"
 #include "widgets/dropdown_type.h"
 #include "tilehighlight_func.h"
+#include "sprite.h"
+#include "company_base.h"
+#include "core/geometry_func.hpp"
 
 #include "table/strings.h"
 

src/console.cpp

@@ -14,6 +14,7 @@
 #include "network/network.h"
 #include "network/network_func.h"
 #include "debug.h"
+#include "console_func.h"
 
 #include <stdarg.h>
 

src/console_cmds.cpp

@@ -34,6 +34,7 @@
 #include "gamelog.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"
+#include "console_func.h"
 
 #ifdef ENABLE_NETWORK
 	#include "table/strings.h"

src/console_gui.cpp

@@ -18,6 +18,7 @@
 #include "string_func.h"
 #include "gfx_func.h"
 #include "settings_type.h"
+#include "console_func.h"
 #include "rev.h"
 
 

src/console_internal.h

@@ -12,7 +12,7 @@
 #ifndef CONSOLE_INTERNAL_H
 #define CONSOLE_INTERNAL_H
 
-#include "console_func.h"
+#include "console_type.h"
 
 enum {
 	ICON_CMDLN_SIZE     = 1024, ///< maximum length of a typed in command

src/core/mem_func.hpp

@@ -12,7 +12,6 @@
 #ifndef MEM_FUNC_HPP
 #define MEM_FUNC_HPP
 
-#include <string.h>
 #include "math_func.hpp"
 
 /**

src/core/sort_func.hpp

@@ -12,8 +12,6 @@
 #ifndef SORT_FUNC_HPP
 #define SORT_FUNC_HPP
 
-#include <stdlib.h>
-#include "math_func.hpp"
 #include "mem_func.hpp"
 
 /**

src/crashlog.cpp

@@ -26,12 +26,10 @@
 #include "gfx_func.h"
 #include "network/network.h"
 
-#include <squirrel.h>
 #include "ai/ai_info.hpp"
 #include "company_base.h"
 #include "company_func.h"
 
-#include <time.h>
 
 /* static */ const char *CrashLog::message = NULL;
 /* static */ char *CrashLog::gamelog_buffer = NULL;

src/date_gui.cpp

@@ -12,10 +12,10 @@
 #include "stdafx.h"
 #include "strings_func.h"
 #include "date_func.h"
-#include "gfx_func.h"
 #include "window_func.h"
 #include "window_gui.h"
 #include "date_gui.h"
+#include "core/geometry_func.hpp"
 
 #include "widgets/dropdown_type.h"
 

src/date_gui.h

@@ -12,6 +12,9 @@
 #ifndef DATE_GUI_H
 #define DATE_GUI_H
 
+#include "date_type.h"
+#include "window_type.h"
+
 /**
  * Callback for when a date has been chosen
  * @param w the window that sends the callback

src/debug.cpp

@@ -14,13 +14,13 @@
 #include "console_func.h"
 #include "debug.h"
 #include "string_func.h"
-#include "network/core/core.h"
 #include "fileio_func.h"
 #include "settings_type.h"
 
 #include <time.h>
 
 #if defined(ENABLE_NETWORK)
+#include "network/core/os_abstraction.h"
 SOCKET _debug_socket = INVALID_SOCKET;
 #endif /* ENABLE_NETWORK */
 

src/depot_base.h

@@ -12,10 +12,8 @@
 #ifndef DEPOT_BASE_H
 #define DEPOT_BASE_H
 
-#include "tile_type.h"
 #include "depot_map.h"
 #include "core/pool_type.hpp"
-#include "town_type.h"
 
 typedef Pool<Depot, DepotID, 64, 64000> DepotPool;
 extern DepotPool _depot_pool;

src/depot_func.h

@@ -12,7 +12,6 @@
 #ifndef DEPOT_FUNC_H
 #define DEPOT_FUNC_H
 
-#include "depot_type.h"
 #include "tile_type.h"
 #include "vehicle_type.h"
 #include "direction_type.h"

src/depot_gui.cpp

@@ -9,6 +9,8 @@
 
 /** @file depot_gui.cpp The GUI for depots. */
 
+#include "stdafx.h"
+#include "engine_base.h"
 #include "train.h"
 #include "ship.h"
 #include "aircraft.h"
@@ -16,7 +18,6 @@
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "command_func.h"
 #include "depot_base.h"
 #include "vehicle_gui.h"

src/depot_map.h

@@ -12,9 +12,6 @@
 #ifndef DEPOT_MAP_H
 #define DEPOT_MAP_H
 
-#include "road_map.h"
-#include "rail_map.h"
-#include "water_map.h"
 #include "station_map.h"
 
 /**

src/disaster_cmd.cpp

@@ -41,6 +41,8 @@
 #include "effectvehicle_func.h"
 #include "roadveh.h"
 #include "ai/ai.hpp"
+#include "company_base.h"
+#include "core/random_func.hpp"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/dock_gui.cpp

@@ -26,6 +26,7 @@
 #include "slope_func.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
+#include "station_type.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"

src/driver.cpp

@@ -14,6 +14,7 @@
 #include "sound/sound_driver.hpp"
 #include "music/music_driver.hpp"
 #include "video/video_driver.hpp"
+#include "string_func.h"
 
 VideoDriver *_video_driver;
 char *_ini_videodriver;

src/driver.h

@@ -14,7 +14,6 @@
 
 #include "core/enum_type.hpp"
 #include "core/string_compare_type.hpp"
-#include "string_func.h"
 #include <map>
 
 const char *GetDriverParam(const char * const *parm, const char *name);

src/economy.cpp

@@ -10,7 +10,6 @@
 /** @file economy.cpp Handling of the economy. */
 
 #include "stdafx.h"
-#include "tile_cmd.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "industry.h"
@@ -36,7 +35,6 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
-#include "gfx_func.h"
 #include "autoreplace_func.h"
 #include "company_gui.h"
 #include "signs_base.h"
@@ -46,6 +44,8 @@
 #include "waypoint_base.h"
 #include "economy_base.h"
 #include "core/pool_func.hpp"
+#include "newgrf.h"
+#include "engine_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/economy_func.h

@@ -12,16 +12,11 @@
 #ifndef ECONOMY_FUNC_H
 #define ECONOMY_FUNC_H
 
-#include "core/geometry_type.hpp"
 #include "economy_type.h"
+#include "station_type.h"
 #include "cargo_type.h"
 #include "vehicle_type.h"
-#include "tile_type.h"
-#include "town_type.h"
-#include "industry_type.h"
 #include "company_type.h"
-#include "station_type.h"
-#include "station_func.h"
 
 void ResetPriceBaseMultipliers();
 void SetPriceBaseMultiplier(Price price, int factor);

src/economy_type.h

@@ -14,7 +14,6 @@
 
 #include "core/overflowsafe_type.hpp"
 #include "core/enum_type.hpp"
-#include "cargo_type.h"
 
 typedef OverflowSafeInt64 Money;
 

src/effectvehicle.cpp

@@ -17,6 +17,7 @@
 #include "sound_func.h"
 #include "animated_tile_func.h"
 #include "effectvehicle_func.h"
+#include "effectvehicle_base.h"
 
 #include "table/sprites.h"
 

src/effectvehicle_func.h

@@ -12,7 +12,7 @@
 #ifndef EFFECTVEHICLE_FUNC_H
 #define EFFECTVEHICLE_FUNC_H
 
-#include "effectvehicle_base.h"
+#include "vehicle_type.h"
 
 /** Effect vehicle types */
 enum EffectVehicleType {

src/elrail.cpp

@@ -54,7 +54,6 @@
  */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "station_map.h"
 #include "viewport_func.h"
 #include "landscape.h"
@@ -64,6 +63,7 @@
 #include "tunnelbridge.h"
 #include "elrail_func.h"
 #include "engine_base.h"
+#include "company_base.h"
 
 #include "table/sprites.h"
 #include "table/elrail_data.h"

src/elrail_func.h

@@ -13,9 +13,8 @@
 #define ELRAIL_FUNC_H
 
 #include "rail.h"
-#include "transparency.h"
 #include "tile_cmd.h"
-#include "settings_type.h"
+#include "transparency.h"
 
 /**
  * Test if a rail type has catenary

src/engine.cpp

@@ -18,7 +18,6 @@
 #include "newgrf_engine.h"
 #include "group.h"
 #include "strings_func.h"
-#include "gfx_func.h"
 #include "core/random_func.hpp"
 #include "window_func.h"
 #include "date_func.h"
@@ -27,6 +26,9 @@
 #include "ai/ai.hpp"
 #include "core/pool_func.hpp"
 #include "engine_gui.h"
+#include "engine_func.h"
+#include "engine_base.h"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/engines.h"

src/engine_base.h

@@ -12,8 +12,9 @@
 #ifndef ENGINE_BASE_H
 #define ENGINE_BASE_H
 
+#include "company_type.h"
 #include "engine_type.h"
-#include "economy_type.h"
+#include "vehicle_type.h"
 #include "core/pool_type.hpp"
 #include "core/smallvec_type.hpp"
 

src/engine_func.h

@@ -13,6 +13,8 @@
 #define ENGINE_H
 
 #include "engine_type.h"
+#include "vehicle_type.h"
+#include "company_type.h"
 
 void SetupEngines();
 void StartupEngines();

src/engine_gui.h

@@ -12,7 +12,9 @@
 #ifndef ENGINE_GUI_H
 #define ENGINE_GUI_H
 
+#include "engine_type.h"
 #include "sortlist_type.h"
+#include "gfx_type.h"
 
 typedef GUIList<EngineID, CargoID> GUIEngineList;
 

src/engine_type.h

@@ -15,11 +15,8 @@
 #include "economy_type.h"
 #include "rail_type.h"
 #include "cargo_type.h"
-#include "vehicle_type.h"
-#include "gfx_type.h"
 #include "date_type.h"
 #include "sound_type.h"
-#include "company_type.h"
 #include "strings_type.h"
 
 typedef uint16 EngineID;

src/fontcache.h

@@ -12,7 +12,6 @@
 #ifndef FONTCACHE_H
 #define FONTCACHE_H
 
-#include "gfx_type.h"
 #include "spritecache.h"
 
 /** Get the SpriteID mapped to the given font size and key */

src/functions.h

@@ -12,8 +12,6 @@
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
-#include "core/random_func.hpp"
-#include "command_type.h"
 #include "tile_cmd.h"
 
 /* clear_land.cpp */

src/gamelog.cpp

@@ -16,7 +16,6 @@
 #include "variables.h"
 #include "string_func.h"
 #include "settings_type.h"
-#include "gamelog.h"
 #include "gamelog_internal.h"
 #include "console_func.h"
 #include "debug.h"

src/gamelog_internal.h

@@ -13,6 +13,7 @@
 #define GAMELOG_INTERNAL_H
 
 #include "network/core/config.h"
+#include "gamelog.h"
 
 /** Type of logged change */
 enum GamelogChangeType {

src/genworld.cpp

@@ -33,6 +33,7 @@
 #include "void_map.h"
 #include "town.h"
 #include "newgrf.h"
+#include "core/random_func.hpp"
 
 #include "table/sprites.h"
 

src/genworld_gui.cpp

@@ -23,7 +23,6 @@
 #include "sound_func.h"
 #include "fios.h"
 #include "string_func.h"
-#include "gfx_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "landscape_type.h"
@@ -31,6 +30,8 @@
 #include "town.h"
 #include "thread/thread.h"
 #include "settings_func.h"
+#include "core/geometry_func.hpp"
+#include "core/random_func.hpp"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/gfx_type.h

@@ -13,7 +13,6 @@
 #define GFX_TYPE_H
 
 #include "core/endian_type.hpp"
-#include "core/enum_type.hpp"
 #include "core/geometry_type.hpp"
 #include "zoom_type.h"
 

src/gfxinit.cpp

@@ -10,7 +10,6 @@
 /** @file gfxinit.cpp Initializing of the (GRF) graphics. */
 
 #include "stdafx.h"
-#include "debug.h"
 #include "fios.h"
 #include "newgrf.h"
 #include "3rdparty/md5/md5.h"

src/graph_gui.cpp

@@ -22,6 +22,7 @@
 #include "date_func.h"
 #include "gfx_func.h"
 #include "sortlist_type.h"
+#include "core/geometry_func.hpp"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/group_gui.cpp

@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "vehicle_gui.h"
@@ -21,12 +20,13 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_gui.h"
-#include "gfx_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "tilehighlight_func.h"
 #include "vehicle_gui_base.h"
+#include "core/geometry_func.hpp"
+#include "company_base.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"

src/group_gui.h

@@ -12,6 +12,7 @@
 #ifndef GROUP_GUI_H
 #define GROUP_GUI_H
 
+#include "company_type.h"
 #include "vehicle_type.h"
 
 void ShowCompanyGroup(CompanyID company, VehicleType veh);

src/gui.h

@@ -12,7 +12,6 @@
 #ifndef GUI_H
 #define GUI_H
 
-#include "window_type.h"
 #include "vehicle_type.h"
 #include "gfx_type.h"
 #include "economy_type.h"

src/highscore.cpp

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

src/highscore.h

@@ -12,9 +12,7 @@
 #ifndef HIGHSCORE_H
 #define HIGHSCORE_H
 
-#include "stdafx.h"
 #include "strings_type.h"
-#include "core/math_func.hpp"
 #include "company_type.h"
 
 struct HighScore {

src/highscore_gui.cpp

@@ -9,6 +9,7 @@
 
 /** @file highscore_gui.cpp Definition of the HighScore and EndGame windows */
 
+#include "stdafx.h"
 #include "highscore.h"
 #include "table/strings.h"
 #include "gfx_func.h"