(svn r21890) -Cleanup: remove some unneeded includes

95 files changed, 14 insertions, 131 deletions

diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp
index 586fdb569..8ec213cd8 100644
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -10,10 +10,8 @@
 /** @file ai_config.cpp Implementation of AIConfig. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../settings_type.h"
 #include "../core/random_func.hpp"
-#include "../core/math_func.hpp"
 #include "ai.hpp"
 #include "ai_config.hpp"
 
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 44c3fa66b..1bc7ad9de 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -10,7 +10,6 @@
 /** @file ai_gui.cpp Window for configuring the AIs */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../table/sprites.h"
 #include "../gui.h"
 #include "../querystring_gui.h"
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 73a7ba05b..be2abf715 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -15,7 +15,6 @@
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "../settings_type.h"
-#include "../openttd.h"
 #include "../debug.h"
 #include "../rev.h"
 
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index a2b980fb6..d08c36f63 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -74,6 +74,7 @@
 #include "api/ai_waypointlist.hpp.sq"
 
 #include "../company_base.h"
+#include "../company_func.h"
 #include "../fileio_func.h"
 
 /** The maximum number of operations for saving or loading the data of an AI. */
diff --git a/src/ai/ai_scanner.hpp b/src/ai/ai_scanner.hpp
index 117f6cd3e..cc183d887 100644
--- a/src/ai/ai_scanner.hpp
+++ b/src/ai/ai_scanner.hpp
@@ -12,11 +12,8 @@
 #ifndef AI_SCANNER_HPP
 #define AI_SCANNER_HPP
 
-#include <squirrel.h>
 #include "../script/script_scanner.hpp"
-#include "../core/string_compare_type.hpp"
 #include "ai.hpp"
-#include <map>
 
 /**
  * Class that scans for available AIs.
diff --git a/src/ai/ai_storage.hpp b/src/ai/ai_storage.hpp
index 24f3e56f9..381cb0db2 100644
--- a/src/ai/ai_storage.hpp
+++ b/src/ai/ai_storage.hpp
@@ -12,12 +12,7 @@
 #ifndef AI_STORAGE_HPP
 #define AI_STORAGE_HPP
 
-#include "../command_func.h"
-#include "../map_func.h"
-#include "../network/network.h"
-#include "../company_func.h"
 #include "../signs_func.h"
-#include "../tunnelbridge.h"
 #include "../vehicle_func.h"
 #include "../road_type.h"
 #include "../group.h"
diff --git a/src/ai/api/ai_accounting.hpp b/src/ai/api/ai_accounting.hpp
index 4dc8a9da4..1d4fc9085 100644
--- a/src/ai/api/ai_accounting.hpp
+++ b/src/ai/api/ai_accounting.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_ACCOUNTING_HPP
 #define AI_ACCOUNTING_HPP
 
-#include "../../stdafx.h"
 #include "ai_object.hpp"
 
 /**
diff --git a/src/ai/api/ai_controller.cpp b/src/ai/api/ai_controller.cpp
index fdd2b7708..9a2c552c0 100644
--- a/src/ai/api/ai_controller.cpp
+++ b/src/ai/api/ai_controller.cpp
@@ -10,13 +10,12 @@
 /** @file ai_controller.cpp Implementation of AIControler. */
 
 #include "../../stdafx.h"
-#include "../../stdafx.h"
 #include "../../string_func.h"
 #include "../../company_base.h"
+#include "../../company_func.h"
 #include "../../rev.h"
 
 #include "ai_controller.hpp"
-#include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 #include "../ai_config.hpp"
 #include "ai_log.hpp"
diff --git a/src/ai/api/ai_engine.hpp b/src/ai/api/ai_engine.hpp
index b126734a8..337b80485 100644
--- a/src/ai/api/ai_engine.hpp
+++ b/src/ai/api/ai_engine.hpp
@@ -12,9 +12,7 @@
 #ifndef AI_ENGINE_HPP
 #define AI_ENGINE_HPP
 
-#include "ai_object.hpp"
 #include "ai_vehicle.hpp"
-#include "ai_road.hpp"
 #include "ai_rail.hpp"
 #include "ai_airport.hpp"
 
diff --git a/src/ai/api/ai_event_types.hpp b/src/ai/api/ai_event_types.hpp
index acb36c77c..7ca675eeb 100644
--- a/src/ai/api/ai_event_types.hpp
+++ b/src/ai/api/ai_event_types.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_EVENT_TYPES_HPP
 #define AI_EVENT_TYPES_HPP
 
