Codechange: Remove unnecessary 'core' includes. (#14867)

src/autoreplace.cpp

@@ -11,7 +11,6 @@
 #include "command_func.h"
 #include "group.h"
 #include "autoreplace_base.h"
-#include "core/bitmath_func.hpp"
 #include "core/pool_func.hpp"
 
 #include "safeguards.h"

src/blitter/8bpp_optimized.cpp

@@ -10,7 +10,6 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "../core/math_func.hpp"
 #include "8bpp_optimized.hpp"
 
 #include "../safeguards.h"

src/blitter/common.hpp

@@ -11,7 +11,6 @@
 #define BLITTER_COMMON_HPP
 
 #include "base.hpp"
-#include "../core/math_func.hpp"
 
 #include <utility>
 

src/cargo_type.h

@@ -10,9 +10,7 @@
 #ifndef CARGO_TYPE_H
 #define CARGO_TYPE_H
 
-#include "core/enum_type.hpp"
 #include "core/strong_typedef_type.hpp"
-#include "core/convertible_through_base.hpp"
 
 /** Globally unique label of a cargo type. */
 using CargoLabel = StrongType::Typedef<uint32_t, struct CargoLabelTag, StrongType::Compare>;

src/cheat_gui.cpp

@@ -29,7 +29,6 @@
 #include "newgrf.h"
 #include "error.h"
 #include "misc_cmd.h"
-#include "core/geometry_func.hpp"
 #include "settings_type.h"
 #include "settings_internal.h"
 #include "timer/timer.h"

src/company_type.h

@@ -10,7 +10,7 @@
 #ifndef COMPANY_TYPE_H
 #define COMPANY_TYPE_H
 
-#include "core/enum_type.hpp"
+#include "core/base_bitset_type.hpp"
 #include "core/pool_type.hpp"
 
 using CompanyID = PoolID<uint8_t, struct CompanyIDTag, 0xF, 0xFF>;

src/core/random_func.cpp

@@ -9,7 +9,6 @@
 
 #include "../stdafx.h"
 #include "random_func.hpp"
-#include "bitmath_func.hpp"
 #include "../debug.h"
 
 #ifdef RANDOM_DEBUG

src/core/string_consumer.cpp

@@ -10,7 +10,6 @@
 #include "../stdafx.h"
 #include "string_consumer.hpp"
 
-#include "bitmath_func.hpp"
 #include "utf8.hpp"
 #include "string_builder.hpp"
 

src/gfx.cpp

@@ -28,7 +28,6 @@
 #include "framerate_type.h"  // CM
 #include "transparency.h"  // CM
 #include "core/backup_type.hpp"
-#include "core/container_func.hpp"
 #include "core/geometry_func.hpp"
 #include "viewport_func.h"
 

src/goal_type.h

@@ -10,7 +10,6 @@
 #ifndef GOAL_TYPE_H
 #define GOAL_TYPE_H
 
-#include "core/enum_type.hpp"
 #include "core/pool_type.hpp"
 
 static const uint32_t GOAL_QUESTION_BUTTON_COUNT = 18; ///< Amount of buttons available.

src/group_gui.cpp

@@ -22,7 +22,6 @@
 #include "tilehighlight_func.h"
 #include "vehicle_gui_base.h"
 #include "core/geometry_func.hpp"
-#include "core/container_func.hpp"
 #include "company_base.h"
 #include "company_gui.h"
 #include "gui.h"

src/house_type.h

@@ -10,6 +10,8 @@
 #ifndef HOUSE_TYPE_H
 #define HOUSE_TYPE_H
 
+#include "core/enum_type.hpp"
+
 typedef uint16_t HouseID; ///< OpenTTD ID of house types.
 typedef uint16_t HouseClassID; ///< Classes of houses.
 

src/intro_gui.cpp

@@ -26,7 +26,6 @@
 #include "ai/ai_gui.hpp"
 #include "game/game_gui.hpp"
 #include "gfx_func.h"
-#include "core/geometry_func.hpp"
 #include "core/string_consumer.hpp"
 #include "language.h"
 #include "rev.h"

src/misc/hashtable.hpp

@@ -10,8 +10,6 @@
 #ifndef HASHTABLE_HPP
 #define HASHTABLE_HPP
 
-#include "../core/math_func.hpp"
-
 template <class TItem>
 struct HashTableSlot
 {

src/network/core/network_game_info.cpp

@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "network_game_info.h"
-#include "../../core/bitmath_func.hpp"
 #include "../../company_base.h"
 #include "../../timer/timer_game_calendar.h"
 #include "../../timer/timer_game_tick.h"

src/network/core/tcp_admin.h

@@ -15,7 +15,6 @@
 #include "os_abstraction.h"
 #include "tcp.h"
 #include "../network_type.h"
-#include "../../core/pool_type.hpp"
 
 /**
  * Enum with types of TCP packets specific to the admin network.

src/network/core/tcp_game.h

@@ -15,7 +15,6 @@
 #include "os_abstraction.h"
 #include "tcp.h"
 #include "../network_type.h"
-#include "../../core/pool_type.hpp"
 #include <chrono>
 
 /**

src/network/core/tcp_listen.h

@@ -16,7 +16,6 @@
 #include "../network.h"
 #include "../network_func.h"
 #include "../network_internal.h"
-#include "../../core/pool_type.hpp"
 #include "../../debug.h"
 
 #include "table/strings.h"

src/network/network.cpp

@@ -9,7 +9,6 @@
 
 #include "../stdafx.h"
 
-#include "../core/string_consumer.hpp"
 #include "../strings_func.h"
 #include "../command_func.h"
 #include "../timer/timer_game_tick.h"

src/network/network_chat_gui.cpp

@@ -17,7 +17,6 @@
 #include "../town.h"
 #include "../window_func.h"
 #include "../toolbar_gui.h"
-#include "../core/geometry_func.hpp"
 #include "../zoom_func.h"
 #include "../timer/timer.h"
 #include "../timer/timer_window.h"

src/network/network_client.cpp

@@ -9,7 +9,6 @@
 
 #include "../stdafx.h"
 #include "network_gui.h"
-#include "../core/string_consumer.hpp"
 #include "../saveload/saveload.h"
 #include "../saveload/saveload_filter.h"
 #include "../command_func.h"

src/newgrf.h

@@ -17,7 +17,6 @@
 #include "newgrf_badge_type.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_text_type.h"
-#include "core/bitmath_func.hpp"
 
 /**
  * List of different canal 'features'.

src/newgrf/newgrf_bytereader.cpp

@@ -8,7 +8,6 @@
 /** @file newgrf_bytereader.cpp NewGRF byte buffer reader implementation. */
 
 #include "../stdafx.h"
-#include "../core/backup_type.hpp"
 #include "../string_func.h"
 #include "newgrf_bytereader.h"
 

src/newgrf_commons.h

@@ -14,7 +14,6 @@
 #define NEWGRF_COMMONS_H
 
 #include "sprite.h"
-#include "core/alloc_type.hpp"
 #include "command_type.h"
 #include "direction_type.h"
 #include "company_type.h"

src/newgrf_industrytiles.h

@@ -12,7 +12,6 @@
 
 #include "newgrf_animation_type.h"
 #include "newgrf_industries.h"
-#include "core/random_func.hpp"
 
 /** Resolver for the industry tiles scope. */
 struct IndustryTileScopeResolver : public ScopeResolver {

src/newgrf_storage.cpp

@@ -10,7 +10,6 @@
 #include "stdafx.h"
 #include "newgrf_storage.h"
 #include "core/pool_func.hpp"
-#include "core/endian_func.hpp"
 #include "debug.h"
 
 #include "safeguards.h"

src/newgrf_text.cpp

@@ -26,7 +26,6 @@
 #include "string_func.h"
 #include "timer/timer_game_calendar.h"
 #include "debug.h"
-#include "core/alloc_type.hpp"
 #include "core/string_builder.hpp"
 #include "core/string_consumer.hpp"
 #include "language.h"

src/order_cmd.cpp

@@ -17,7 +17,6 @@
 #include "vehicle_func.h"
 #include "depot_base.h"
 #include "core/pool_func.hpp"
-#include "core/random_func.hpp"
 #include "aircraft.h"
 #include "roadveh.h"
 #include "station_base.h"

src/rail.h

@@ -13,7 +13,6 @@
 #include "rail_type.h"
 #include "track_type.h"
 #include "gfx_type.h"
-#include "core/bitmath_func.hpp"
 #include "core/enum_type.hpp"
 #include "core/flatset_type.hpp"
 #include "economy_func.h"

src/road.h

@@ -12,7 +12,6 @@
 
 #include "road_type.h"
 #include "gfx_type.h"
-#include "core/bitmath_func.hpp"
 #include "core/flatset_type.hpp"
 #include "strings_type.h"
 #include "timer/timer_game_calendar.h"

src/roadstop_base.h

@@ -12,7 +12,6 @@
 
 #include "station_type.h"
 #include "core/pool_type.hpp"
-#include "core/bitmath_func.hpp"
 #include "vehicle_type.h"
 
 using RoadStopPool = Pool<RoadStop, RoadStopID, 32>;

src/script/api/script_error.cpp

@@ -9,7 +9,6 @@
 
 #include "../../stdafx.h"
 #include "script_error.hpp"
-#include "../../core/bitmath_func.hpp"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 

src/script/api/script_industrytype.cpp

@@ -15,7 +15,6 @@
 #include "../../strings_func.h"
 #include "../../industry.h"
 #include "../../newgrf_industries.h"
-#include "../../core/random_func.hpp"
 #include "../../industry_cmd.h"
 
 #include "../../safeguards.h"

src/script/script_config.cpp

@@ -9,7 +9,6 @@
 
 #include "../stdafx.h"
 #include "../settings_type.h"
-#include "../core/random_func.hpp"
 #include "script_info.hpp"
 #include "api/script_object.hpp"
 #include "../textfile_gui.h"

src/script/squirrel_std.cpp

@@ -12,7 +12,6 @@
 #include <sqstdmath.h>
 #include "../debug.h"
 #include "squirrel_std.hpp"
-#include "../core/math_func.hpp"
 #include "../string_func.h"
 
 #include "../safeguards.h"

src/spriteloader/grf.cpp

@@ -13,9 +13,6 @@
 #include "../settings_type.h"
 #include "../strings_func.h"
 #include "../error.h"
-#include "../core/math_func.hpp"
-#include "../core/alloc_type.hpp"
-#include "../core/bitmath_func.hpp"
 #include "../spritecache.h"
 #include "grf.hpp"
 

src/spriteloader/makeindexed.cpp

@@ -8,7 +8,6 @@
 /** @file makeindexed.cpp Implementation for converting sprites from another source from 32bpp RGBA to indexed 8bpp. */
 
 #include "../stdafx.h"
-#include "../core/bitmath_func.hpp"
 #include "../core/math_func.hpp"
 #include "../gfx_func.h"
 #include "../palette_func.h"

src/station_kdtree.h

@@ -11,7 +11,6 @@
 #define STATION_KDTREE_H
 
 #include "core/kdtree.hpp"
-#include "core/math_func.hpp"
 #include "station_base.h"
 #include "map_func.h"
 

src/story_type.h

@@ -10,7 +10,6 @@
 #ifndef STORY_TYPE_H
 #define STORY_TYPE_H
 
-#include "core/enum_type.hpp"
 #include "core/pool_type.hpp"
 
 using StoryPageElementID = PoolID<uint16_t, struct StoryPageElementIDTag, 64000, 0xFFFF>; ///< ID of a story page element

src/strgen/strgen.cpp

@@ -8,7 +8,6 @@
 /** @file strgen.cpp Tool to create computer readable (stand-alone) translation files. */
 
 #include "../stdafx.h"
-#include "../core/endian_func.hpp"
 #include "../error_func.h"
 #include "../string_func.h"
 #include "../strings_type.h"

src/string.cpp

@@ -9,7 +9,6 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "core/math_func.hpp"
 #include "error_func.h"
 #include "string_func.h"
 #include "string_base.h"

src/string_func.h

@@ -14,7 +14,6 @@
 
 #include <iosfwd>
 
-#include "core/bitmath_func.hpp"
 #include "string_type.h"
 
 void strecpy(std::span<char> dst, std::string_view src);

src/strings_func.h

@@ -12,10 +12,7 @@
 
 #include "fontcache.h"
 #include "strings_type.h"
-#include "string_type.h"
 #include "gfx_type.h"
-#include "core/bitmath_func.hpp"
-#include "core/convertible_through_base.hpp"
 #include "vehicle_type.h"
 
 /**

src/tests/mock_spritecache.cpp

@@ -10,7 +10,6 @@
 #include "../stdafx.h"
 
 #include "../blitter/factory.hpp"
-#include "../core/math_func.hpp"
 #include "../spritecache.h"
 #include "../spritecache_internal.h"
 #include "../table/sprites.h"

src/timer/timer_game_calendar.h

@@ -10,7 +10,6 @@
 #ifndef TIMER_GAME_CALENDAR_H
 #define TIMER_GAME_CALENDAR_H
 
-#include "../core/strong_typedef_type.hpp"
 #include "timer_game_common.h"
 
 /**

src/timer/timer_game_economy.h

@@ -10,7 +10,6 @@
 #ifndef TIMER_GAME_ECONOMY_H
 #define TIMER_GAME_ECONOMY_H
 
-#include "../core/strong_typedef_type.hpp"
 #include "timer_game_common.h"
 
 /**

src/transport_type.h

@@ -10,8 +10,6 @@
 #ifndef TRANSPORT_TYPE_H
 #define TRANSPORT_TYPE_H
 
-#include "core/enum_type.hpp"
-
 /** Type for the company global vehicle unit number. */
 typedef uint16_t UnitID;
 

src/video/dedicated_v.cpp

@@ -19,7 +19,6 @@
 #include "../fios.h"
 #include "../blitter/factory.hpp"
 #include "../company_func.h"
-#include "../core/random_func.hpp"
 #include "../saveload/saveload.h"
 #include "../thread.h"
 #include "../window_func.h"

src/video/sdl2_default_v.cpp

@@ -16,8 +16,6 @@
 #include "../network/network.h"
 #include "../thread.h"
 #include "../progress.h"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
 #include "../core/geometry_func.hpp"
 #include "../fileio_func.h"
 #include "../framerate_type.h"

src/video/sdl2_opengl_v.cpp

@@ -19,9 +19,6 @@
 #include "../network/network.h"
 #include "../thread.h"
 #include "../progress.h"
-#include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/geometry_func.hpp"
 #include "../fileio_func.h"
 #include "../framerate_type.h"
 #include "../window_func.h"

src/video/sdl2_v.cpp

@@ -13,7 +13,6 @@
 #include "../blitter/factory.hpp"
 #include "../thread.h"
 #include "../progress.h"
-#include "../core/random_func.hpp"
 #include "../core/math_func.hpp"
 #include "../core/geometry_func.hpp"
 #include "../core/utf8.hpp"

src/widget_type.h

@@ -10,7 +10,6 @@
 #ifndef WIDGET_TYPE_H
 #define WIDGET_TYPE_H
 
-#include "core/bitmath_func.hpp"
 #include "core/math_func.hpp"
 #include "strings_type.h"
 #include "gfx_type.h"