diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 8c0e13babc..6142901c49 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -21,6 +21,7 @@
 #include "ai_config.hpp"
 #include "ai_info.hpp"
 #include "../script/script_gui.h"
+
 #include "table/strings.h"
 
 #include "../safeguards.h"
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 7d8b38120c..0c0b961cd7 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -10,6 +10,8 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../error.h"
+#include "../company_base.h"
+#include "../company_func.h"
 
 #include "../script/squirrel_class.hpp"
 
@@ -22,15 +24,14 @@
 #include "ai_info.hpp"
 #include "ai_instance.hpp"
 
+#include "table/strings.h"
+
 /* Manually include the Text glue. */
 #include "../script/api/template/template_text.hpp.sq"
 
 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.hpp"
 
-#include "../company_base.h"
-#include "../company_func.h"
-
 #include "../safeguards.h"
 
 AIInstance::AIInstance() :
diff --git a/src/airport.cpp b/src/airport.cpp
index d835d15c49..1f40a2a9d6 100644
--- a/src/airport.cpp
+++ b/src/airport.cpp
@@ -9,6 +9,7 @@
 
 #include "stdafx.h"
 #include "station_base.h"
+
 #include "table/strings.h"
 #include "table/airport_movement.h"
 #include "table/airporttile_ids.h"
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index a0e750e9d1..8a799e74f9 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -38,6 +38,8 @@
 
 #include "widgets/airport_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 214d222eec..db82e13d58 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -33,6 +33,8 @@
 
 #include "widgets/autoreplace_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 static bool EngineNumberSorter(const GUIEngineListItem &a, const GUIEngineListItem &b)
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index 0b56ca159b..b2994d5eee 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -39,6 +39,7 @@
 #include "widgets/cheat_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 85573b9771..ba35aec715 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -49,6 +49,8 @@
 
 #include "widgets/company_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 54d2616066..6f4b9cf5d7 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -41,13 +41,14 @@
 #include "road.h"
 #include "rail.h"
 #include "game/game.hpp"
-#include "table/strings.h"
 #include "3rdparty/fmt/chrono.h"
 #include "company_cmd.h"
 #include "misc_cmd.h"
 
 #include <sstream>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /* scriptfile handling */
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
index e8452d4808..557816fb0c 100644
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -19,6 +19,8 @@
 
 #include "widgets/date_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/driver.cpp b/src/driver.cpp
index 1a180b148c..86a823b71d 100644
--- a/src/driver.cpp
+++ b/src/driver.cpp
@@ -16,10 +16,11 @@
 #include "strings_func.h"
 #include "video/video_driver.hpp"
 #include "string_func.h"
-#include "table/strings.h"
 #include "fileio_func.h"
 #include <sstream>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 std::string _ini_videodriver;        ///< The video driver a stored in the configuration file.
diff --git a/src/dropdown.cpp b/src/dropdown.cpp
index 64eb8e724c..02bf771d6d 100644
--- a/src/dropdown.cpp
+++ b/src/dropdown.cpp
@@ -20,6 +20,8 @@
 
 #include "widgets/dropdown_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 std::unique_ptr<DropDownListItem> MakeDropDownListDividerItem()
diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp
index 075af39c0a..daca369fc9 100644
--- a/src/framerate_gui.cpp
+++ b/src/framerate_gui.cpp
@@ -13,7 +13,6 @@
 #include "newgrf_sound.h"
 #include "window_gui.h"
 #include "window_func.h"
-#include "table/sprites.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "console_func.h"
@@ -31,6 +30,8 @@
 #include <atomic>
 #include <mutex>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 static std::mutex _sound_perf_lock;
diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp
index 308d14fdc5..cc042246fa 100644
--- a/src/game/game_gui.cpp
+++ b/src/game/game_gui.cpp
@@ -25,7 +25,8 @@
 #include "game_info.hpp"
 #include "../script/script_gui.h"
 #include "../script_config.hpp"
-#include "../table/strings.h"
+
+#include "table/strings.h"
 
 #include "../safeguards.h"
 
diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
index e2d18bf917..fa4617de82 100644
--- a/src/game/game_instance.cpp
+++ b/src/game/game_instance.cpp
@@ -21,6 +21,8 @@
 #include "game_text.hpp"
 #include "game.hpp"
 
+#include "table/strings.h"
+
 /* Convert all Game related classes to Squirrel data. */
 #include "../script/api/game/game_includes.hpp"
 
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 1cb8bec969..83fc6a0916 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -43,6 +43,8 @@
 #include "thread.h"
 #include "tgp.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 190119459f..9426a0577f 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -37,6 +37,8 @@
 
 #include "widgets/genworld_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index f13061c405..20eb26180f 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -34,6 +34,7 @@
 #include "widgets/group_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 