-#include "ai_object.hpp"
 #include "ai_event.hpp"
 #include "ai_company.hpp"
 
diff --git a/src/ai/api/ai_group.hpp b/src/ai/api/ai_group.hpp
index 593bdb559..bff9d8dd4 100644
--- a/src/ai/api/ai_group.hpp
+++ b/src/ai/api/ai_group.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_GROUP_HPP
 #define AI_GROUP_HPP
 
-#include "ai_object.hpp"
 #include "ai_vehicle.hpp"
 
 /**
diff --git a/src/ai/api/ai_industrytypelist.hpp b/src/ai/api/ai_industrytypelist.hpp
index e17be83c0..b29c4b011 100644
--- a/src/ai/api/ai_industrytypelist.hpp
+++ b/src/ai/api/ai_industrytypelist.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_INDUSTRYTYPELIST_HPP
 #define AI_INDUSTRYTYPELIST_HPP
 
-#include "ai_list.hpp"
 #include "ai_industrytype.hpp"
 
 /**
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index f00374954..f2ddbebae 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/ai/api/ai_object.cpp
@@ -11,7 +11,11 @@
 
 #include "../../stdafx.h"
 #include "../../script/squirrel.hpp"
+#include "../../command_func.h"
 #include "../../company_base.h"
+#include "../../company_func.h"
+#include "../../network/network.h"
+#include "../../tunnelbridge.h"
 
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 36437138b..a79a6e7dd 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -10,6 +10,7 @@
 /** @file ai_order.cpp Implementation of AIOrder. */
 
 #include "../../stdafx.h"
+#include "ai_order.hpp"
 #include "ai_vehicle.hpp"
 #include "../ai_instance.hpp"
 #include "../../debug.h"
diff --git a/src/ai/api/ai_sign.hpp b/src/ai/api/ai_sign.hpp
index 518f1782b..c2816d796 100644
--- a/src/ai/api/ai_sign.hpp
+++ b/src/ai/api/ai_sign.hpp
@@ -12,9 +12,7 @@
 #ifndef AI_SIGN_HPP
 #define AI_SIGN_HPP
 
-#include "ai_object.hpp"
 #include "ai_error.hpp"
