(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files

153 files changed, 3 insertions, 305 deletions

diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp
index 89b959015..7d6571c14 100644
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../settings_type.h"
-#include "../core/random_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
 #include "ai_info.hpp"
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index 16bf96dc6..6931accc7 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -16,15 +16,11 @@
 #include "../company_func.h"
 #include "../network/network.h"
 #include "../window_func.h"
-#include "../command_func.h"
-#include "../fileio_func.h"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
 #include "ai_info.hpp"
 #include "ai.hpp"
-#include "../script/script_storage.hpp"
-#include "../script/api/script_error.hpp"
 
 /* static */ uint AI::frame_counter = 0;
 /* static */ AIScannerInfo *AI::scanner_info = NULL;
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index f60233077..3620dfc75 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -14,7 +14,6 @@
 #include "../error.h"
 #include "../gui.h"
 #include "../querystring_gui.h"
-#include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
 #include "../strings_func.h"
@@ -24,7 +23,6 @@
 #include "../network/network.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
-#include "../core/backup_type.hpp"
 
 #include "ai.hpp"
 #include "../script/api/script_log.hpp"
@@ -36,7 +34,6 @@
 #include "../game/game_info.hpp"
 #include "../game/game_instance.hpp"
 
-#include "../widgets/ai_widget.h"
 
 #include "table/strings.h"
 
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 83bae7aad..ab5f5bde5 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -11,14 +11,11 @@
 
 #include "../stdafx.h"
 
-#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
-#include "../settings_type.h"
 #include "../debug.h"
 #include "../rev.h"
-#include "ai.hpp"
 
 /**
  * Check if the API version provided by the AI is supported.
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index cf7106b9c..6c71fef76 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../saveload/saveload.h"
 #include "../error.h"
 
 #include "../script/squirrel_class.hpp"
@@ -20,8 +19,6 @@
 #include "ai_gui.hpp"
 #include "ai.hpp"
 
-#include "../script/script_fatalerror.hpp"
-#include "../script/script_suspend.hpp"
 #include "../script/script_storage.hpp"
 #include "ai_info.hpp"
 #include "ai_instance.hpp"
diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index 3ab0b431e..64b877c6c 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -11,14 +11,12 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../fileio_func.h"
 #include "../network/network.h"
 #include "../core/random_func.hpp"
 
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
-#include "../script/api/script_controller.hpp"
 
 
 AIScannerInfo::AIScannerInfo() :
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 55ffefecf..b18b9c50e 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -16,7 +16,6 @@
 #include "aircraft.h"
 #include "landscape.h"
 #include "news_func.h"
-#include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "spritecache.h"
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index ae53afeab..e6591935c 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -27,11 +27,9 @@
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "vehicle_func.h"
-#include "sprite.h"
 
 #include "widgets/airport_widget.h"
 
-#include "table/strings.h"
 
 static AirportClassID _selected_airport_class; ///< the currently visible airport class
 static int _selected_airport_index;            ///< the index of the selected airport in the current class or -1
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index a9b678903..7a7d05a94 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -18,7 +18,6 @@
 #include "newgrf.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 static const uint MAX_ARTICULATED_PARTS = 100; ///< Maximum of articulated parts per vehicle, i.e. when to abort calling the articulated vehicle callback.
 
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index 264354085..87ff69449 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -17,7 +17,6 @@
 #include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
-#include "group.h"
 #include "articulated_vehicles.h"
 #include "core/random_func.hpp"
 
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 9456b0f4f..ba8f3b57b 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -13,7 +13,6 @@
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
-#include "group.h"
 #include "rail.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ -28,7 +27,6 @@
 
 #include "widgets/autoreplace_widget.h"
 
-#include "table/strings.h"
 
 uint GetEngineListHeight(VehicleType type);
 void DrawEngineList(VehicleType type, int x, int r, int y, const GUIEngineList *eng_list, uint16 min, uint16 max, EngineID selected_id, bool show_count, GroupID selected_group);
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index bb959524e..271cea284 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -10,7 +10,6 @@
 /** @file 32bpp_anim.cpp Implementation of the optimized 32 bpp blitter with animation support. */
 
 #include "../stdafx.h"
-#include "../core/math_func.hpp"
 #include "../video/video_driver.hpp"
 #include "32bpp_anim.hpp"
 
diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp
index 20335a7b0..fbbf7f055 100644
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../zoom_func.h"
 #include "../settings_type.h"
-#include "../core/math_func.hpp"
 #include "32bpp_optimized.hpp"
 
 /** Instantiation of the optimized 32bpp blitter factory. */
diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp
index 91b87829b..2b3e231b2 100644
--- a/src/bootstrap_gui.cpp
+++ b/src/bootstrap_gui.cpp
@@ -16,7 +16,6 @@
 #if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE)
 
 #include "core/geometry_func.hpp"
-#include "fileio_func.h"
 #include "fontcache.h"
 #include "gfx_func.h"
 #include "network/network.h"
@@ -25,7 +24,6 @@
 #include "strings_func.h"
 #include "video/video_driver.hpp"
 #include "window_func.h"
-#include "window_gui.h"
 
 #include "widgets/bootstrap_widget.h"
 
diff --git a/src/cargotype.cpp b/src/cargotype.cpp
index fb6583f2b..cc94c6621 100644
--- a/src/cargotype.cpp
+++ b/src/cargotype.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "cargotype.h"
-#include "core/bitmath_func.hpp"
 #include "newgrf_cargo.h"
 #include "string_func.h"
 #include "strings_func.h"
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index ab447a66b..aad1d8fe5 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -18,18 +18,15 @@
 #include "saveload/saveload.h"
 #include "textbuf_gui.h"
 #include "window_gui.h"
-#include "newgrf.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "rail_gui.h"
 #include "gui.h"
 #include "company_gui.h"
-#include "gamelog.h"
 
 #include "widgets/cheat_widget.h"
 
-#include "table/strings.h"
 #include "table/sprites.h"
 
 
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index 53b878939..f69c5d42b 100644
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -14,9 +14,6 @@
 #include "command_func.h"
 #include "landscape.h"
 #include "genworld.h"
-#include "landscape_type.h"
-#include "clear_func.h"
-#include "economy_func.h"
 #include "viewport_func.h"
 #include "water.h"
 #include "core/random_func.hpp"
diff --git a/src/command.cpp b/src/command.cpp
index 9f8d69cf6..713774491 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -17,9 +17,7 @@
 #include "network/network_type.h"
 #include "network/network.h"
 #include "genworld.h"
-#include "newgrf_storage.h"
 #include "strings_func.h"
-#include "gfx_func.h"
 #include "texteff.hpp"
 #include "town.h"
 #include "date_func.h"
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index ea15b074f..eba947298 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -10,7 +10,6 @@
 /** @file company_cmd.cpp Handling of companies. */
 
 #include "stdafx.h"
-#include "engine_base.h"
 #include "company_base.h"
 #include "company_func.h"
 #include "company_gui.h"
@@ -18,8 +17,6 @@
 #include "news_func.h"
 #include "cmd_helper.h"
 #include "command_func.h"
-#include "network/network.h"
-#include "network/network_func.h"
 #include "network/network_base.h"
 #include "network/network_admin.h"
 #include "ai/ai.hpp"
@@ -33,11 +30,9 @@
 #include "settings_func.h"
 #include "vehicle_base.h"
 #include "vehicle_func.h"
-#include "sprite.h"
 #include "smallmap_gui.h"
 #include "game/game.hpp"
 
-#include "table/strings.h"
 
 CompanyByte _local_company;   ///< Company controlled by the human player at this client. Can also be #COMPANY_SPECTATOR.
 CompanyByte _current_company; ///< Company currently doing an action.
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 3337a434a..6e24afa98 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -20,17 +20,14 @@
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "network/network_func.h"
-#include "vehicle_func.h"
 #include "newgrf.h"
 #include "company_manager_face.h"
 #include "strings_func.h"
 #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 "economy_func.h"
 #include "object_type.h"
 #include "rail.h"
 #include "engine_base.h"
@@ -41,7 +38,6 @@
 
 #include "widgets/company_widget.h"
 
-#include "table/strings.h"
 
 /** Company GUI constants. */
 static const uint EXP_LINESPACE  = 2;      ///< Amount of vertical space for a horizontal (sub-)total line.
diff --git a/src/console.cpp b/src/console.cpp
index 5ffc4ed52..c9c98169f 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -11,10 +11,7 @@
 
 #include "stdafx.h"
 #include "console_internal.h"
-#include "network/network.h"
-#include "network/network_func.h"
 #include "network/network_admin.h"
-#include "debug.h"
 #include "console_func.h"
 #include "settings_type.h"
 
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 05846c96f..04a1c6b8e 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -11,12 +11,9 @@
 
 #include "stdafx.h"
 #include "console_internal.h"
-#include "debug.h"
 #include "engine_func.h"
 #include "landscape.h"
 #include "saveload/saveload.h"
-#include "network/network.h"
-#include "network/network_func.h"
 #include "network/network_base.h"
 #include "network/network_admin.h"
 #include "network/network_client.h"
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
index 588c04b8e..83d1b05dd 100644
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -20,7 +20,6 @@
 #include "widgets/dropdown_type.h"
 #include "widgets/date_widget.h"
 
-#include "table/strings.h"
 
 /** Window to select a date graphically by using dropdowns */
 struct SetDateWindow : Window {
diff --git a/src/debug.cpp b/src/debug.cpp
index f7d31b89a..4d5340262 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -12,8 +12,6 @@
 #include "stdafx.h"
 #include <stdarg.h>
 #include "console_func.h"
-#include "debug.h"
-#include "string_func.h"
 #include "fileio_func.h"
 #include "settings_type.h"
 
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index d400f115d..4b040882e 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -18,10 +18,8 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "depot_base.h"
-#include "vehicle_gui.h"
 #include "spritecache.h"
 #include "strings_func.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
 #include "tilehighlight_func.h"
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index e4900d7c0..e7b864618 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -15,7 +15,6 @@
 #include "station_gui.h"
 #include "command_func.h"
 #include "water.h"
-#include "water_map.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
@@ -25,9 +24,7 @@
 #include "slope_func.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
-#include "station_type.h"
 #include "hotkeys.h"
-#include "bridge.h"
 
 #include "widgets/dock_widget.h"
 
diff --git a/src/economy.cpp b/src/economy.cpp
index 74f5552b8..01fd5b4a4 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -17,7 +17,6 @@
 #include "news_func.h"
 #include "network/network.h"
 #include "network/network_func.h"
-#include "vehicle_gui.h"
 #include "ai/ai.hpp"
 #include "aircraft.h"
 #include "newgrf_engine.h"
@@ -29,9 +28,7 @@
 #include "newgrf_station.h"
 #include "newgrf_airporttiles.h"
 #include "object.h"
-#include "group.h"
 #include "strings_func.h"
-#include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
@@ -44,7 +41,6 @@
 #include "waypoint_base.h"
 #include "economy_base.h"
 #include "core/pool_func.hpp"
-#include "newgrf.h"
 #include "core/backup_type.hpp"
 #include "water.h"
 #include "game/game.hpp"
diff --git a/src/effectvehicle.cpp b/src/effectvehicle.cpp
index 97ec93759..033d0bd2f 100644
--- a/src/effectvehicle.cpp
+++ b/src/effectvehicle.cpp
@@ -19,7 +19,6 @@
 #include "effectvehicle_func.h"
 #include "effectvehicle_base.h"
 
-#include "table/sprites.h"
 
 static void ChimneySmokeInit(EffectVehicle *v)
 {
diff --git a/src/engine.cpp b/src/engine.cpp
index 5fc32714c..2f0b31b98 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -16,7 +16,6 @@
 #include "aircraft.h"
 #include "newgrf.h"
 #include "newgrf_engine.h"
-#include "group.h"
 #include "strings_func.h"
 #include "core/random_func.hpp"
 #include "window_func.h"
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index c601c858b..61b5e25d8 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "window_gui.h"
-#include "gfx_func.h"
 #include "engine_base.h"
 #include "command_func.h"
 #include "strings_func.h"
diff --git a/src/game/game_config.cpp b/src/game/game_config.cpp
index cb12f68b8..a85c2f467 100644
--- a/src/game/game_config.cpp
+++ b/src/game/game_config.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../settings_type.h"
-#include "../core/random_func.hpp"
 #include "game.hpp"
 #include "game_config.hpp"
 #include "game_info.hpp"
diff --git a/src/game/game_core.cpp b/src/game/game_core.cpp
index 27dd63b54..566618040 100644
--- a/src/game/game_core.cpp
+++ b/src/game/game_core.cpp
@@ -10,14 +10,11 @@
 /** @file game_core.cpp Implementation of Game. */
 
 #include "../stdafx.h"
-#include "../command_func.h"
 #include "../core/backup_type.hpp"
-#include "../core/bitmath_func.hpp"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../network/network.h"
 #include "../window_func.h"
-#include "../fileio_func.h"
 #include "game.hpp"
 #include "game_scanner.hpp"
 #include "game_config.hpp"
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index ab4f4edc7..947973f4d 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -11,14 +11,10 @@
 
 #include "../stdafx.h"
 
-#include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "game_info.hpp"
 #include "game_scanner.hpp"
-#include "../settings_type.h"
 #include "../debug.h"
-#include "../rev.h"
-#include "game.hpp"
 
 /**
  * Check if the API version provided by the Game is supported.
diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
index 442f6e22b..5ab94d4ea 100644
--- a/src/game/game_instance.cpp
+++ b/src/game/game_instance.cpp
@@ -10,9 +10,7 @@
 /** @file game_instance.cpp Implementation of GameInstance. */
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "../error.h"
-#include "../saveload/saveload.h"
 
 #include "../script/squirrel_class.hpp"
 
diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp
index 056c1378a..f8c2b4f22 100644
--- a/src/game/game_scanner.cpp
+++ b/src/game/game_scanner.cpp
@@ -10,15 +10,10 @@
 /** @file game_scanner.cpp allows scanning Game scripts */
 
 #include "../stdafx.h"
-#include "../debug.h"
-#include "../fileio_func.h"
-#include "../network/network.h"
-#include "../core/random_func.hpp"
 
 #include "../script/squirrel_class.hpp"
 #include "game_info.hpp"
 #include "game_scanner.hpp"
-#include "../script/api/script_controller.hpp"
 
 
 void GameScannerInfo::Initialize()
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index 0b41579f3..4ffaa9e54 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -10,7 +10,6 @@
 /** @file game_text.cpp Implementation of handling translated strings. */
 
 #include "../stdafx.h"
-#include "../language.h"
 #include "../strgen/strgen.h"
 #include "../debug.h"
 #include "../fileio_func.h"
@@ -21,7 +20,6 @@
 
 #include "table/strings.h"
 
-#include <exception>
 #include <stdarg.h>
 
 void CDECL strgen_warning(const char *s, ...)
diff --git a/src/genworld.cpp b/src/genworld.cpp
index ca4f1ef6f..8594cd4e6 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -18,10 +18,8 @@
 #include "network/network.h"
 #include "heightmap.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "date_func.h"
 #include "engine_func.h"
-#include "newgrf_storage.h"
 #include "water.h"
 #include "video/video_driver.hpp"
 #include "tilehighlight_func.h"
@@ -36,7 +34,6 @@
 #include "game/game.hpp"
 #include "game/game_instance.hpp"
 
-#include "table/sprites.h"
 
 void GenerateClearTile();
 void GenerateIndustries();
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 05b0e7a80..3ce473e97 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -22,7 +22,6 @@
 #include "string_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
-#include "landscape_type.h"
 #include "querystring_gui.h"
 #include "town.h"
 #include "settings_func.h"
@@ -33,8 +32,6 @@
 
 #include "widgets/genworld_widget.h"
 
-#include "table/strings.h"
-#include "table/sprites.h"
 
 extern void MakeNewgameSettingsLive();
 
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 5bb6b38b6..5dcd9a09d 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -20,7 +20,6 @@
 #include "settings_type.h"
 #include "network/network.h"
 #include "network/network_func.h"
-#include "thread/thread.h"
 #include "window_func.h"
 #include "newgrf_debug.h"
 
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 0e4e2e89f..56d5aaf69 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -23,7 +23,6 @@
 #include "base_media_func.h"
 
 #include "table/sprites.h"
-#include "table/strings.h"
 
 /** Whether the given NewGRFs must get a palette remap from windows to DOS or not. */
 bool _palette_remap_grf[MAX_FILE_SLOTS];
diff --git a/src/goal.cpp b/src/goal.cpp
index 5a3433573..5659af20f 100644
--- a/src/goal.cpp
+++ b/src/goal.cpp
@@ -13,15 +13,9 @@
 #include "company_func.h"
 #include "industry.h"
 #include "town.h"
-#include "news_func.h"
-#include "ai/ai.hpp"
-#include "station_base.h"
-#include "cargotype.h"
-#include "strings_func.h"
 #include "window_func.h"
 #include "goal_base.h"
 #include "core/pool_func.hpp"
-#include "core/random_func.hpp"
 #include "game/game.hpp"
 #include "command_func.h"
 #include "company_base.h"
@@ -29,7 +23,6 @@
 #include "gui.h"
 #include "network/network.h"
 
-#include "table/strings.h"
 
 GoalID _new_goal_id;
 
diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index 089c8f0de..abfb5a452 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -16,7 +16,6 @@
 #include "strings_func.h"
 #include "date_func.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "gui.h"
 #include "goal_base.h"
 #include "core/geometry_func.hpp"
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index 8cc46b231..eacbfd614 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -22,13 +22,13 @@
 #include "gfx_func.h"
 #include "sortlist_type.h"
 #include "core/geometry_func.hpp"
-#include "math.h"
 #include "currency.h"
 
 #include "widgets/graph_widget.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
+#include <math.h>
 
 /* Bitmasks of company and cargo indices that shouldn't be drawn. */
 static uint _legend_excluded_companies;
diff --git a/src/ground_vehicle.cpp b/src/ground_vehicle.cpp
index 8641e78d9..27e9776b9 100644
--- a/src/ground_vehicle.cpp
+++ b/src/ground_vehicle.cpp
@@ -12,8 +12,6 @@
 #include "stdafx.h"
 #include "train.h"
 #include "roadveh.h"
-#include "vehicle_gui.h"
-#include "window_func.h"
 
 /**
  * Recalculates the cached total power of a vehicle. Should be called when the consist is changed.
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index e4205be43..029ea1e92 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -12,11 +12,8 @@
 #include "stdafx.h"
 #include "cmd_helper.h"
 #include "command_func.h"
-#include "group.h"
 #include "train.h"
-#include "vehicle_gui.h"
 #include "vehiclelist.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_base.h"
 #include "autoreplace_func.h"
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index d557a039f..2d90760ce 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -14,7 +14,6 @@
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "vehicle_base.h"
-#include "group.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ -29,7 +28,6 @@
 
 #include "widgets/group_widget.h"
 
-#include "table/strings.h"
 #include "table/sprites.h"
 
 typedef GUIList<const Group*> GUIGroupList;
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index 349e9f381..8a3effbd2 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -13,7 +13,7 @@
 #include "clear_map.h"
 #include "industry.h"
 #include "station_base.h"
-#include "train.h"
+#include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index f968d7826..ddf4f3c4a 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -17,7 +17,6 @@
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "industry.h"
 #include "town.h"
 #include "cheat_type.h"
@@ -40,7 +39,6 @@
 #include "widgets/industry_widget.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 
 bool _ignore_restrictions;
 uint64 _displayed_industries; ///< Communication from the industry chain window to the smallmap window about what industries to display.
diff --git a/src/ini_load.cpp b/src/ini_load.cpp
index 6a2087303..bc044511a 100644
--- a/src/ini_load.cpp
+++ b/src/ini_load.cpp
@@ -13,7 +13,6 @@
 #include "core/alloc_func.hpp"
 #include "core/mem_func.hpp"
 #include "ini_type.h"
-#include "string_func.h"
 
 /**
  * Construct a new in-memory item of an Ini file.
diff --git a/src/landscape.cpp b/src/landscape.cpp
index deff47ba0..7f4b1ed44 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -29,8 +29,6 @@
 #include "animated_tile_func.h"
 #include "core/random_func.hpp"
 #include "object_base.h"
-#include "water_map.h"
-#include "economy_func.h"
 #include "company_func.h"
 #include "pathfinder/npf/aystar.h"
 #include <list>
diff --git a/src/map.cpp b/src/map.cpp
index 823ff6d2d..1ee0ba247 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "debug.h"
 #include "core/alloc_func.hpp"
-#include "tile_map.h"
 #include "water_map.h"
 
 #if defined(_MSC_VER)
diff --git a/src/misc.cpp b/src/misc.cpp
index 5f05c9fe9..d82c456e0 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -16,7 +16,6 @@
 #include "ai/ai_gui.hpp"
 #include "newgrf.h"
 #include "newgrf_house.h"
-#include "group.h"
 #include "economy_func.h"
 #include "date_func.h"
 #include "texteff.hpp"
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 1bd488a46..c7b173f0e 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -14,8 +14,6 @@
 #include "landscape.h"
 #include "error.h"
 #include "gui.h"
-#include "viewport_func.h"
-#include "gfx_func.h"
 #include "command_func.h"
 #include "company_func.h"
 #include "town.h"
diff --git a/src/network/network.cpp b/src/network/network.cpp
index e4dafe096..0035c5105 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -37,7 +37,6 @@
 #include "../core/pool_func.hpp"
 #include "../gfx_func.h"
 #include "../error.h"
-#include "table/strings.h"
 
 #ifdef DEBUG_DUMP_COMMANDS
 #include "../fileio_func.h"
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 91dcb902b..5709386e3 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -14,12 +14,10 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../gfx_func.h"
 #include "../strings_func.h"
 #include "../blitter/factory.hpp"
 #include "../console_func.h"
 #include "../video/video_driver.hpp"
-#include "../table/sprites.h"
 #include "../querystring_gui.h"
 #include "../town.h"
 #include "../window_func.h"
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 0c7ef4536..3de63a4e0 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -12,7 +12,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "network_gui.h"
 #include "../saveload/saveload.h"
 #include "../saveload/saveload_filter.h"
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 249cfdce1..5b1d97329 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -23,7 +23,6 @@
 #include "../core/geometry_func.hpp"
 #include "network_content_gui.h"
 
-#include "../widgets/network_content_widget.h"
 
 #include "table/strings.h"
 #include "../table/sprites.h"
diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp
index 4511397da..8df84a80e 100644
--- a/src/network/network_gamelist.cpp
+++ b/src/network/network_gamelist.cpp
@@ -21,7 +21,6 @@
 #include "network_internal.h"
 #include "network_udp.h"
 #include "network_gamelist.h"
-#include "../newgrf_text.h"
 
 NetworkGameList *_network_game_list = NULL;
 
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index d6fc35c28..ed1ae397f 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -29,7 +29,6 @@
 #include "../sortlist_type.h"
 #include "../company_func.h"
 #include "../core/geometry_func.hpp"
-#include "../newgrf_text.h"
 #include "../genworld.h"
 
 #include "../widgets/network_widget.h"
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 9780a537e..72f956240 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -27,7 +27,6 @@
 #include "../genworld.h"
 #include "../company_func.h"
 #include "../company_gui.h"
-#include "../window_func.h"
 #include "../roadveh.h"
 #include "../order_backup.h"
 #include "../core/pool_func.hpp"
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 49f3f8ab8..970ccec25 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -24,7 +24,6 @@
 #include "fontcache.h"
 #include "currency.h"
 #include "landscape.h"
-#include "newgrf.h"
 #include "newgrf_cargo.h"
 #include "newgrf_house.h"
 #include "newgrf_sound.h"
diff --git a/src/newgrf_airport.cpp b/src/newgrf_airport.cpp
index 9137bf865..174a79402 100644
--- a/src/newgrf_airport.cpp
+++ b/src/newgrf_airport.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "debug.h"
 #include "date_func.h"
-#include "newgrf.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_text.h"
 #include "station_base.h"
diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp
index 5414d57a1..86840062d 100644
--- a/src/newgrf_airporttiles.cpp
+++ b/src/newgrf_airporttiles.cpp
@@ -11,13 +11,11 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "newgrf.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_sound.h"
 #include "station_base.h"
 #include "water.h"
-#include "viewport_func.h"
 #include "landscape.h"
 #include "company_base.h"
 #include "town.h"
diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index 8629f263d..9847a72c1 100644
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -11,9 +11,7 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "newgrf.h"
 #include "newgrf_spritegroup.h"
-#include "core/bitmath_func.hpp"
 
 static uint32 CargoGetRandomBits(const ResolverObject *object)
 {
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp
index cdfe9e7a0..cb7826759 100644
--- a/src/newgrf_commons.cpp
+++ b/src/newgrf_commons.cpp
@@ -17,7 +17,6 @@
 #include "landscape.h"
 #include "house.h"
 #include "industrytype.h"
-#include "newgrf.h"
 #include "newgrf_config.h"
 #include "clear_map.h"
 #include "station_map.h"
@@ -27,7 +26,6 @@
 #include "genworld.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_text.h"
-#include "livery.h"
 #include "company_base.h"
 #include "error.h"
 #include "strings_func.h"
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 4ed4cdfe3..87c309006 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -14,7 +14,6 @@
 #include "train.h"
 #include "roadveh.h"
 #include "company_func.h"
-#include "newgrf.h"
 #include "newgrf_cargo.h"
 #include "newgrf_spritegroup.h"
 #include "date_func.h"
diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp
index 0b098a934..6e2692899 100644
--- a/src/newgrf_generic.cpp
+++ b/src/newgrf_generic.cpp
@@ -11,12 +11,9 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "newgrf.h"
 #include "newgrf_spritegroup.h"
 #include "industrytype.h"
-#include "core/bitmath_func.hpp"
 #include "core/random_func.hpp"
-#include "tile_map.h"
 #include "newgrf_sound.h"
 #include "water_map.h"
 #include <list>
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 8bc4bf3fc..f53f49db6 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -30,7 +30,6 @@
 
 #include "widgets/newgrf_widget.h"
 
-#include "table/strings.h"
 #include "table/sprites.h"
 
 /**
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp
index 1ee9198bd..760b392e8 100644
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -11,9 +11,7 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "viewport_func.h"
 #include "landscape.h"
-#include "newgrf.h"
 #include "newgrf_house.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_town.h"
@@ -21,7 +19,6 @@
 #include "company_func.h"
 #include "company_base.h"
 #include "town.h"
-#include "sprite.h"
 #include "genworld.h"
 #include "newgrf_animation_base.h"
 #include "newgrf_cargo.h"
diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp
index 184784520..a5b1984be 100644
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -12,15 +12,12 @@
 #include "stdafx.h"
 #include "debug.h"
 #include "industry.h"
-#include "newgrf.h"
 #include "newgrf_industries.h"
-#include "newgrf_text.h"
 #include "newgrf_town.h"
 #include "newgrf_cargo.h"
 #include "window_func.h"
 #include "town.h"
 #include "company_base.h"
-#include "command_func.h"
 #include "error.h"
 #include "strings_func.h"
 #include "core/random_func.hpp"
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp
index c269c40a5..1e9db9605 100644
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -11,17 +11,13 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "viewport_func.h"
 #include "landscape.h"
-#include "newgrf.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_sound.h"
-#include "newgrf_text.h"
 #include "industry.h"
 #include "town.h"
 #include "command_func.h"
 #include "water.h"
-#include "sprite.h"
 #include "newgrf_animation_base.h"
 
 #include "table/strings.h"
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp
index a2453dce7..8874b6d65 100644
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -13,7 +13,6 @@
 #include "company_base.h"
 #include "company_func.h"
 #include "debug.h"
-#include "newgrf.h"
 #include "newgrf_class_func.h"
 #include "newgrf_object.h"
 #include "newgrf_sound.h"
@@ -21,10 +20,8 @@
 #include "newgrf_town.h"
 #include "object_base.h"
 #include "object_map.h"
-#include "sprite.h"
 #include "tile_cmd.h"
 #include "town.h"
-#include "viewport_func.h"
 #include "water.h"
 #include "newgrf_animation_base.h"
 
diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp
index 6d7a0c8aa..69e65417f 100644
--- a/src/newgrf_railtype.cpp
+++ b/src/newgrf_railtype.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "newgrf.h"
 #include "newgrf_spritegroup.h"
 #include "date_func.h"
 #include "depot_base.h"
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp
index 03ac7ce7f..711b26109 100644
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -10,9 +10,7 @@
 /** @file newgrf_spritegroup.cpp Handling of primarily NewGRF action 2. */
 
 #include "stdafx.h"
-#include "newgrf.h"
 #include "newgrf_spritegroup.h"
-#include "sprite.h"
 #include "core/pool_func.hpp"
 
 SpriteGroupPool _spritegroup_pool("SpriteGroup");
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index 240f66436..90751cdcb 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -23,7 +23,6 @@
 #include "newgrf_town.h"
 #include "company_func.h"
 #include "tunnelbridge_map.h"
-#include "newgrf.h"
 #include "newgrf_animation_base.h"
 #include "newgrf_class_func.h"
 
diff --git a/src/newgrf_town.cpp b/src/newgrf_town.cpp
index 55adaba31..bb67803d7 100644
--- a/src/newgrf_town.cpp
+++ b/src/newgrf_town.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "debug.h"
 #include "town.h"
-#include "newgrf.h"
 #include "newgrf_spritegroup.h"
 
 /**
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index 7a11e03ec..2b4cc1616 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "gui.h"
 #include "viewport_func.h"
-#include "news_type.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "date_func.h"
diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp
index 117212e1f..103e7b6c0 100644
--- a/src/object_cmd.cpp
+++ b/src/object_cmd.cpp
@@ -25,7 +25,6 @@
 #include "cheat_type.h"
 #include "object.h"
 #include "cargopacket.h"
-#include "sprite.h"
 #include "core/random_func.hpp"
 #include "core/pool_func.hpp"
 #include "object_map.h"
diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index 5ccbb22ad..e18f6c4f9 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -14,7 +14,6 @@
 #include "newgrf.h"
 #include "newgrf_object.h"
 #include "newgrf_text.h"
-#include "sprite.h"
 #include "strings_func.h"
 #include "viewport_func.h"
 #include "window_gui.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 76a1a416a..f9c74cd1c 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -19,8 +19,6 @@
 #include "fontcache.h"
 #include "error.h"
 #include "gui.h"
-#include "sound_func.h"
-#include "window_func.h"
 
 #include "base_media_base.h"
 #include "saveload/saveload.h"
@@ -36,13 +34,11 @@
 #include "screenshot.h"
 #include "network/network.h"
 #include "network/network_func.h"
-#include "signs_base.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"
 #include "settings_func.h"
 #include "genworld.h"
 #include "progress.h"
-#include "group.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
@@ -52,7 +48,6 @@
 #include "elrail_func.h"
 #include "rev.h"
 #include "highscore.h"
-#include "thread/thread.h"
 #include "station_base.h"
 #include "crashlog.h"
 #include "engine_func.h"
@@ -66,12 +61,9 @@
 #include "game/game_config.hpp"
 
 
-#include "town.h"
-#include "industry.h"
 
 #include <stdarg.h>
 
-#include "table/strings.h"
 
 void CallLandscapeTick();
 void IncreaseDate();
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 41fc55a88..79a365f4c 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -15,9 +15,7 @@
 #include "command_func.h"
 #include "company_func.h"
 #include "news_func.h"
-#include "vehicle_gui.h"
 #include "strings_func.h"
-#include "window_func.h"
 #include "timetable.h"
 #include "vehicle_func.h"
 #include "depot_base.h"
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index a41a41536..0e7579546 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -13,11 +13,9 @@
 #include "command_func.h"
 #include "viewport_func.h"
 #include "depot_map.h"
-#include "vehicle_gui.h"
 #include "roadveh.h"
 #include "timetable.h"
 #include "strings_func.h"
-#include "window_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
@@ -33,7 +31,6 @@
 
 #include "widgets/order_widget.h"
 
-#include "table/strings.h"
 
 /** Order load types that could be given to station orders. */
 static const StringID _station_load_types[][5][5] = {
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp
index bfefce215..016db5abe 100644
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -10,7 +10,6 @@
 /** @file npf.cpp Implementation of the NPF pathfinder. */
 
 #include "../../stdafx.h"
-#include "../../debug.h"
 #include "../../network/network.h"
 #include "../../viewport_func.h"
 #include "../../ship.h"
diff --git a/src/progress.cpp b/src/progress.cpp
index 208f681a6..343893cee 100644
--- a/src/progress.cpp
+++ b/src/progress.cpp
@@ -10,7 +10,6 @@
 /** @file progress.cpp Functions for modal progress windows. */
 
 #include "stdafx.h"
-#include "progress.h"
 #include "thread/thread.h"
 
 /** Are we in a modal progress or not? */
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index afa071b14..8d3dec5e5 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -21,7 +21,6 @@
 #include "autoslope.h"
 #include "water.h"
 #include "tunnelbridge_map.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "tunnelbridge.h"
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index ea0152bf0..990812ad8 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -39,7 +39,6 @@
 
 #include "widgets/rail_widget.h"
 
-#include "table/strings.h"
 
 static RailType _cur_railtype;               ///< Rail type of the current build-rail toolbar.
 static bool _remove_button_clicked;          ///< Flag whether 'remove' toggle-button is currently enabled
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 07e3f00a3..0f9f679c8 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -19,7 +19,6 @@
 #include "newgrf.h"
 #include "autoslope.h"
 #include "tunnelbridge_map.h"
-#include "window_func.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index e298dca49..0c0157ab1 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -16,13 +16,11 @@
 #include "pathfinder/npf/npf_func.h"
 #include "station_base.h"
 #include "company_func.h"
-#include "vehicle_gui.h"
 #include "articulated_vehicles.h"
 #include "newgrf_sound.h"
 #include "pathfinder/yapf/yapf.h"
 #include "strings_func.h"
 #include "tunnelbridge_map.h"
-#include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp
index 0bc57962c..5562e981d 100644
--- a/src/roadveh_gui.cpp
+++ b/src/roadveh_gui.cpp
@@ -12,13 +12,10 @@
 #include "stdafx.h"
 #include "roadveh.h"
 #include "window_gui.h"
-#include "gfx_func.h"
-#include "vehicle_gui.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 /**
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index a8900f865..f2a7c31a6 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -13,7 +13,6 @@
 #include "../void_map.h"
 #include "../signs_base.h"
 #include "../depot_base.h"
-#include "../window_func.h"
 #include "../fios.h"
 #include "../gamelog_internal.h"
 #include "../network/network.h"
@@ -52,10 +51,8 @@
 #include "../core/backup_type.hpp"
 #include "../smallmap_gui.h"
 #include "../news_func.h"
-#include "../group.h"
 #include "../error.h"
 
-#include "table/strings.h"
 
 #include "saveload_internal.h"
 
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp
index 27c9054f6..c1ce88870 100644
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -13,9 +13,6 @@
 #include "../company_func.h"
 #include "../company_manager_face.h"
 #include "../fios.h"
-#include "../rail_map.h"
-#include "../road_map.h"
-#include "../station_map.h"
 #include "../tunnelbridge_map.h"
 #include "../tunnelbridge.h"
 #include "../station_base.h"
diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp
index 91b108c56..55414cc31 100644
--- a/src/saveload/game_sl.cpp
+++ b/src/saveload/game_sl.cpp
@@ -10,7 +10,6 @@
 /** @file game_sl.cpp Handles the saveload part of the GameScripts */
 
 #include "../stdafx.h"
-#include "../company_base.h"
 #include "../debug.h"
 #include "saveload.h"
 #include "../string_func.h"
diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp
index cfd87c728..8943a5d52 100644
--- a/src/saveload/industry_sl.cpp
+++ b/src/saveload/industry_sl.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../industry.h"
-#include "../newgrf.h"
 
 #include "saveload.h"
 #include "newgrf_sl.h"
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index 877fa1269..72c56db54 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../date_func.h"
 #include "../zoom_func.h"
-#include "../vehicle_func.h"
 #include "../window_gui.h"
 #include "../window_func.h"
 #include "../viewport_func.h"
diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp
index c64ceea1e..d3915340c 100644
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -10,7 +10,6 @@
 /** @file newgrf_sl.cpp Code handling saving and loading of newgrf config */
 
 #include "../stdafx.h"
-#include "../core/bitmath_func.hpp"
 #include "../fios.h"
 
 #include "saveload.h"
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 0beefbae3..92b222d69 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -39,7 +39,6 @@
 #include "../fileio_func.h"
 #include "../gamelog.h"
 #include "../string_func.h"
-#include "../engine_base.h"
 #include "../fios.h"
 #include "../error.h"
 
diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp
index c26f35454..f8b650a2d 100644
--- a/src/saveload/station_sl.cpp
+++ b/src/saveload/station_sl.cpp
@@ -15,7 +15,6 @@
 #include "../roadstop_base.h"
 #include "../vehicle_base.h"
 #include "../newgrf_station.h"
-#include "../newgrf.h"
 
 #include "saveload.h"
 #include "table/strings.h"
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index a2b351379..fa455049f 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -10,7 +10,6 @@
 /** @file screenshot.cpp The creation of screenshots! */
 
 #include "stdafx.h"
-#include "fileio_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "screenshot.h"
diff --git a/src/script/api/script_admin.cpp b/src/script/api/script_admin.cpp
index c3845b897..3625fb458 100644
--- a/src/script/api/script_admin.cpp
+++ b/src/script/api/script_admin.cpp
@@ -14,7 +14,6 @@
 #include "script_log.hpp"
 #include "../../network/network_admin.h"
 #include "../script_instance.hpp"
-#include "../../game/game.hpp"
 
 /* static */ bool ScriptAdmin::MakeJSON(HSQUIRRELVM vm, SQInteger index, int max_depth, std::string &data)
 {
diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp
index 57e414dbd..748489655 100644
--- a/src/script/api/script_bridge.cpp
+++ b/src/script/api/script_bridge.cpp
@@ -15,7 +15,6 @@
 #include "../script_instance.hpp"
 #include "../../bridge_map.h"
 #include "../../strings_func.h"
-#include "../../economy_func.h"
 #include "../../date_func.h"
 
 /* static */ bool ScriptBridge::IsValidBridge(BridgeID bridge_id)
diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp
index 6a0a2b944..e8268b6bb 100644
--- a/src/script/api/script_cargo.cpp
+++ b/src/script/api/script_cargo.cpp
@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_cargo.hpp"
-#include "../../cargotype.h"
 #include "../../economy_func.h"
 #include "../../core/bitmath_func.hpp"
 
diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp
index d4bc5d3e7..571cc80c6 100644
--- a/src/script/api/script_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -12,7 +12,6 @@
 #include "../../stdafx.h"
 #include "script_company.hpp"
 #include "script_error.hpp"
-#include "../../command_func.h"
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../company_manager_face.h"
diff --git a/src/script/api/script_companymode.cpp b/src/script/api/script_companymode.cpp
index d260053e1..bf6da493c 100644
--- a/src/script/api/script_companymode.cpp
+++ b/src/script/api/script_companymode.cpp
@@ -11,10 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_companymode.hpp"
-#include "../../company_base.h"
-#include "../../company_func.h"
-#include "../script_instance.hpp"
-#include "../script_fatalerror.hpp"
 
 ScriptCompanyMode::ScriptCompanyMode(int company)
 {
diff --git a/src/script/api/script_controller.cpp b/src/script/api/script_controller.cpp
index 0eabdb731..6b343e438 100644
--- a/src/script/api/script_controller.cpp
+++ b/src/script/api/script_controller.cpp
@@ -18,7 +18,6 @@
 #include "../script_fatalerror.hpp"
 #include "../script_info.hpp"
 #include "../script_instance.hpp"
-#include "../script_suspend.hpp"
 #include "script_log.hpp"
 
 /* static */ void ScriptController::SetCommandDelay(int ticks)
diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp
index c6fd1b583..4ba4e9f82 100644
--- a/src/script/api/script_engine.cpp
+++ b/src/script/api/script_engine.cpp
@@ -12,7 +12,6 @@
 #include "../../stdafx.h"
 #include "script_engine.hpp"
 #include "script_cargo.hpp"
-#include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../strings_func.h"
 #include "../../rail.h"
diff --git a/src/script/api/script_enginelist.cpp b/src/script/api/script_enginelist.cpp
index 196f1ff1d..b6143a20e 100644
--- a/src/script/api/script_enginelist.cpp
+++ b/src/script/api/script_enginelist.cpp
@@ -12,7 +12,6 @@
 #include "../../stdafx.h"
 #include "script_enginelist.hpp"
 #include "../../engine_base.h"
-#include "../../core/bitmath_func.hpp"
 
 ScriptEngineList::ScriptEngineList(ScriptVehicle::VehicleType vehicle_type)
 {
diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp
index 8b3ef8c5f..382c6f0ba 100644
--- a/src/script/api/script_event_types.cpp
+++ b/src/script/api/script_event_types.cpp
@@ -13,7 +13,6 @@
 #include "script_event_types.hpp"
 #include "script_vehicle.hpp"
 #include "script_log.hpp"
-#include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../settings_type.h"
 #include "../../engine_base.h"
diff --git a/src/script/api/script_execmode.cpp b/src/script/api/script_execmode.cpp
index d0911e3f8..3617a22cf 100644
--- a/src/script/api/script_execmode.cpp
+++ b/src/script/api/script_execmode.cpp
@@ -11,8 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_execmode.hpp"
-#include "../../company_base.h"
-#include "../../company_func.h"
 #include "../script_instance.hpp"
 #include "../script_fatalerror.hpp"
 
diff --git a/src/script/api/script_game.cpp b/src/script/api/script_game.cpp
index a6fd5da69..f0aeb191f 100644
--- a/src/script/api/script_game.cpp
+++ b/src/script/api/script_game.cpp
@@ -13,7 +13,6 @@
 #include "script_game.hpp"
 #include "../../command_type.h"
 #include "../../settings_type.h"
-#include "../../openttd.h"
 #include "../../network/network.h"
 
 /* static */ bool ScriptGame::Pause()
diff --git a/src/script/api/script_goal.cpp b/src/script/api/script_goal.cpp
index ba5e19e37..88369cf04 100644
--- a/src/script/api/script_goal.cpp
+++ b/src/script/api/script_goal.cpp
@@ -16,10 +16,6 @@
 #include "script_map.hpp"
 #include "script_town.hpp"
 #include "../script_instance.hpp"
-#include "../../command_type.h"
-#include "../../settings_type.h"
-#include "../../openttd.h"
-#include "../../network/network.h"
 #include "../../goal_base.h"
 #include "../../string_func.h"
 
diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp
index 63c022e90..3dfc50a09 100644
--- a/src/script/api/script_group.cpp
+++ b/src/script/api/script_group.cpp
@@ -13,8 +13,6 @@
 #include "script_group.hpp"
 #include "script_engine.hpp"
 #include "../script_instance.hpp"
-#include "../../company_func.h"
-#include "../../group.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../autoreplace_func.h"
diff --git a/src/script/api/script_grouplist.cpp b/src/script/api/script_grouplist.cpp
index 80a00cd3e..39dd31002 100644
--- a/src/script/api/script_grouplist.cpp
+++ b/src/script/api/script_grouplist.cpp
@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_grouplist.hpp"
-#include "../../company_func.h"
 #include "../../group.h"
 
 ScriptGroupList::ScriptGroupList()
diff --git a/src/script/api/script_infrastructure.cpp b/src/script/api/script_infrastructure.cpp
index 2e318f1e5..2b1e203c8 100644
--- a/src/script/api/script_infrastructure.cpp
+++ b/src/script/api/script_infrastructure.cpp
@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_infrastructure.hpp"
-#include "../../settings_func.h"
 #include "../../company_base.h"
 #include "../../rail.h"
 #include "../../road_func.h"
diff --git a/src/script/api/script_news.cpp b/src/script/api/script_news.cpp
index d2c5e9343..9319c8df0 100644
--- a/src/script/api/script_news.cpp
+++ b/src/script/api/script_news.cpp
@@ -12,11 +12,8 @@
 #include "../../stdafx.h"
 #include "script_news.hpp"
 #include "script_error.hpp"
-#include "../../news_func.h"
-#include "../../strings_func.h"
 #include "../../command_type.h"
 #include "../../string_func.h"
-#include "table/strings.h"
 
 /* static */ bool ScriptNews::Create(NewsType type, Text *text, ScriptCompany::CompanyID company)
 {
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index 074537540..707b734aa 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -15,14 +15,11 @@
 #include "../../company_func.h"
 #include "../../company_base.h"
 #include "../../network/network.h"
-#include "../../tunnelbridge.h"
 #include "../../genworld.h"
-#include "../../goal_type.h"
 
 #include "../script_storage.hpp"
 #include "../script_instance.hpp"
 #include "../script_fatalerror.hpp"
-#include "../script_suspend.hpp"
 #include "script_error.hpp"
 
 /**
diff --git a/src/script/api/script_order.cpp b/src/script/api/script_order.cpp
index 5bca48b9d..e4fb78dae 100644
--- a/src/script/api/script_order.cpp
+++ b/src/script/api/script_order.cpp
@@ -11,7 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_order.hpp"
-#include "script_vehicle.hpp"
 #include "script_cargo.hpp"
 #include "script_map.hpp"
 #include "../script_instance.hpp"
diff --git a/src/script/api/script_rail.cpp b/src/script/api/script_rail.cpp
index f77894d92..e4f653e94 100644
--- a/src/script/api/script_rail.cpp
+++ b/src/script/api/script_rail.cpp
@@ -17,7 +17,6 @@
 #include "script_cargo.hpp"
 #include "../../debug.h"
 #include "../../station_base.h"
-#include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
 #include "../../strings_func.h"
diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp
index 352bb185e..f6dc922b4 100644
--- a/src/script/api/script_sign.cpp
+++ b/src/script/api/script_sign.cpp
@@ -13,8 +13,6 @@
 #include "script_sign.hpp"
 #include "table/strings.h"
 #include "../script_instance.hpp"
-#include "../../command_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../signs_base.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
diff --git a/src/script/api/script_station.cpp b/src/script/api/script_station.cpp
index 152a83bd3..c42ed4a93 100644
--- a/src/script/api/script_station.cpp
+++ b/src/script/api/script_station.cpp
@@ -11,10 +11,8 @@
 
 #include "../../stdafx.h"
 #include "script_station.hpp"
-#include "script_cargo.hpp"
 #include "script_map.hpp"
 #include "script_town.hpp"
-#include "../../debug.h"
 #include "../../station_base.h"
 #include "../../roadstop_base.h"
 #include "../../town.h"
diff --git a/src/script/api/script_testmode.cpp b/src/script/api/script_testmode.cpp
index 16472a118..81633844a 100644
--- a/src/script/api/script_testmode.cpp
+++ b/src/script/api/script_testmode.cpp
@@ -11,8 +11,6 @@
 
 #include "../../stdafx.h"
 #include "script_testmode.hpp"
-#include "../../company_base.h"
-#include "../../company_func.h"
 #include "../script_instance.hpp"
 #include "../script_fatalerror.hpp"
 
diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
index e8803884b..e9b51e2e7 100644
--- a/src/script/api/script_text.cpp
+++ b/src/script/api/script_text.cpp
@@ -12,7 +12,6 @@
 #include "../../stdafx.h"
 #include "../../string_func.h"
 #include "script_text.hpp"
-#include "../squirrel.hpp"
 #include "../../table/control_codes.h"
 
 ScriptText::ScriptText(HSQUIRRELVM vm) :
diff --git a/src/script/api/script_tile.cpp b/src/script/api/script_tile.cpp
index a6bbf11ee..f6f016213 100644
--- a/src/script/api/script_tile.cpp
+++ b/src/script/api/script_tile.cpp
@@ -13,15 +13,12 @@
 #include "script_tile.hpp"
 #include "script_map.hpp"
 #include "script_town.hpp"
-#include "script_cargo.hpp"
 #include "../../station_func.h"
-#include "../../company_func.h"
 #include "../../water_map.h"
 #include "../../clear_map.h"
 #include "../../tree_map.h"
 #include "../../town.h"
 #include "../../landscape.h"
-#include "../../economy_func.h"
 
 /* static */ bool ScriptTile::IsBuildable(TileIndex tile)
 {
diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp
index c04115c8f..63093ecd5 100644
--- a/src/script/api/script_town.cpp
+++ b/src/script/api/script_town.cpp
@@ -12,11 +12,9 @@
 #include "../../stdafx.h"
 #include "script_town.hpp"
 #include "script_map.hpp"
-#include "script_cargo.hpp"
 #include "script_error.hpp"
 #include "../../town.h"
 #include "../../strings_func.h"
-#include "../../company_func.h"
 #include "../../station_base.h"
 #include "../../landscape.h"
 #include "table/strings.h"
diff --git a/src/script/api/script_tunnel.cpp b/src/script/api/script_tunnel.cpp
index d7f6b853b..494628a8b 100644
--- a/src/script/api/script_tunnel.cpp
+++ b/src/script/api/script_tunnel.cpp
@@ -14,8 +14,6 @@
 #include "script_rail.hpp"
 #include "../script_instance.hpp"
 #include "../../tunnel_map.h"
-#include "../../command_func.h"
-#include "../../company_func.h"
 
 /* static */ bool ScriptTunnel::IsTunnelTile(TileIndex tile)
 {
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
index 1818270e8..70ffbfd83 100644
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -13,7 +13,6 @@
 #include "../settings_type.h"
 #include "../core/random_func.hpp"
 #include "script_info.hpp"
-#include "script_config.hpp"
 
 void ScriptConfig::Change(const char *name, int version, bool force_exact_match, bool is_random)
 {
diff --git a/src/script/script_info_dummy.cpp b/src/script/script_info_dummy.cpp
index 4620ce8f7..b2f699594 100644
--- a/src/script/script_info_dummy.cpp
+++ b/src/script/script_info_dummy.cpp
@@ -14,7 +14,6 @@
 
 #include "../string_func.h"
 #include "../strings_func.h"
-#include "table/strings.h"
 
 /* The reason this exists in C++, is that a user can trash his ai/ or game/ dir,
  *  leaving no Scripts available. The complexity to solve this is insane, and
diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp
index 23fd6b24e..5b515c52f 100644
--- a/src/script/script_instance.cpp
+++ b/src/script/script_instance.cpp
@@ -12,7 +12,6 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../saveload/saveload.h"
-#include "../gui.h"
 
 #include "../script/squirrel_class.hpp"
 
@@ -28,7 +27,6 @@
 
 #include "../company_base.h"
 #include "../company_func.h"
-#include "../fileio_func.h"
 
 ScriptStorage::~ScriptStorage()
 {
diff --git a/src/script/script_scanner.cpp b/src/script/script_scanner.cpp
index 233bf09cc..552b1cf46 100644
--- a/src/script/script_scanner.cpp
+++ b/src/script/script_scanner.cpp
@@ -12,9 +12,7 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../string_func.h"
-#include "../fileio_func.h"
 #include "../settings_type.h"
-#include <sys/stat.h>
 
 #include "../script/squirrel.hpp"
 #include "script_scanner.hpp"
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 681b0ca58..3d2fe9024 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -34,11 +34,7 @@
 #include "ai/ai.hpp"
 #include "language.h"
 
-#include "widgets/settings_widget.h"
 
-#include "table/sprites.h"
-#include "table/strings.h"
-#include <map>
 
 static const StringID _units_dropdown[] = {
 	STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL,
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 8b72b41f0..dc76d9451 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -18,7 +18,6 @@
 #include "pathfinder/npf/npf_func.h"
 #include "depot_base.h"
 #include "station_base.h"
-#include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "pathfinder/yapf/yapf.h"
 #include "newgrf_sound.h"
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index 9c54ff2de..87e86f3d8 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -19,7 +19,6 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "map_func.h"
-#include "gfx_func.h"
 #include "viewport_func.h"
 #include "querystring_gui.h"
 #include "sortlist_type.h"
diff --git a/src/sprite.cpp b/src/sprite.cpp
index 69a8ed92e..acf0dca2d 100644
--- a/src/sprite.cpp
+++ b/src/sprite.cpp
@@ -14,8 +14,6 @@
 #include "viewport_func.h"
 #include "landscape.h"
 #include "spritecache.h"
-#include "core/alloc_func.hpp"
-#include "core/mem_func.hpp"
 #include "zoom_func.h"
 
 
diff --git a/src/station.cpp b/src/station.cpp
index 5fc2bbdf5..c96322cbf 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -14,7 +14,6 @@
 #include "company_base.h"
 #include "roadveh.h"
 #include "viewport_func.h"
-#include "window_func.h"
 #include "date_func.h"
 #include "command_func.h"
 #include "news_func.h"
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index c224863ad..fdf858f8c 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -29,10 +29,8 @@
 #include "road_internal.h" /* For drawing catenary/checking road removal */
 #include "autoslope.h"
 #include "water.h"
-#include "station_gui.h"
 #include "strings_func.h"
 #include "clear_func.h"
-#include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 0b40e02c4..a905a599b 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -13,7 +13,6 @@
 #include "../core/endian_func.hpp"
 #include "../string_func.h"
 #include "../strings_type.h"
-#include "../language.h"
 #include "../misc/getoptdata.h"
 #include "../table/control_codes.h"
 
diff --git a/src/strgen/strgen_base.cpp b/src/strgen/strgen_base.cpp
index 1fd096a76..a71724bb3 100644
--- a/src/strgen/strgen_base.cpp
+++ b/src/strgen/strgen_base.cpp
@@ -12,14 +12,10 @@
 #include "../stdafx.h"
 #include "../core/endian_func.hpp"
 #include "../string_func.h"
-#include "../strings_type.h"
-#include "../language.h"
 #include "../table/control_codes.h"
 
 #include "strgen.h"
 
-#include <stdarg.h>
-#include <exception>
 
 #include "../table/strgen_tables.h"
 
diff --git a/src/strings.cpp b/src/strings.cpp
index cd5b4cee8..cbc47676b 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -19,14 +19,11 @@
 #include "industry.h"
 #include "newgrf_text.h"
 #include "fileio_func.h"
-#include "group.h"
 #include "signs_base.h"
-#include "cargotype.h"
 #include "fontcache.h"
 #include "error.h"
 #include "strings_func.h"
 #include "rev.h"
-#include "core/alloc_type.hpp"
 #include "core/endian_func.hpp"
 #include "date_func.h"
 #include "vehicle_base.h"
diff --git a/src/subsidy.cpp b/src/subsidy.cpp
index 1b7362c0a..3e9657bd6 100644
--- a/src/subsidy.cpp
+++ b/src/subsidy.cpp
@@ -16,7 +16,6 @@
 #include "news_func.h"
 #include "ai/ai.hpp"
 #include "station_base.h"
-#include "cargotype.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "subsidy_base.h"
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index ae11c8482..138ea453d 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -16,7 +16,6 @@
 #include "strings_func.h"
 #include "date_func.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "gui.h"
 #include "subsidy_func.h"
 #include "subsidy_base.h"
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index adc4108c5..095726160 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -14,7 +14,6 @@
 #include "tunnel_map.h"
 #include "bridge_map.h"
 #include "viewport_func.h"
-#include "economy_func.h"
 #include "genworld.h"
 #include "object_base.h"
 #include "company_base.h"
diff --git a/src/tgp.cpp b/src/tgp.cpp
index 208fd3ec5..b01ffbd6d 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -14,7 +14,6 @@
 #include "clear_map.h"
 #include "void_map.h"
 #include "genworld.h"
-#include "core/alloc_func.hpp"
 #include "core/random_func.hpp"
 #include "landscape_type.h"
 
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 428a953f1..60302e695 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -22,7 +22,6 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "terraform_gui.h"
-#include "transparency.h"
 #include "strings_func.h"
 #include "company_func.h"
 #include "company_gui.h"
@@ -42,7 +41,6 @@
 #include "newgrf_debug.h"
 #include "hotkeys.h"
 #include "engine_base.h"
-#include "settings_type.h"
 
 #include "widgets/toolbar_widget.h"
 
@@ -50,8 +48,6 @@
 #include "network/network_gui.h"
 #include "network/network_func.h"
 
-#include "table/strings.h"
-#include "table/sprites.h"
 
 RailType _last_built_railtype;
 RoadType _last_built_roadtype;
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index fac15efe5..5b0494f91 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -26,7 +26,6 @@
 #include "newgrf_debug.h"
 #include "newgrf_house.h"
 #include "newgrf_text.h"
-#include "newgrf_config.h"
 #include "autoslope.h"
 #include "tunnelbridge_map.h"
 #include "strings_func.h"
@@ -40,7 +39,6 @@
 #include "core/pool_func.hpp"
 #include "town.h"
 #include "townname_func.h"
-#include "townname_type.h"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 #include "depot_base.h"
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 0838e94a0..4ca862eea 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -22,19 +22,15 @@
 #include "string_func.h"
 #include "strings_func.h"
 #include "sound_func.h"
-#include "economy_func.h"
 #include "tilehighlight_func.h"
 #include "sortlist_type.h"
 #include "road_cmd.h"
 #include "landscape.h"
-#include "cargotype.h"
 #include "querystring_gui.h"
 #include "window_func.h"
 #include "townname_func.h"
-#include "townname_type.h"
 #include "core/geometry_func.hpp"
 #include "genworld.h"
-#include "sprite.h"
 
 #include "widgets/town_widget.h"
 
diff --git a/src/townname.cpp b/src/townname.cpp
index 1e0b43d8a..6b5731321 100644
--- a/src/townname.cpp
+++ b/src/townname.cpp
@@ -13,7 +13,6 @@
 #include "string_func.h"
 #include "townname_type.h"
 #include "town.h"
-#include "core/alloc_func.hpp"
 #include "strings_func.h"
 #include "core/random_func.hpp"
 #include "genworld.h"
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 0dc5f59cd..a5964e927 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -17,20 +17,16 @@
 #include "pathfinder/yapf/yapf.hpp"
 #include "news_func.h"
 #include "company_func.h"
-#include "vehicle_gui.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
-#include "group.h"
 #include "strings_func.h"
 #include "viewport_func.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "ai/ai.hpp"
 #include "game/game.hpp"
 #include "newgrf_station.h"
 #include "effectvehicle_func.h"
-#include "gamelog.h"
 #include "network/network.h"
 #include "spritecache.h"
 #include "core/random_func.hpp"
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index 1fde0e98f..74c7bade1 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -11,15 +11,11 @@
 
 #include "stdafx.h"
 #include "window_gui.h"
-#include "gfx_func.h"
 #include "command_func.h"
-#include "vehicle_gui.h"
 #include "train.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
-#include "window_func.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 /**
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 81e590f41..51ad3dd4f 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -15,22 +15,17 @@
 #include "tree_map.h"
 #include "viewport_func.h"
 #include "command_func.h"
-#include "economy_func.h"
 #include "town.h"
 #include "genworld.h"
-#include "transparency.h"
 #include "clear_func.h"
 #include "company_func.h"
 #include "sound_func.h"
-#include "water_map.h"
 #include "water.h"
-#include "landscape_type.h"
 #include "company_base.h"
 #include "core/random_func.hpp"
 #include "newgrf_generic.h"
 
 #include "table/strings.h"
-#include "table/sprites.h"
 #include "table/tree_land.h"
 #include "table/clear_land.h"
 
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index 6d6a1d78c..feace2619 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -22,7 +22,6 @@
 #include "train.h"
 #include "ship.h"
 #include "roadveh.h"
-#include "water_map.h"
 #include "pathfinder/yapf/yapf_cache.h"
 #include "newgrf_sound.h"
 #include "autoslope.h"
@@ -42,7 +41,6 @@
 #include "water.h"
 #include "company_gui.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 #include "table/bridge_land.h"
 
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 72f25830d..1c86164d0 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -19,18 +19,15 @@
 #include "news_func.h"
 #include "command_func.h"
 #include "company_func.h"
-#include "vehicle_gui.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_debug.h"
 #include "newgrf_sound.h"
 #include "newgrf_station.h"
-#include "group.h"
 #include "group_gui.h"
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "date_func.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 0e4cefc0d..ab31936e3 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -16,11 +16,9 @@
 #include "cmd_helper.h"
 #include "command_func.h"
 #include "company_func.h"
-#include "vehicle_gui.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_text.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
 #include "depot_map.h"
@@ -28,7 +26,7 @@
 #include "engine_func.h"
 #include "articulated_vehicles.h"
 #include "autoreplace_gui.h"
-#include "company_base.h"
+#include "group.h"
 #include "order_backup.h"
 #include "ship.h"
 #include "newgrf.h"
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 7e5d5e76a..399a35576 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -15,7 +15,6 @@
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "vehicle_gui.h"
 #include "vehicle_gui_base.h"
 #include "viewport_func.h"
 #include "newgrf_text.h"
@@ -26,7 +25,6 @@
 #include "depot_map.h"
 #include "group_gui.h"
 #include "strings_func.h"
-#include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
@@ -41,7 +39,6 @@
 #include "tilehighlight_func.h"
 #include "zoom_func.h"
 
-#include "table/strings.h"
 
 Sorting _sorting;
 
diff --git a/src/window.cpp b/src/window.cpp
index 5177656a1..9da7fe812 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -16,7 +16,6 @@
 #include "console_func.h"
 #include "console_gui.h"
 #include "viewport_func.h"
-#include "genworld.h"
 #include "progress.h"
 #include "blitter/factory.hpp"
 #include "zoom_func.h"