diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index c2757427f5..2b3036c8ef 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -15,7 +15,6 @@
 #include "../debug.h"
 #include "../string_func.h"
 #include "../rev.h"
-#include <set>
 
 #include "../safeguards.h"
 
diff --git a/src/blitter/factory.hpp b/src/blitter/factory.hpp
index 554f1e4292..77911fc31c 100644
--- a/src/blitter/factory.hpp
+++ b/src/blitter/factory.hpp
@@ -13,7 +13,6 @@
 #include "base.hpp"
 #include "../debug.h"
 #include "../string_func.h"
-#include <map>
 
 
 /**
diff --git a/src/cargomonitor.h b/src/cargomonitor.h
index 31053c46cb..0891bf88b1 100644
--- a/src/cargomonitor.h
+++ b/src/cargomonitor.h
@@ -15,7 +15,6 @@
 #include "industry.h"
 #include "town.h"
 #include "core/overflowsafe_type.hpp"
-#include <map>
 
 struct Station;
 
diff --git a/src/cargopacket.h b/src/cargopacket.h
index 9aacfed57c..c4ba7e5cf6 100644
--- a/src/cargopacket.h
+++ b/src/cargopacket.h
@@ -18,7 +18,6 @@
 #include "vehicle_type.h"
 #include "core/multimap.hpp"
 #include "saveload/saveload.h"
-#include <list>
 
 /** Unique identifier for a single cargo packet. */
 typedef uint32 CargoPacketID;
diff --git a/src/command.cpp b/src/command.cpp
index a8efcebb23..8be2de9872 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -59,8 +59,6 @@
 #include "misc/endian_buffer.hpp"
 #include "string_func.h"
 
-#include <array>
-
 #include "table/strings.h"
 
 #include "safeguards.h"
diff --git a/src/company_base.h b/src/company_base.h
index d41da57f45..dd7521c4a8 100644
--- a/src/company_base.h
+++ b/src/company_base.h
@@ -17,7 +17,6 @@
 #include "timer/timer_game_calendar.h"
 #include "settings_type.h"
 #include "group.h"