-#include "ai_company.hpp"
 
 /**
  * Class that handles all sign related functions.
diff --git a/src/ai/api/ai_station.hpp b/src/ai/api/ai_station.hpp
index 68ead640c..825c0f3ee 100644
--- a/src/ai/api/ai_station.hpp
+++ b/src/ai/api/ai_station.hpp
@@ -12,8 +12,6 @@
 #ifndef AI_STATION_HPP
 #define AI_STATION_HPP
 
-#include "ai_object.hpp"
-#include "ai_error.hpp"
 #include "ai_road.hpp"
 #include "ai_basestation.hpp"
 
diff --git a/src/ai/api/ai_subsidy.hpp b/src/ai/api/ai_subsidy.hpp
index 2993c867e..b4079e59f 100644
--- a/src/ai/api/ai_subsidy.hpp
+++ b/src/ai/api/ai_subsidy.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_SUBSIDY_HPP
 #define AI_SUBSIDY_HPP
 
-#include "ai_object.hpp"
 #include "ai_company.hpp"
 
 /**
diff --git a/src/ai/api/ai_tunnel.hpp b/src/ai/api/ai_tunnel.hpp
index 0dac7e857..f1d8beae3 100644
--- a/src/ai/api/ai_tunnel.hpp
+++ b/src/ai/api/ai_tunnel.hpp
@@ -12,7 +12,6 @@
 #ifndef AI_TUNNEL_HPP
 #define AI_TUNNEL_HPP
 
-#include "ai_object.hpp"
 #include "ai_vehicle.hpp"
 
 /**
diff --git a/src/ai/api/ai_vehicle.hpp b/src/ai/api/ai_vehicle.hpp
index 083e9da1c..9477e879e 100644
--- a/src/ai/api/ai_vehicle.hpp
+++ b/src/ai/api/ai_vehicle.hpp
@@ -12,10 +12,7 @@
 #ifndef AI_VEHICLE_HPP
 #define AI_VEHICLE_HPP
 
-#include "ai_object.hpp"
-#include "ai_error.hpp"
 #include "ai_road.hpp"
-#include "ai_order.hpp"
 
 /**
  * Class that handles all vehicle related functions.
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index e0847351c..af75dec1b 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -19,7 +19,6 @@
 #include "window_func.h"
 #include "autoreplace_func.h"
 #include "company_func.h"
-#include "widgets/dropdown_type.h"
 #include "engine_base.h"
 #include "window_gui.h"
 #include "engine_gui.h"
diff --git a/src/autoslope.h b/src/autoslope.h
index ba1c07551..5d4eeb35f 100644
--- a/src/autoslope.h
+++ b/src/autoslope.h
@@ -16,7 +16,6 @@
 #include "depot_func.h"
 #include "slope_func.h"
 #include "tile_map.h"
-#include "openttd.h"
 
 /**
  * Autoslope check for tiles with an entrance on an edge.
diff --git a/src/blitter/32bpp_optimized.hpp b/src/blitter/32bpp_optimized.hpp
index 247c78290..07c5b5201 100644
--- a/src/blitter/32bpp_optimized.hpp
+++ b/src/blitter/32bpp_optimized.hpp
@@ -13,7 +13,6 @@
 #define BLITTER_32BPP_OPTIMIZED_HPP
 
 #include "32bpp_simple.hpp"
-#include "factory.hpp"
 
 class Blitter_32bppOptimized : public Blitter_32bppSimple {
 public:
diff --git a/src/blitter/null.hpp b/src/blitter/null.hpp
index f2c57243a..d3a3a317a 100644
--- a/src/blitter/null.hpp
+++ b/src/blitter/null.hpp
@@ -12,7 +12,6 @@
 #ifndef BLITTER_NULL_HPP
 #define BLITTER_NULL_HPP
 
-#include "base.hpp"
 #include "factory.hpp"
 
 class Blitter_Null : public Blitter {
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 5dd8ea847..de56fe064 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "gui.h"
 #include "command_func.h"
-#include "bridge.h"
 #include "rail.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ -22,7 +21,6 @@
 #include "sortlist_type.h"
 #include "widgets/dropdown_func.h"
 #include "core/geometry_func.hpp"
-#include "openttd.h"
 #include "cmd_helper.h"
 #include "tunnelbridge_map.h"
 #include "road_gui.h"
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index bda776884..6959689b2 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -14,11 +14,10 @@
 #include "cheat_type.h"
 #include "company_base.h"
 #include "company_func.h"
-#include "gfx_func.h"
 #include "date_func.h"
 #include "saveload/saveload.h"
+#include "textbuf_gui.h"
 #include "window_gui.h"
-#include "querystring_gui.h"
 #include "newgrf.h"
 #include "string_func.h"
 #include "strings_func.h"
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index fafd90371..42226a845 100644
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -10,7 +10,6 @@
 /** @file clear_cmd.cpp Commands related to clear tiles. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "clear_map.h"
 #include "command_func.h"
 #include "landscape.h"
diff --git a/src/command.cpp b/src/command.cpp
index 4dbf664df..dd9867487 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -10,7 +10,6 @@
 /** @file command.cpp Handling of commands. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "landscape.h"
 #include "gui.h"
 #include "command_func.h"
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 56f06937e..774d2f093 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -29,7 +29,6 @@
 #include "viewport_func.h"
 #include "window_func.h"
 #include "date_func.h"
-#include "vehicle_func.h"
 #include "company_func.h"
 #include "gamelog.h"
 #include "ai/ai.hpp"
diff --git a/src/console_internal.h b/src/console_internal.h
index c46b34b19..8cbf1a133 100644
--- a/src/console_internal.h
+++ b/src/console_internal.h
@@ -12,7 +12,7 @@
 #ifndef CONSOLE_INTERNAL_H
 #define CONSOLE_INTERNAL_H
 
-#include "console_type.h"
+#include "gfx_type.h"
 
 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/overflowsafe_type.hpp b/src/core/overflowsafe_type.hpp
index 97ebbbc28..e6a31395a 100644
--- a/src/core/overflowsafe_type.hpp
+++ b/src/core/overflowsafe_type.hpp
@@ -12,7 +12,6 @@
 #ifndef OVERFLOWSAFE_TYPE_HPP
 #define OVERFLOWSAFE_TYPE_HPP
 
-#include "math_func.hpp"
 
 /**
  * Overflow safe template for integers, i.e. integers that will never overflow
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp
index 89b12d5f5..8116ca2ea 100644
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -14,7 +14,6 @@
 
 #include "alloc_func.hpp"
 #include "mem_func.hpp"
-#include "math_func.hpp"
 
 /**
  * Simple vector template class.
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index 77c1d8b85..b057278b1 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -13,7 +13,6 @@
 #include "train.h"
 #include "ship.h"
 #include "aircraft.h"
-#include "roadveh.h"
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "viewport_func.h"
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 0f2185149..833fa5899 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -10,7 +10,6 @@
 /** @file dock_gui.cpp GUI to create amazing water objects. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "terraform_gui.h"
 #include "window_gui.h"
 #include "station_gui.h"
diff --git a/src/economy.cpp b/src/economy.cpp
index 971088591..50d1fa32d 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -20,10 +20,11 @@
 #include "vehicle_gui.h"
 #include "ai/ai.hpp"
 #include "aircraft.h"
-#include "train.h"
+#include "newgrf_engine.h"
+#include "engine_base.h"
+#include "ground_vehicle.hpp"
 #include "newgrf_cargo.h"
 #include "newgrf_sound.h"
-#include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_station.h"
 #include "newgrf_airporttiles.h"
diff --git a/src/fios.cpp b/src/fios.cpp
index a528d5e27..bdb56e50f 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -13,7 +13,6 @@
  */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "fios.h"
 #include "fileio_func.h"
 #include "tar_type.h"
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index dafae596c..e1a5df5ae 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -10,7 +10,6 @@
 /** @file fios_gui.cpp GUIs for loading/saving games, scenarios, heightmaps, ... */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "saveload/saveload.h"
 #include "gui.h"
 #include "gfx_func.h"