diff --git a/src/help_gui.cpp b/src/help_gui.cpp
index 990b0a2a67..242aedbfcb 100644
--- a/src/help_gui.cpp
+++ b/src/help_gui.cpp
@@ -20,6 +20,8 @@
 #include "widgets/help_widget.h"
 #include "widgets/misc_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 static const std::string README_FILENAME = "README.md";
diff --git a/src/highscore.cpp b/src/highscore.cpp
index 1520a1ac4d..943edab559 100644
--- a/src/highscore.cpp
+++ b/src/highscore.cpp
@@ -15,9 +15,10 @@
 #include "fileio_func.h"
 #include "string_func.h"
 #include "strings_func.h"
-#include "table/strings.h"
 #include "debug.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 HighScoresTable _highscore_table; ///< Table with all the high scores.
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
index f00ca6b003..fc71a31f79 100644
--- a/src/highscore_gui.cpp
+++ b/src/highscore_gui.cpp
@@ -9,7 +9,6 @@
 
 #include "stdafx.h"
 #include "highscore.h"
-#include "table/strings.h"
 #include "gfx_func.h"
 #include "table/sprites.h"
 #include "window_gui.h"
@@ -27,6 +26,8 @@
 
 #include "widgets/highscore_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 struct EndGameHighScoreBaseWindow : Window {
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index b658669984..4ec5b72670 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -24,6 +24,8 @@
 #include <signal.h>
 #include <sys/stat.h>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 #ifndef EXTERNAL_PLAYER
diff --git a/src/music/midifile.cpp b/src/music/midifile.cpp
index 5bc3dd3a2c..e0dd6521f2 100644
--- a/src/music/midifile.cpp
+++ b/src/music/midifile.cpp
@@ -18,6 +18,8 @@
 #include "../console_func.h"
 #include "../console_internal.h"
 
+#include "table/strings.h"
+
 /* SMF reader based on description at: http://www.somascape.org/midi/tech/mfile.html */
 
 
diff --git a/src/network/core/network_game_info.cpp b/src/network/core/network_game_info.cpp
index 8a48c8bb4a..ab6a25b1ff 100644
--- a/src/network/core/network_game_info.cpp
+++ b/src/network/core/network_game_info.cpp
@@ -27,6 +27,8 @@
 #include "../network_internal.h"
 #include "packet.h"
 
+#include "table/strings.h"
+
 #include "../../safeguards.h"
 
 
diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp
index 766a4894c3..c51f87ef8d 100644
--- a/src/network/core/tcp_content.cpp
+++ b/src/network/core/tcp_content.cpp
@@ -18,6 +18,8 @@
 #include "../../fios.h"
 #include "tcp_content.h"
 
+#include "table/strings.h"
+
 #include "../../safeguards.h"
 
 /**
diff --git a/src/network/core/tcp_listen.h b/src/network/core/tcp_listen.h
index 6e6d95e5da..8af0cbe23e 100644
--- a/src/network/core/tcp_listen.h
+++ b/src/network/core/tcp_listen.h
@@ -16,6 +16,7 @@
 #include "../network.h"
 #include "../../core/pool_type.hpp"
 #include "../../debug.h"
+
 #include "table/strings.h"
 
 /**
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 79b7667351..166bbf4d16 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -44,6 +44,8 @@
 #include <sstream>
 #include <iomanip>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 #ifdef DEBUG_DUMP_COMMANDS
diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp
index c8a2295b94..0175212a6b 100644
--- a/src/network/network_admin.cpp
+++ b/src/network/network_admin.cpp
@@ -23,6 +23,8 @@
 #include "../rev.h"
 #include "../game/game.hpp"
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 82e511613e..cf83e923e9 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -40,14 +40,13 @@
 #include "../timer/timer_window.h"
 #include "../timer/timer_game_calendar.h"
 #include "../textfile_gui.h"
+#include "../stringfilter_type.h"
 
 #include "../widgets/network_widget.h"
 
 #include "table/strings.h"
 #include "../table/sprites.h"
 
-#include "../stringfilter_type.h"
-
 #ifdef __EMSCRIPTEN__
 #	include <emscripten.h>
 #endif
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index eaa5e93ace..6247807a39 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -37,6 +37,8 @@
 #include <mutex>
 #include <condition_variable>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 59ca4a5bb3..4b0edb0165 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -26,6 +26,7 @@
 #include "../rev.h"
 #include "../newgrf_text.h"
 #include "../strings_func.h"
+
 #include "table/strings.h"
 
 #include "core/udp.h"
diff --git a/src/newgrf_airport.cpp b/src/newgrf_airport.cpp
index 7d5ad89f1c..2265e4c4bd 100644
--- a/src/newgrf_airport.cpp
+++ b/src/newgrf_airport.cpp
@@ -17,6 +17,8 @@
 #include "newgrf_class_func.h"
 #include "town.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /**
diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp
index 8f5650d69e..633543eb12 100644
--- a/src/newgrf_airporttiles.cpp
+++ b/src/newgrf_airporttiles.cpp
@@ -18,9 +18,10 @@
 #include "landscape.h"
 #include "company_base.h"
 #include "town.h"
+#include "newgrf_animation_base.h"
+
 #include "table/strings.h"
 #include "table/airporttiles.h"
-#include "newgrf_animation_base.h"
 
 #include "safeguards.h"
 
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 45e496a940..7c8a283a8b 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -36,6 +36,7 @@
 #include "widgets/misc_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp
index 15fb5300af..7919c342d1 100644
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -24,6 +24,8 @@
 #include "water.h"
 #include "newgrf_animation_base.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /** The override manager for our objects. */