-#include <array>
 
 /** Statistics about the economy. */
 struct CompanyEconomyEntry {
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index c9d91b8fe4..1d4e9b29c7 100644
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -22,7 +22,6 @@
 #include "video/video_driver.hpp"
 #include "timer/timer.h"
 #include "timer/timer_window.h"
-#include <deque>
 
 #include "widgets/console_widget.h"
 
diff --git a/src/console_internal.h b/src/console_internal.h
index 80752a08eb..19e798c19e 100644
--- a/src/console_internal.h
+++ b/src/console_internal.h
@@ -11,7 +11,6 @@
 #define CONSOLE_INTERNAL_H
 
 #include "gfx_type.h"
-#include <map>
 
 static const uint ICON_CMDLN_SIZE     = 1024; ///< maximum length of a typed in command
 static const uint ICON_MAX_STREAMSIZE = 2048; ///< maximum length of a totally expanded command
diff --git a/src/core/multimap.hpp b/src/core/multimap.hpp
index 026488b355..9a646414d1 100644
--- a/src/core/multimap.hpp
+++ b/src/core/multimap.hpp
@@ -10,9 +10,6 @@
 #ifndef MULTIMAP_HPP
 #define MULTIMAP_HPP
 
-#include <map>
-#include <list>
-
 template<typename Tkey, typename Tvalue, typename Tcompare>
 class MultiMap;
 
diff --git a/src/driver.h b/src/driver.h
index 4caf825c88..91287fbdb2 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -12,7 +12,6 @@
 
 #include "core/enum_type.hpp"
 #include "string_type.h"
-#include <map>
 
 const char *GetDriverParam(const StringList &parm, const char *name);
 bool GetDriverParamBool(const StringList &parm, const char *name);
diff --git a/src/error.h b/src/error.h
index cac0c503bf..88ec12e9f6 100644
--- a/src/error.h
+++ b/src/error.h
@@ -10,7 +10,6 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include <list>
 #include "strings_type.h"
 #include "company_type.h"
 #include "command_type.h"
diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index 6e076940ca..117a9db8ee 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -27,7 +27,6 @@
 #include "widgets/error_widget.h"
 
 #include "table/strings.h"
-#include <list>
 
 #include "safeguards.h"
 
diff --git a/src/fileio.cpp b/src/fileio.cpp
index f0bef68d7c..92707b58e4 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -25,7 +25,6 @@
 #include <pwd.h>
 #endif
 #include <sys/stat.h>
-#include <array>
 #include <sstream>
 
 #include "safeguards.h"
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index db3b53e259..f6c9bd952c 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -13,7 +13,6 @@
 #include "game_info.hpp"
 #include "game_scanner.hpp"
 #include "../debug.h"
-#include <set>
 
 #include "../safeguards.h"
 
diff --git a/src/gamelog_internal.h b/src/gamelog_internal.h
index f1e4b7fb59..bd8957a54c 100644
--- a/src/gamelog_internal.h
+++ b/src/gamelog_internal.h
@@ -11,7 +11,6 @@
 #define GAMELOG_INTERNAL_H
 
 #include "gamelog.h"
-#include <iterator>
 
 /**
  * Information about the presence of a Grf at a certain point during gamelog history
diff --git a/src/gfx_layout.h b/src/gfx_layout.h
index 645311f1da..f66bebefa0 100644
--- a/src/gfx_layout.h
+++ b/src/gfx_layout.h
@@ -14,7 +14,6 @@
 #include "gfx_func.h"
 #include "core/smallmap_type.hpp"
 
-#include <map>
 #include <stack>
 #include <string_view>
 
diff --git a/src/gfx_layout_icu.cpp b/src/gfx_layout_icu.cpp
index 12bf5d28b2..730df125bd 100644
--- a/src/gfx_layout_icu.cpp
+++ b/src/gfx_layout_icu.cpp
@@ -24,8 +24,6 @@
 #include <hb.h>
 #include <hb-ft.h>
 
-#include <deque>
-
 #include "safeguards.h"
 
 /** harfbuzz doesn't use floats, so we need a value to scale position with to get sub-pixel precision. */
diff --git a/src/industrytype.h b/src/industrytype.h
index 79635baaed..8d151e2100 100644
--- a/src/industrytype.h
+++ b/src/industrytype.h
@@ -10,7 +10,6 @@
 #ifndef INDUSTRYTYPE_H
 #define INDUSTRYTYPE_H
 
-#include <array>
 #include "map_type.h"
 #include "slope_type.h"
 #include "industry_type.h"
diff --git a/src/landscape.cpp b/src/landscape.cpp
index 3bced4eef5..b151365858 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -36,9 +36,6 @@
 #include "landscape_cmd.h"
 #include "terraform_cmd.h"
 #include "station_func.h"
-#include <array>
-#include <list>
-#include <set>
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/linkgraph/linkgraph_gui.h b/src/linkgraph/linkgraph_gui.h
index 226cd6b265..04f45c96e4 100644
--- a/src/linkgraph/linkgraph_gui.h
+++ b/src/linkgraph/linkgraph_gui.h
@@ -15,7 +15,6 @@
 #include "../widget_type.h"
 #include "../window_gui.h"
 #include "linkgraph_base.h"
-#include <map>
 
 /**
  * Monthly statistics for a link between two stations.
diff --git a/src/linkgraph/linkgraphjob.h b/src/linkgraph/linkgraphjob.h
index 5d7b8ebef2..2c2e9a86cc 100644
--- a/src/linkgraph/linkgraphjob.h
+++ b/src/linkgraph/linkgraphjob.h
@@ -12,7 +12,6 @@
 
 #include "../thread.h"
 #include "linkgraph.h"
-#include <list>
 #include <atomic>
 
 class LinkGraphJob;
diff --git a/src/linkgraph/mcf.cpp b/src/linkgraph/mcf.cpp
index c7b5d6d075..508e9616b9 100644
--- a/src/linkgraph/mcf.cpp
+++ b/src/linkgraph/mcf.cpp
@@ -3,7 +3,6 @@
 #include "../stdafx.h"
 #include "../core/math_func.hpp"
 #include "mcf.h"
-#include <set>
 
 #include "../safeguards.h"
 
diff --git a/src/linkgraph/refresh.h b/src/linkgraph/refresh.h
index 097a3577c6..15a9796e5e 100644
--- a/src/linkgraph/refresh.h
+++ b/src/linkgraph/refresh.h
@@ -12,8 +12,6 @@
 
 #include "../cargo_type.h"
 #include "../vehicle_base.h"
-#include <map>
-#include <set>
 
 /**
  * Utility to refresh links a consist will visit.
diff --git a/src/misc/dbg_helpers.h b/src/misc/dbg_helpers.h
index a024b9dd2e..5317b77d30 100644
--- a/src/misc/dbg_helpers.h
+++ b/src/misc/dbg_helpers.h
@@ -10,7 +10,6 @@
 #ifndef DBG_HELPERS_H
 #define DBG_HELPERS_H
 
-#include <map>
 #include <stack>
 
 #include "../direction_type.h"
diff --git a/src/misc/lrucache.hpp b/src/misc/lrucache.hpp
index 2c474c2a84..3adedbefd4 100644
--- a/src/misc/lrucache.hpp
+++ b/src/misc/lrucache.hpp
@@ -11,7 +11,6 @@
 #define LRUCACHE_HPP
 
 #include <utility>
-#include <list>
 #include <unordered_map>
 
 /**
diff --git a/src/network/core/tcp.h b/src/network/core/tcp.h
index 252f2c2456..0a770d30eb 100644
--- a/src/network/core/tcp.h
+++ b/src/network/core/tcp.h
@@ -17,7 +17,6 @@
 
 #include <atomic>
 #include <chrono>
-#include <map>
 #include <thread>
 
 /** The states of sending the packets. */
diff --git a/src/network/core/tcp_connect.cpp b/src/network/core/tcp_connect.cpp
index 17c1de886f..9e96240774 100644
--- a/src/network/core/tcp_connect.cpp
+++ b/src/network/core/tcp_connect.cpp
@@ -16,8 +16,6 @@
 #include "../network_coordinator.h"
 #include "../network_internal.h"
 
-#include <deque>
-
 #include "../../safeguards.h"
 
 /** List of connections that are currently being created */
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index cf04ebcef9..aadee357e0 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -28,8 +28,6 @@
 
 #include "table/strings.h"
 
-#include <deque>
-
 #include "../safeguards.h"
 
 /** The draw buffer must be able to contain the chat message, client name and the "[All]" message,
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 06fee00798..30b3bde67a 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -51,7 +51,6 @@
 #include "../water_cmd.h"
 #include "../waypoint_cmd.h"
 #include "../script/script_cmd.h"
-#include <array>
 
 #include "../safeguards.h"
 
diff --git a/src/network/network_coordinator.h b/src/network/network_coordinator.h
index 3977c4e634..453ee938c5 100644
--- a/src/network/network_coordinator.h
+++ b/src/network/network_coordinator.h
@@ -13,7 +13,6 @@
 #include "core/tcp_coordinator.h"
 #include "network_stun.h"
 #include "network_turn.h"
-#include <map>
 
 /**
  * Game Coordinator communication.
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 68c00b15b1..0345eefd69 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -52,8 +52,6 @@
 #	include <emscripten.h>
 #endif
 
-#include <map>
-
 #include "../safeguards.h"
 
 static void ShowNetworkStartServerWindow();
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index ed619c8a98..a89c47f12b 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -41,7 +41,6 @@
 #include "timer/timer_game_calendar.h"
 #include "string_func.h"
 #include "network/core/config.h"
-#include <map>
 #include "smallmap_gui.h"
 #include "genworld.h"
 #include "error.h"
diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp
index f2e15f68bd..32543a3388 100644
--- a/src/newgrf_generic.cpp
+++ b/src/newgrf_generic.cpp
@@ -14,7 +14,6 @@
 #include "core/random_func.hpp"
 #include "newgrf_sound.h"
 #include "water_map.h"
-#include <list>
 
 #include "safeguards.h"
 
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 2f3e5d2f09..9e8449834f 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -36,7 +36,6 @@
 
 #include "table/sprites.h"
 
-#include <map>
 #include "safeguards.h"
 
 /**
diff --git a/src/newgrf_storage.cpp b/src/newgrf_storage.cpp
index a0130f829a..d333a939f8 100644
--- a/src/newgrf_storage.cpp
+++ b/src/newgrf_storage.cpp
@@ -12,7 +12,6 @@
 #include "core/pool_func.hpp"
 #include "core/endian_func.hpp"
 #include "debug.h"
-#include <set>
 
 #include "safeguards.h"
 
diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp
index 3fe0d49b51..0e30cde965 100644
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -17,8 +17,6 @@
 
 #include "stdafx.h"
 
-#include <array>
-
 #include "newgrf.h"
 #include "strings_func.h"
 #include "newgrf_storage.h"
@@ -31,7 +29,6 @@
 #include "core/smallmap_type.hpp"
 #include "language.h"
 #include <sstream>
-#include <map>
 
 #include "table/strings.h"
 #include "table/control_codes.h"
diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm
index 452b151e9c..9db5cd049f 100644
--- a/src/os/macosx/macos.mm
+++ b/src/os/macosx/macos.mm
@@ -14,7 +14,6 @@
 #include "../../string_func.h"
 #include "../../fileio_func.h"
 #include <pthread.h>
-#include <array>
 
 #define Rect  OTTDRect
 #define Point OTTDPoint
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index b1040d1d5f..b941e642ac 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include "../../language.h"
 #include "../../thread.h"
-#include <array>
 
 #include "../../safeguards.h"
 
diff --git a/src/roadveh.h b/src/roadveh.h
index 79ff9dbe0c..4881bb6b20 100644
--- a/src/roadveh.h
+++ b/src/roadveh.h
@@ -17,7 +17,6 @@
 #include "road.h"
 #include "road_map.h"
 #include "newgrf_engine.h"
-#include <deque>
 
 struct RoadVehicle;
 
diff --git a/src/saveload/map_sl.cpp b/src/saveload/map_sl.cpp
index 2809ad9cfd..fd0ccaea79 100644
--- a/src/saveload/map_sl.cpp
+++ b/src/saveload/map_sl.cpp
@@ -15,7 +15,6 @@
 #include "../map_func.h"
 #include "../core/bitmath_func.hpp"
 #include "../fios.h"
-#include <array>
 
 #include "../safeguards.h"
 
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp
index 303c05f6e0..55a03cd846 100644
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -33,7 +33,6 @@
 #include "../timer/timer_game_calendar.h"
 #include "saveload_internal.h"
 #include "oldloader.h"
-#include <array>
 
 #include "table/strings.h"
 #include "../table/engines.h"
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index dfde9e911f..ead719c94f 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -43,7 +43,6 @@
 #include "../fios.h"
 #include "../error.h"
 #include <atomic>
-#include <deque>
 #ifdef __EMSCRIPTEN__
 #	include <emscripten.h>
 #endif
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index 1026fa5482..a940bc1c6d 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -23,8 +23,6 @@
 #include "../company_func.h"
 #include "../disaster_vehicle.h"
 
-#include <map>
-
 #include "../safeguards.h"
 
 /**
diff --git a/src/script/api/script_controller.hpp b/src/script/api/script_controller.hpp
index 58419fafb3..1a26c006d4 100644
--- a/src/script/api/script_controller.hpp
+++ b/src/script/api/script_controller.hpp
@@ -11,7 +11,6 @@
 #define SCRIPT_CONTROLLER_HPP
 
 #include "script_types.hpp"
-#include <map>
 
 /**
  * The Controller, the class each Script should extend. It creates the Script,
diff --git a/src/script/api/script_error.hpp b/src/script/api/script_error.hpp
index 601e99dd0f..0fe7d92d56 100644
--- a/src/script/api/script_error.hpp
+++ b/src/script/api/script_error.hpp
@@ -12,7 +12,6 @@
 
 #include "script_object.hpp"
 #include "script_companymode.hpp"
-#include <map>
 
 /**
  * Helper to write precondition enforcers for the script API in an abbreviated manner.
diff --git a/src/script/api/script_list.hpp b/src/script/api/script_list.hpp
index 52bfd64487..a4793500e6 100644
--- a/src/script/api/script_list.hpp
+++ b/src/script/api/script_list.hpp
@@ -12,8 +12,6 @@
 #define SCRIPT_LIST_HPP
 
 #include "script_object.hpp"
-#include <map>
-#include <set>
 
 class ScriptListSorter;
 
diff --git a/src/script/api/script_log_types.hpp b/src/script/api/script_log_types.hpp
index b10ea0cea3..d868f9d120 100644
--- a/src/script/api/script_log_types.hpp
+++ b/src/script/api/script_log_types.hpp
@@ -10,8 +10,6 @@
 #ifndef SCRIPT_LOG_TYPES_HPP
 #define SCRIPT_LOG_TYPES_HPP
 
-#include <deque>
-
 namespace ScriptLogTypes {
 	/**
 	 * Log levels; The value is also feed to Debug() lvl.
diff --git a/src/script/script_config.hpp b/src/script/script_config.hpp
index 4b809e9602..baaef05e3e 100644
--- a/src/script/script_config.hpp
+++ b/src/script/script_config.hpp
@@ -10,8 +10,6 @@
 #ifndef SCRIPT_CONFIG_HPP
 #define SCRIPT_CONFIG_HPP
 
-#include <map>
-#include <list>
 #include "../core/smallmap_type.hpp"
 #include "../company_type.h"
 #include "../textfile_gui.h"
diff --git a/src/script/script_instance.hpp b/src/script/script_instance.hpp
index 3666db38bd..8273b67ed0 100644
--- a/src/script/script_instance.hpp
+++ b/src/script/script_instance.hpp
@@ -11,7 +11,6 @@
 #define SCRIPT_INSTANCE_HPP
 
 #include <variant>
-#include <list>
 #include <squirrel.h>
 #include "script_suspend.hpp"
 #include "script_log_types.hpp"
diff --git a/src/script/script_scanner.hpp b/src/script/script_scanner.hpp
index 707eade0cd..9b0ad6bf31 100644
--- a/src/script/script_scanner.hpp
+++ b/src/script/script_scanner.hpp
@@ -10,7 +10,6 @@
 #ifndef SCRIPT_SCANNER_HPP
 #define SCRIPT_SCANNER_HPP
 
-#include <map>
 #include "../fileio_func.h"
 #include "../string_func.h"
 
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index 7e656d0a08..3154ef096c 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -20,7 +20,6 @@
 #include "../core/alloc_func.hpp"
 
 #include <stdarg.h>
-#include <map>
 
 /**
  * In the memory allocator for Squirrel we want to directly use malloc/realloc, so when the OS
diff --git a/src/settings_table.h b/src/settings_table.h
index d662b6a576..062beca07d 100644
--- a/src/settings_table.h
+++ b/src/settings_table.h
@@ -12,7 +12,6 @@
 #ifndef SETTINGS_TABLE_H
 #define SETTINGS_TABLE_H
 
-#include <array>
 #include "settings_internal.h"
 
 extern SettingTable _company_settings;
diff --git a/src/ship.h b/src/ship.h
index ec8a47e63f..3a9ea806af 100644
--- a/src/ship.h
+++ b/src/ship.h
@@ -10,8 +10,6 @@
 #ifndef SHIP_H
 #define SHIP_H
 
-#include <deque>
-
 #include "vehicle_base.h"
 #include "water_map.h"
 
diff --git a/src/station_base.h b/src/station_base.h
index bd7f00b9f9..45c85c04c2 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -18,8 +18,6 @@
 #include "linkgraph/linkgraph_type.h"
 #include "newgrf_storage.h"
 #include "bitmap_type.h"
-#include <map>
-#include <set>
 
 static const byte INITIAL_STATION_RATING = 175;
 
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 46db6601e4..4a8cf9b958 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -37,8 +37,6 @@
 
 #include "table/strings.h"
 
-#include <set>
-
 #include "safeguards.h"
 
 /**
diff --git a/src/station_type.h b/src/station_type.h
index 7696c0f087..8056feb57e 100644
--- a/src/station_type.h
+++ b/src/station_type.h
@@ -12,7 +12,6 @@
 
 #include "core/smallstack_type.hpp"
 #include "tilearea_type.h"
-#include <set>
 
 typedef uint16 StationID;
 typedef uint16 RoadStopID;
diff --git a/src/stdafx.h b/src/stdafx.h
index bb803d74cf..74bd6601f0 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -53,6 +53,7 @@
 #endif
 
 #include <algorithm>
+#include <array>
 #include <cassert>
 #include <cctype>
 #include <cerrno>
@@ -65,12 +66,16 @@
 #include <cstring>
 #include <cstdlib>
 #include <cwchar>
+#include <deque>
 #include <exception>
 #include <functional>
 #include <iterator>
+#include <list>
 #include <limits>
+#include <map>
 #include <memory>
 #include <optional>
+#include <set>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
diff --git a/src/tar_type.h b/src/tar_type.h
index 56f6224fcc..69f8f04c4a 100644
--- a/src/tar_type.h
+++ b/src/tar_type.h
@@ -10,9 +10,6 @@
 #ifndef TAR_TYPE_H
 #define TAR_TYPE_H
 
-#include <map>
-#include <array>
-
 #include "fileio_type.h"
 
 
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index dbcd3ccbbc..d42227d3f1 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -22,9 +22,6 @@
 
 #include "table/strings.h"
 
-#include <map>
-#include <set>
-
 #include "safeguards.h"
 
 /** Set of tiles. */
diff --git a/src/tests/landscape_partial_pixel_z.cpp b/src/tests/landscape_partial_pixel_z.cpp
index f5c22786f7..7dc25bb083 100644
--- a/src/tests/landscape_partial_pixel_z.cpp
+++ b/src/tests/landscape_partial_pixel_z.cpp
@@ -13,7 +13,6 @@
 
 #include "../landscape.h"
 #include "../slope_func.h"
-#include <array>
 
 /**
  * Check whether the addition of two slope's GetPartialPixelZ values results in
diff --git a/src/tests/string_func.cpp b/src/tests/string_func.cpp
index a8ddd56711..17c153cde9 100644
--- a/src/tests/string_func.cpp
+++ b/src/tests/string_func.cpp
@@ -12,7 +12,6 @@
 #include "../3rdparty/catch2/catch.hpp"
 
 #include "../string_func.h"
-#include <array>
 
 /**** String compare/equals *****/
 
diff --git a/src/timer/timer_manager.h b/src/timer/timer_manager.h
index 8d1200abea..56af0bdee8 100644
--- a/src/timer/timer_manager.h
+++ b/src/timer/timer_manager.h
@@ -13,8 +13,6 @@
 
 #include "stdafx.h"
 
-#include <set>
-
 template <typename TTimerType>
 class BaseTimer;
 
diff --git a/src/town.h b/src/town.h
index 0a9711a45d..c8be077d22 100644
--- a/src/town.h
+++ b/src/town.h
@@ -16,7 +16,6 @@
 #include "subsidy_type.h"
 #include "newgrf_storage.h"
 #include "cargotype.h"
-#include <list>
 
 template <typename T>
 struct BuildingCounts {
diff --git a/src/townname_type.h b/src/townname_type.h
index 45290bc046..6012af3fbd 100644
--- a/src/townname_type.h
+++ b/src/townname_type.h
@@ -16,7 +16,6 @@
 #include "newgrf_townname.h"
 #include "town_type.h"
 #include "string_type.h"
-#include <set>
 
 typedef std::set<std::string> TownNames;
 
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index 7323508294..f7c4282e0d 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -24,8 +24,6 @@
 #include "network/network.h"
 #include "saveload/saveload.h"
 #include "timer/timer_game_calendar.h"
-#include <list>
-#include <map>
 
 const uint TILE_AXIAL_DISTANCE = 192;  // Logical length of the tile in any DiagDirection used in vehicle movement.
 const uint TILE_CORNER_DISTANCE = 128;  // Logical length of the tile corner crossing in any non-diagonal direction used in vehicle movement.
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 54602e12aa..568377710f 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -44,7 +44,6 @@
 
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <sys/time.h> /* gettimeofday */
-#include <array>
 
 /* The 10.12 SDK added new names for some enum constants and
  * deprecated the old ones. As there's no functional change in any
diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm
index 445d412303..88361dbc7a 100644
--- a/src/video/cocoa/cocoa_wnd.mm
+++ b/src/video/cocoa/cocoa_wnd.mm
@@ -34,7 +34,6 @@
 #include "../../window_gui.h"
 #include "../../spritecache.h"
 #include "../../toolbar_gui.h"
-#include <array>
 
 #include "table/sprites.h"
 
diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp
index b0176f19ad..c5e82425c3 100644
--- a/src/video/opengl.cpp
+++ b/src/video/opengl.cpp
@@ -36,7 +36,6 @@
 #include "../debug.h"
 #include "../blitter/factory.hpp"
 #include "../zoom_func.h"
-#include <array>
 #include <numeric>
 
 #include "../table/opengl_shader.h"
diff --git a/src/viewport.cpp b/src/viewport.cpp
index e1b1508e66..185f8bf082 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -92,7 +92,6 @@
 #include "viewport_cmd.h"
 
 #include <forward_list>
-#include <map>
 #include <stack>
 
 #include "table/strings.h"
diff --git a/src/viewport_sprite_sorter_sse4.cpp b/src/viewport_sprite_sorter_sse4.cpp
index 3272645e5b..899dc37568 100644
--- a/src/viewport_sprite_sorter_sse4.cpp
+++ b/src/viewport_sprite_sorter_sse4.cpp
@@ -14,7 +14,6 @@
 #include "smmintrin.h"
 #include "viewport_sprite_sorter.h"
 #include <forward_list>
-#include <map>
 #include <stack>
 
 #include "safeguards.h"
diff --git a/src/widgets/slider_func.h b/src/widgets/slider_func.h
index 7de929512c..652a6c5c2d 100644
--- a/src/widgets/slider_func.h
+++ b/src/widgets/slider_func.h
@@ -13,8 +13,6 @@
 #include "../window_type.h"
 #include "../gfx_func.h"
 
-#include <map>
-
 void DrawSliderWidget(Rect r, int min_value, int max_value, int value, const std::map<int, StringID> &labels);
 bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int &value);
 
diff --git a/src/window_gui.h b/src/window_gui.h
index 7784c2dc8a..b36813aedf 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -10,8 +10,6 @@
 #ifndef WINDOW_GUI_H
 #define WINDOW_GUI_H
 
-#include <list>
-
 #include "vehiclelist.h"
 #include "vehicle_type.h"
 #include "viewport_type.h"