diff --git a/src/gamelog.cpp b/src/gamelog.cpp
index b874655d0..7ad4b297b 100644
--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -10,7 +10,6 @@
 /** @file gamelog.cpp Definition of functions used for logging of important changes in the game */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "saveload/saveload.h"
 #include "string_func.h"
 #include "settings_type.h"
diff --git a/src/genworld.cpp b/src/genworld.cpp
index b0ed4295f..7be576cbd 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -10,7 +10,6 @@
 /** @file genworld.cpp Functions to generate a map. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "landscape.h"
 #include "company_func.h"
 #include "thread/thread.h"
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 7c01b1625..62814fb35 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -10,7 +10,6 @@
 /** @file genworld_gui.cpp GUI to configure and show progress during map generation. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "heightmap.h"
 #include "debug.h"
 #include "genworld.h"
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index eac0d2dcd..28ccf2bed 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -10,7 +10,6 @@
 /** @file graph_gui.cpp GUI that shows performance graphs. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "graph_gui.h"
 #include "window_gui.h"
 #include "company_base.h"
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 0fb125933..1c1453bcf 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -10,7 +10,6 @@
 /** @file group_gui.cpp GUI for the group window. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "vehicle_gui.h"
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
index c6ffcb827..aa7a203b4 100644
--- a/src/highscore_gui.cpp
+++ b/src/highscore_gui.cpp
@@ -21,7 +21,6 @@
 #include "company_func.h"
 #include "company_base.h"
 #include "strings_func.h"
-#include "openttd.h"
 #include "hotkeys.h"
 
 enum HighscoreWidgets {
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index 782e93e73..51e623943 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -23,7 +23,6 @@
 #include "tree_map.h"
 #include "newgrf_cargo.h"
 #include "newgrf_debug.h"
-#include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "autoslope.h"
 #include "water.h"
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index c53e40ba5..dd4773bd5 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -10,7 +10,6 @@
 /** @file industry_gui.cpp GUIs related to industries. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "gui.h"
 #include "sound_func.h"
 #include "window_func.h"
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index abd35de76..8f7098b01 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -10,7 +10,6 @@
 /** @file intro_gui.cpp The main menu GUI. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"
diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp
index c3ae103d6..bd83904ea 100644
--- a/src/misc/blob.hpp
+++ b/src/misc/blob.hpp
@@ -13,8 +13,6 @@
 #define BLOB_HPP
 
 #include "../core/alloc_func.hpp"
-#include "../core/mem_func.hpp"
-#include <new>
 
 /**
  * Base class for simple binary blobs.
diff --git a/src/misc/str.hpp b/src/misc/str.hpp
index 78e5ed9fe..1d58b63ae 100644
--- a/src/misc/str.hpp
+++ b/src/misc/str.hpp
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include "blob.hpp"
+#include "../core/math_func.hpp"
 #include "../string_func.h"
 
 /** Blob based case sensitive ANSI/UTF-8 string */
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 31c3edad6..80ea503c2 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -26,7 +26,6 @@
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "window_func.h"
-#include "tilehighlight_func.h"
 #include "querystring_gui.h"
 #include "console_func.h"
 #include "core/geometry_func.hpp"