diff --git a/src/newgrf_roadstop.cpp b/src/newgrf_roadstop.cpp
index 7ebec4340d..e31f193a9c 100644
--- a/src/newgrf_roadstop.cpp
+++ b/src/newgrf_roadstop.cpp
@@ -26,6 +26,8 @@
 #include "newgrf_animation_base.h"
 #include "newgrf_sound.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 template <>
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index 0b56a0ddc6..04628f962b 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -26,6 +26,8 @@
 #include "newgrf_class_func.h"
 #include "timer/timer_game_calendar.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 04326c6f0f..208711a7ff 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -81,6 +81,8 @@
 
 #include <system_error>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 #ifdef __EMSCRIPTEN__
diff --git a/src/order_backup.cpp b/src/order_backup.cpp
index 401944cb0e..f71b46d29d 100644
--- a/src/order_backup.cpp
+++ b/src/order_backup.cpp
@@ -20,6 +20,8 @@
 #include "group_cmd.h"
 #include "vehicle_func.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 OrderBackupPool _order_backup_pool("BackupOrder");
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 1e68a0d948..b128c38e31 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -37,6 +37,8 @@
 
 #include "widgets/order_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/picker_gui.cpp b/src/picker_gui.cpp
index d83ec9d9a4..05107066fa 100644
--- a/src/picker_gui.cpp
+++ b/src/picker_gui.cpp
@@ -32,6 +32,7 @@
 #include "widgets/picker_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include <charconv>
 
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 90718b064c..c1771ba735 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -48,6 +48,8 @@
 
 #include "widgets/rail_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 1d5b970be7..b73ff3669d 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -71,6 +71,8 @@
 
 #include <signal.h>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = CompanyID::Invalid());
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index 7f2fd62929..0152fdbf53 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -13,12 +13,10 @@
 #include "../string_func.h"
 #include "../settings_type.h"
 #include "../fileio_func.h"
-
-#include "table/strings.h"
-
 #include "saveload_internal.h"
 #include "oldloader.h"
 
+#include "table/strings.h"
 
 #include "../safeguards.h"
 
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index cfbb950de3..1dd460216f 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -45,6 +45,8 @@
 #include "../strings_type.h"
 #include "../newgrf_railtype.h"
 #include "../newgrf_roadtype.h"
+#include "saveload_internal.h"
+#include "saveload_filter.h"
 
 #include <atomic>
 #ifdef __EMSCRIPTEN__
@@ -53,9 +55,6 @@
 
 #include "table/strings.h"
 
-#include "saveload_internal.h"
-#include "saveload_filter.h"
-
 #include "../safeguards.h"
 
 extern const SaveLoadVersion SAVEGAME_VERSION = (SaveLoadVersion)(SL_MAX_VERSION - 1); ///< Current savegame version of OpenTTD.
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index 676d162195..ef8b401598 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -15,11 +15,10 @@
 #include "../town.h"
 #include "../newgrf.h"
 #include "../timer/timer_game_calendar.h"
+#include "saveload_internal.h"
 
 #include "table/strings.h"
 
-#include "saveload_internal.h"
-
 #include "../safeguards.h"
 
 using OldWaypointID = uint16_t;
diff --git a/src/script/api/script_basestation.cpp b/src/script/api/script_basestation.cpp
index f8a0d34c90..91ff72e152 100644
--- a/src/script/api/script_basestation.cpp
+++ b/src/script/api/script_basestation.cpp
@@ -16,6 +16,7 @@
 #include "../../station_cmd.h"
 #include "../../waypoint_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp
index 3236c863e8..eaf7b8325c 100644
--- a/src/script/api/script_bridge.cpp
+++ b/src/script/api/script_bridge.cpp
@@ -17,6 +17,7 @@
 #include "../../road_cmd.h"
 #include "../../tunnelbridge_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp
index 712daa6ed3..63c86a7695 100644
--- a/src/script/api/script_cargo.cpp
+++ b/src/script/api/script_cargo.cpp
@@ -13,6 +13,7 @@
 #include "../../core/bitmath_func.hpp"
 #include "../../strings_func.h"
 #include "../../settings_type.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp
index 9404b05b5a..577a9a96a2 100644
--- a/src/script/api/script_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -24,6 +24,7 @@
 #include "../../misc_cmd.h"
 #include "../../object_cmd.h"
 #include "../../settings_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp
index 305d55cf09..f13cf5654b 100644
--- a/src/script/api/script_engine.cpp
+++ b/src/script/api/script_engine.cpp
@@ -19,6 +19,7 @@
 #include "../../articulated_vehicles.h"
 #include "../../engine_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp
index bcb36871a1..541e124e38 100644
--- a/src/script/api/script_event_types.cpp
+++ b/src/script/api/script_event_types.cpp
@@ -19,6 +19,7 @@
 #include "../../economy_cmd.h"
 #include "../../engine_cmd.h"
 #include "../../3rdparty/nlohmann/json.hpp"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp
index a636316e30..352e78b28f 100644
--- a/src/script/api/script_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -19,6 +19,7 @@
 #include "../../autoreplace_cmd.h"
 #include "../../group_cmd.h"
 #include "../../settings_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp
index 74945bceba..b04e5a47a9 100644
--- a/src/script/api/script_industry.cpp
+++ b/src/script/api/script_industry.cpp
@@ -21,6 +21,7 @@
 #include "../../newgrf_industries.h"
 #include "../../industry_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp
index 0d4e71d07f..ea4cfddbb6 100644
--- a/src/script/api/script_sign.cpp
+++ b/src/script/api/script_sign.cpp
@@ -9,7 +9,6 @@
 
 #include "../../stdafx.h"
 #include "script_sign.hpp"
-#include "table/strings.h"
 #include "../script_instance.hpp"
 #include "../../signs_base.h"
 #include "../../string_func.h"
@@ -17,6 +16,8 @@
 #include "../../tile_map.h"
 #include "../../signs_cmd.h"
 
+#include "table/strings.h"
+
 #include "../../safeguards.h"
 
 /* static */ bool ScriptSign::IsValidSign(SignID sign_id)
diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp
index bf456dddb2..832851571b 100644
--- a/src/script/api/script_town.cpp
+++ b/src/script/api/script_town.cpp
@@ -18,6 +18,7 @@
 #include "../../station_base.h"
 #include "../../landscape.h"
 #include "../../town_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp
index efce579f62..0f491fb966 100644
--- a/src/script/api/script_vehicle.cpp
+++ b/src/script/api/script_vehicle.cpp
@@ -24,6 +24,7 @@
 #include "../../roadveh_cmd.h"
 #include "../../train_cmd.h"
 #include "../../vehicle_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
index a18538a823..1c84c493a0 100644
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -16,6 +16,8 @@
 #include "../string_func.h"
 #include <charconv>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 void ScriptConfig::Change(std::optional<std::string> name, int version, bool force_exact_match)
diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp
index 97c54cdc48..d92c069e5d 100644
--- a/src/script/script_gui.cpp
+++ b/src/script/script_gui.cpp
@@ -38,6 +38,7 @@
 #include "../game/game_config.hpp"
 #include "../game/game_info.hpp"
 #include "../game/game_instance.hpp"
+
 #include "table/strings.h"
 
 #include "../safeguards.h"
diff --git a/src/settingentry_gui.cpp b/src/settingentry_gui.cpp
index 5a4b97cf95..6ceeca0895 100644
--- a/src/settingentry_gui.cpp
+++ b/src/settingentry_gui.cpp
@@ -17,6 +17,7 @@
 #include "strings_func.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 1003501d25..6d71ceb20d 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -52,6 +52,8 @@
 #include "sound_func.h"
 #include "settingentry_gui.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp
index e2d4bdedc9..053a2120e5 100644
--- a/src/spriteloader/grf.cpp
+++ b/src/spriteloader/grf.cpp
@@ -12,7 +12,6 @@
 #include "../debug.h"
 #include "../settings_type.h"
 #include "../strings_func.h"
-#include "table/strings.h"
 #include "../error.h"
 #include "../core/math_func.hpp"
 #include "../core/alloc_type.hpp"
@@ -20,6 +19,8 @@
 #include "../spritecache.h"
 #include "grf.hpp"
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 extern const uint8_t _palmap_w2d[];
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 9011172856..74b56742bd 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -67,6 +67,8 @@
 #include "network/network_gui.h"
 #include "network/network_func.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 2126b767f5..ed9d4b6a98 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -46,6 +46,8 @@
 #include "hotkeys.h"
 #include "group_cmd.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 
diff --git a/src/window.cpp b/src/window.cpp
index d6df71359a..e40146bb33 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -39,6 +39,8 @@
 #include "timer/timer.h"
 #include "timer/timer_window.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /** Values for _settings_client.gui.auto_scrolling */