diff --git a/src/network/network_admin.cpp b/src/network/network_admin.cpp
index dbf7758a0..22c833288 100644
--- a/src/network/network_admin.cpp
+++ b/src/network/network_admin.cpp
@@ -12,11 +12,9 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "../strings_func.h"
 #include "../date_func.h"
 #include "network_admin.h"
-#include "network.h"
 #include "network_base.h"
 #include "network_server.h"
 #include "../command_func.h"
@@ -26,8 +24,6 @@
 #include "../map_func.h"
 #include "../rev.h"
 
-#include "table/strings.h"
-#include "network_client.h"
 
 /* This file handles all the admin network commands. */
 
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index dc6b4005f..a48845594 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -14,7 +14,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../date_func.h"
 #include "../gfx_func.h"
 #include "../strings_func.h"
 #include "../blitter/factory.hpp"
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 6924777c1..658d3a0e8 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -13,14 +13,11 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "network_internal.h"
 #include "network_gui.h"
 #include "../saveload/saveload.h"
 #include "../saveload/saveload_filter.h"
 #include "../command_func.h"
 #include "../console_func.h"
-#include "../fileio_func.h"
-#include "../3rdparty/md5/md5.h"
 #include "../strings_func.h"
 #include "../window_func.h"
 #include "../company_func.h"
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 5d39336ad..d678fcfdf 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -12,11 +12,9 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "network_admin.h"
 #include "network_client.h"
 #include "network_server.h"
-#include "network.h"
 #include "../command_func.h"
 #include "../company_func.h"
 #include "../settings_type.h"
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index fcfd89dde..d79c5b566 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -12,13 +12,11 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "../strings_func.h"
 #include "../date_func.h"
 #include "network_admin.h"
 #include "network_server.h"
 #include "network_udp.h"
-#include "network.h"
 #include "network_base.h"
 #include "../console_func.h"
 #include "../company_base.h"
@@ -27,7 +25,6 @@
 #include "../saveload/saveload_filter.h"
 #include "../station_base.h"
 #include "../genworld.h"
-#include "../fileio_func.h"
 #include "../company_func.h"
 #include "../company_gui.h"
 #include "../window_func.h"
@@ -37,7 +34,6 @@
 #include "../core/random_func.hpp"
 #include "../rev.h"
 
-#include "table/strings.h"
 
 /* This file handles all the server-commands */
 
diff --git a/src/newgrf_canal.h b/src/newgrf_canal.h
index a49c9b3b3..1a0dc2cf0 100644
--- a/src/newgrf_canal.h
+++ b/src/newgrf_canal.h
@@ -15,7 +15,6 @@
 #include "gfx_type.h"
 #include "tile_type.h"
 #include "newgrf_generic.h"
-#include "newgrf_callbacks.h"
 
 /**
  * List of different canal 'features'.
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp
index 4bf5b6e9f..cb13af4a6 100644
--- a/src/newgrf_commons.cpp
+++ b/src/newgrf_commons.cpp
@@ -23,7 +23,6 @@
 #include "tunnelbridge_map.h"
 #include "newgrf_object.h"
 #include "genworld.h"
-#include "core/mem_func.hpp"
 
 /**
  * Constructor of generic class
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp
index 17a089c59..994d068f6 100644
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -14,7 +14,6 @@
 #include "viewport_func.h"
 #include "landscape.h"
 #include "newgrf.h"
-#include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
diff --git a/src/newgrf_industrytiles.h b/src/newgrf_industrytiles.h
index 443f5b533..9cf008685 100644
--- a/src/newgrf_industrytiles.h
+++ b/src/newgrf_industrytiles.h
@@ -13,9 +13,7 @@
 #define NEWGRF_INDUSTRYTILES_H
 
 #include "tile_cmd.h"
-#include "industry_type.h"
 #include "newgrf_animation_type.h"
-#include "newgrf_callbacks.h"
 #include "newgrf_industries.h"
 #include "core/random_func.hpp"
 
diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp
index a9ee7a983..d33bc38aa 100644
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "company_base.h"
 #include "company_func.h"
-#include "core/mem_func.hpp"
 #include "debug.h"
 #include "newgrf.h"
 #include "newgrf_class_func.h"
diff --git a/src/newgrf_object.h b/src/newgrf_object.h
index 081a19781..1c023a7a0 100644
--- a/src/newgrf_object.h
+++ b/src/newgrf_object.h
@@ -13,9 +13,7 @@
 #define NEWGRF_OBJECT_H
 
 #include "newgrf_callbacks.h"
-#include "date_type.h"
 #include "economy_func.h"
-#include "strings_type.h"
 #include "tile_cmd.h"
 #include "object_type.h"
 #include "newgrf_animation_type.h"
diff --git a/src/newgrf_sound.cpp b/src/newgrf_sound.cpp
index 9dc5d32dd..cbb6d512f 100644
--- a/src/newgrf_sound.cpp
+++ b/src/newgrf_sound.cpp
@@ -16,7 +16,6 @@
 #include "newgrf_sound.h"
 #include "vehicle_base.h"
 #include "sound_func.h"
-#include "core/mem_func.hpp"
 
 static SmallVector<SoundEntry, 8> _sounds;
 
diff --git a/src/newgrf_station.h b/src/newgrf_station.h
index 1e955e9e9..cd7182d87 100644
--- a/src/newgrf_station.h
+++ b/src/newgrf_station.h
@@ -17,7 +17,6 @@
 #include "newgrf_class.h"
 #include "newgrf_commons.h"
 #include "sprite.h"
-#include "direction_type.h"
 #include "cargo_type.h"
 #include "station_type.h"
 #include "rail_type.h"
diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp
index b8361cdbd..e6c19a60f 100644
--- a/src/object_cmd.cpp
+++ b/src/object_cmd.cpp
@@ -30,7 +30,6 @@
 #include "core/pool_func.hpp"
 #include "object_map.h"
 #include "object_base.h"
-#include "newgrf.h"
 #include "newgrf_config.h"
 #include "newgrf_object.h"
 #include "date_func.h"
diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index 60e4bb080..ba2317192 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -11,14 +11,12 @@
 
 #include "stdafx.h"
 #include "command_func.h"
-#include "core/geometry_func.hpp"
 #include "newgrf.h"
 #include "newgrf_object.h"
 #include "newgrf_text.h"
 #include "sprite.h"
 #include "strings_func.h"
 #include "viewport_func.h"
-#include "widgets/dropdown_type.h"
 #include "window_gui.h"
 
 #include "table/strings.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 0b4cf20db..dcdb835da 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -45,7 +45,6 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "gamelog.h"
-#include "cheat_type.h"
 #include "animated_tile_func.h"
 #include "roadstop_base.h"
 #include "functions.h"
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index a63df3fc4..bdcf9c1cf 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -18,7 +18,6 @@
 #include "timetable.h"
 #include "strings_func.h"
 #include "window_func.h"
-#include "vehicle_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_func.h"
 #include "textbuf_gui.h"
diff --git a/src/road.cpp b/src/road.cpp
index dd5641823..e0c18c015 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -10,7 +10,6 @@
 /** @file road.cpp Generic road related functions. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "rail_map.h"
 #include "road_map.h"
 #include "water_map.h"
diff --git a/src/roadstop_base.h b/src/roadstop_base.h
index 7bfdba16d..6470f537c 100644
--- a/src/roadstop_base.h
+++ b/src/roadstop_base.h
@@ -15,7 +15,6 @@
 #include "station_type.h"
 #include "core/pool_type.hpp"
 #include "core/bitmath_func.hpp"
-#include "direction_type.h"
 #include "vehicle_type.h"
 
 typedef Pool<RoadStop, RoadStopID, 32, 64000> RoadStopPool;
diff --git a/src/roadveh.h b/src/roadveh.h
index e49badbec..adec81bba 100644
--- a/src/roadveh.h
+++ b/src/roadveh.h
@@ -17,7 +17,6 @@
 #include "cargotype.h"
 #include "track_func.h"
 #include "road_type.h"
-#include "newgrf_properties.h"
 #include "newgrf_engine.h"
 
 struct RoadVehicle;
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 59d979273..036b7c200 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -18,7 +18,6 @@
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "articulated_vehicles.h"
-#include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "pathfinder/yapf/yapf.h"
 #include "strings_func.h"
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp
index 0f389246e..2f3827ce9 100644
--- a/src/saveload/misc_sl.cpp
+++ b/src/saveload/misc_sl.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../date_func.h"
-#include "../openttd.h"
 #include "../zoom_func.h"
 #include "../vehicle_func.h"
 #include "../window_gui.h"
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index 65e881869..9484fb726 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -10,7 +10,6 @@
 /** @file oldloader.cpp Functions for handling of TTO/TTD/TTDP savegames. */
 
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../debug.h"
 #include "../strings_type.h"
 #include "../string_func.h"
diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index df3783171..d5a188a8d 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -10,7 +10,6 @@
 /** @file screenshot.cpp The creation of screenshots! */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "fileio_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
@@ -18,7 +17,6 @@
 #include "blitter/factory.hpp"
 #include "zoom_func.h"
 #include "core/endian_func.hpp"
-#include "map_func.h"
 #include "saveload/saveload.h"
 #include "company_func.h"
 #include "strings_func.h"
diff --git a/src/settings.cpp b/src/settings.cpp
index f3ea76cc0..aed2e9206 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -36,7 +36,6 @@
 #include "train.h"
 #include "news_func.h"
 #include "window_func.h"
-#include "strings_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "company_func.h"
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 923493699..cb8e32fd9 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -24,7 +24,6 @@
 #include "string_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
-#include "openttd.h"
 #include "highscore.h"
 #include "base_media_base.h"
 #include "company_base.h"
@@ -33,7 +32,6 @@
 #include "core/geometry_func.hpp"
 #include "ai/ai.hpp"
 #include "language.h"
-#include <map>
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 7fffc3ec9..f5a6ac640 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -13,7 +13,6 @@
 #include "ship.h"
 #include "landscape.h"
 #include "timetable.h"
-#include "command_func.h"
 #include "news_func.h"
 #include "company_func.h"
 #include "pathfinder/npf/npf_func.h"
@@ -32,7 +31,6 @@
 #include "sound_func.h"
 #include "ai/ai.hpp"
 #include "pathfinder/opf/opf_ship.h"
-#include "landscape_type.h"
 #include "engine_base.h"
 #include "company_base.h"
 
diff --git a/src/sortlist_type.h b/src/sortlist_type.h
index 2b34bcb75..5e6ac11be 100644
--- a/src/sortlist_type.h
+++ b/src/sortlist_type.h
@@ -14,7 +14,6 @@
 
 #include "core/enum_type.hpp"
 #include "core/bitmath_func.hpp"
-#include "core/mem_func.hpp"
 #include "core/sort_func.hpp"
 #include "core/smallvec_type.hpp"
 #include "date_type.h"
diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp
index 82b680f47..1d4622ef6 100644
--- a/src/spriteloader/grf.cpp
+++ b/src/spriteloader/grf.cpp
@@ -16,6 +16,7 @@
 #include "../strings_func.h"
 #include "table/strings.h"
 #include "../gui.h"
+#include "../core/math_func.hpp"
 #include "grf.hpp"
 
 /**
diff --git a/src/station_type.h b/src/station_type.h
index 0fd0577e1..d6084d79d 100644
--- a/src/station_type.h
+++ b/src/station_type.h
@@ -12,7 +12,6 @@
 #ifndef STATION_TYPE_H
 #define STATION_TYPE_H
 
-#include "core/enum_type.hpp"
 #include "core/smallvec_type.hpp"
 #include "tilearea_type.h"
 
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index 11feeaec0..626f4b394 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -10,7 +10,6 @@
 /** @file statusbar_gui.cpp The GUI for the bottom status bar. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "date_func.h"
 #include "gfx_func.h"
 #include "news_func.h"
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 622f0b23a..1b76a7637 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -10,10 +10,7 @@
 /** @file strgen.cpp Tool to create computer readable (stand-alone) translation files. */
 
 #include "../stdafx.h"
-#include "../core/alloc_func.hpp"
 #include "../core/endian_func.hpp"
-#include "../core/math_func.hpp"
-#include "../core/mem_func.hpp"
 #include "../string_func.h"
 #include "../strings_type.h"
 #include "../language.h"
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index 67fadf6d7..66d8282af 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -10,7 +10,6 @@
 /** @file terraform_cmd.cpp Commands related to terraforming. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "command_func.h"
 #include "tunnel_map.h"
 #include "bridge_map.h"
diff --git a/src/tilearea.cpp b/src/tilearea.cpp
index 7a5bf9f44..104f21ed7 100644
--- a/src/tilearea.cpp
+++ b/src/tilearea.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 
-#include "map_func.h"
 #include "tilearea_type.h"
 
 /**
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 74532586e..8ba84b163 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -37,8 +37,6 @@
 #include "news_gui.h"
 #include "ai/ai_gui.hpp"
 #include "tilehighlight_func.h"
-#include "rail.h"
-#include "widgets/dropdown_type.h"
 #include "smallmap_gui.h"
 #include "graph_gui.h"
 #include "textbuf_gui.h"
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 6d08f22ea..14684a294 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -10,10 +10,8 @@
 /** @file town_gui.cpp GUI for towns. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "town.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "gui.h"
 #include "command_func.h"
 #include "company_func.h"
@@ -36,7 +34,6 @@
 #include "genworld.h"
 #include "sprite.h"
 
-#include "table/sprites.h"
 #include "table/strings.h"
 
 typedef GUIList<const Town*> GUITownList;
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index bc76c8be8..ebbd2d189 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -10,7 +10,6 @@
 /** @file tree_gui.cpp GUIs for building trees. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "window_gui.h"
 #include "gfx_func.h"
 #include "tilehighlight_func.h"
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 94428ee1e..19c11eae2 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -52,7 +52,6 @@
 #include "vehiclelist.h"
 #include "tunnel_map.h"
 #include "depot_map.h"
-#include "ground_vehicle.hpp"
 
 #include "table/strings.h"
 
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index ffbfb179f..e6e68d0a5 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -13,7 +13,6 @@
 #define VEHICLE_BASE_H
 
 #include "track_type.h"
-#include "direction_type.h"
 #include "command_type.h"
 #include "order_base.h"
 #include "cargopacket.h"
diff --git a/src/vehicle_func.h b/src/vehicle_func.h
index 586481513..ebdb5f343 100644
--- a/src/vehicle_func.h
+++ b/src/vehicle_func.h
@@ -19,7 +19,6 @@
 #include "engine_type.h"
 #include "transport_type.h"
 #include "newgrf_config.h"
-#include "company_type.h"
 #include "track_type.h"
 #include "livery.h"
 
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index e7f073ade..13668ab54 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -32,7 +32,6 @@
 #include "string_func.h"
 #include "widgets/dropdown_func.h"
 #include "timetable.h"
-#include "vehiclelist.h"
 #include "articulated_vehicles.h"
 #include "spritecache.h"
 #include "core/geometry_func.hpp"
diff --git a/src/vehiclelist.cpp b/src/vehiclelist.cpp
index 1d0f09634..2ead37d01 100644
--- a/src/vehiclelist.cpp
+++ b/src/vehiclelist.cpp
@@ -10,7 +10,6 @@
 /** @file vehiclelist.cpp Lists of vehicles. */
 
 #include "stdafx.h"
-#include "vehicle_gui.h"
 #include "train.h"
 #include "vehiclelist.h"
 
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 609709d76..352fe8ea8 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -45,7 +45,6 @@
 #include "window_func.h"
 #include "tilehighlight_func.h"
 #include "window_gui.h"
-#include "terraform_gui.h"
 
 #include "table/strings.h"
 
diff --git a/src/viewport_func.h b/src/viewport_func.h
index 9093166dd..df4f8abce 100644
--- a/src/viewport_func.h
+++ b/src/viewport_func.h
@@ -14,7 +14,6 @@
 
 #include "gfx_type.h"
 #include "viewport_type.h"
-#include "vehicle_type.h"
 #include "window_type.h"
 #include "tile_type.h"
 
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index bef7f9af2..179ce14bf 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -13,11 +13,9 @@
 #include "landscape.h"
 #include "window_gui.h"
 #include "viewport_func.h"
-#include "gfx_func.h"
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "window_func.h"
-#include "tilehighlight_func.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
diff --git a/src/waypoint_func.h b/src/waypoint_func.h
index d2f22da23..b44264dc1 100644
--- a/src/waypoint_func.h
+++ b/src/waypoint_func.h
@@ -12,7 +12,6 @@
 #ifndef WAYPOINT_FUNC_H
 #define WAYPOINT_FUNC_H
 
-#include "direction_type.h"
 #include "rail_type.h"
 #include "command_type.h"
 #include "station_type.h"
diff --git a/src/window.cpp b/src/window.cpp
index f79a753d9..5630a29ac 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include <stdarg.h>
-#include "openttd.h"
 #include "company_func.h"
 #include "gfx_func.h"
 #include "console_func.h"
@@ -20,9 +19,7 @@
 #include "genworld.h"
 #include "blitter/factory.hpp"
 #include "zoom_func.h"
-#include "map_func.h"
 #include "vehicle_base.h"
-#include "cheat_type.h"
 #include "window_func.h"
 #include "tilehighlight_func.h"
 #include "network/network.h"
@@ -35,7 +32,6 @@
 #include "toolbar_gui.h"
 #include "statusbar_gui.h"
 
-#include "table/sprites.h"
 
 static Point _drag_delta; ///< delta between mouse cursor and upper left corner of dragged window
 static Window *_mouseover_last_w = NULL; ///< Window of the last #MOUSEOVER event.