(svn r18330) -Cleanup: remove some unneeded includes

32 files changed, 0 insertions, 39 deletions

diff --git a/src/ai/api/ai_bridge.cpp b/src/ai/api/ai_bridge.cpp
index 514bcd2d8..79a4f84cb 100644
--- a/src/ai/api/ai_bridge.cpp
+++ b/src/ai/api/ai_bridge.cpp
@@ -14,7 +14,6 @@
 #include "../ai_instance.hpp"
 #include "../../bridge_map.h"
 #include "../../strings_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../economy_func.h"
 #include "../../date_func.h"
 
diff --git a/src/ai/api/ai_cargo.cpp b/src/ai/api/ai_cargo.cpp
index 0a737a08a..1eab57b8e 100644
--- a/src/ai/api/ai_cargo.cpp
+++ b/src/ai/api/ai_cargo.cpp
@@ -12,7 +12,6 @@
 #include "ai_cargo.hpp"
 #include "../../cargotype.h"
 #include "../../economy_func.h"
-#include "../../core/alloc_func.hpp"
 #include "../../core/bitmath_func.hpp"
 
 /* static */ bool AICargo::IsValidCargo(CargoID cargo_type)
diff --git a/src/ai/api/ai_engine.cpp b/src/ai/api/ai_engine.cpp
index 00394444f..6416c95ff 100644
--- a/src/ai/api/ai_engine.cpp
+++ b/src/ai/api/ai_engine.cpp
@@ -13,7 +13,6 @@
 #include "ai_cargo.hpp"
 #include "../../company_func.h"
 #include "../../strings_func.h"
-#include "../../vehicle_func.h"
 #include "../../settings_type.h"
 #include "../../rail.h"
 #include "../../engine_base.h"
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index 2360b87cf..418eb8e83 100644
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "core/pool_func.hpp"
 #include "economy_base.h"
-#include "station_base.h"
 
 /* Initialize the cargopacket-pool */
 CargoPacketPool _cargopacket_pool("CargoPacket");
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 03bde9122..44993becc 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 "openttd.h"
 #include "engine_base.h"
 #include "company_func.h"
 #include "company_gui.h"
@@ -31,7 +30,6 @@
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "rail.h"
-#include "sprite.h"
 #include "core/pool_func.hpp"
 #include "settings_func.h"
 
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 623d98b6c..a1b7f374f 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -20,7 +20,6 @@
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "network/network_func.h"
-#include "sprite.h"
 #include "economy_func.h"
 #include "vehicle_base.h"
 #include "newgrf.h"
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 80a0d557e..b5e7c8273 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -10,7 +10,6 @@
 /** @file console_cmds.cpp Implementation of the console hooks. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "console_internal.h"
 #include "debug.h"
 #include "engine_func.h"
diff --git a/src/date.cpp b/src/date.cpp
index e1b6d1943..16f77be1b 100644
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -10,7 +10,6 @@
 /** @file date.cpp Handling of dates in our native format and transforming them to something human readable. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "variables.h"
 #include "network/network.h"
 #include "network/network_func.h"
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
index d0c3f25d4..bb4d363e4 100644
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -10,7 +10,6 @@
 /** @file date_gui.cpp Graphical selection of a date. */
 
 #include "stdafx.h"
-#include "core/math_func.hpp"
 #include "strings_func.h"
 #include "date_func.h"
 #include "gfx_func.h"
@@ -19,7 +18,6 @@
 #include "date_gui.h"
 
 #include "widgets/dropdown_type.h"
-#include "widgets/dropdown_func.h"
 
 #include "table/strings.h"
 
diff --git a/src/economy.cpp b/src/economy.cpp
index 094c836a8..0e574f5d1 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -10,7 +10,6 @@
 /** @file economy.cpp Handling of the economy. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "tile_cmd.h"
 #include "company_func.h"
 #include "command_func.h"
diff --git a/src/engine.cpp b/src/engine.cpp
index 07c69091e..065630475 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -16,7 +16,6 @@
 #include "aircraft.h"
 #include "newgrf.h"
 #include "newgrf_engine.h"
-#include "newgrf_cargo.h"
 #include "group.h"
 #include "strings_func.h"
 #include "gfx_func.h"
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index fe190ac0a..7f200bedc 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "window_gui.h"
 #include "gfx_func.h"
-#include "engine_func.h"
 #include "engine_base.h"
 #include "command_func.h"
 #include "strings_func.h"
diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 4966670d9..b66ca037a 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -12,7 +12,6 @@
 #include "stdafx.h"
 #include "fontcache.h"
 #include "blitter/factory.hpp"
-#include "gfx_func.h"
 #include "core/math_func.hpp"
 
 #include "table/sprites.h"
diff --git a/src/gfx.cpp b/src/gfx.cpp
index d944b6faf..37b8aab43 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -10,7 +10,6 @@
 /** @file gfx.cpp Handling of drawing text and other gfx related stuff. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "gfx_func.h"
 #include "variables.h"
 #include "fontcache.h"
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index 686951a75..7552c7daa 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "debug.h"
-#include "spritecache.h"
 #include "fios.h"
 #include "newgrf.h"
 #include "3rdparty/md5/md5.h"
diff --git a/src/misc.cpp b/src/misc.cpp
index 017913ed0..1a163e6c8 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -10,7 +10,6 @@
 /** @file misc.cpp Misc functions that shouldn't be here. */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "landscape.h"
 #include "news_func.h"
 #include "variables.h"
@@ -27,7 +26,6 @@
 #include "network/network_func.h"
 #include "window_func.h"
 
-#include "table/sprites.h"
 
 extern TileIndex _cur_tileloop_tile;
 extern void MakeNewgameSettingsLive();
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index cc15bb8f5..9af5b2f9a 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -10,7 +10,6 @@
 /** @file misc_cmd.cpp Some misc functions that are better fitted in other files, but never got moved there... */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "command_func.h"
 #include "economy_func.h"
 #include "window_func.h"
@@ -22,7 +21,6 @@
 #include "gfx_func.h"
 #include "functions.h"
 #include "vehicle_func.h"
-#include "string_func.h"
 #include "company_func.h"
 #include "company_gui.h"
 #include "vehicle_base.h"
diff --git a/src/network/core/tcp_game.cpp b/src/network/core/tcp_game.cpp
index b0c685378..027498ea1 100644
--- a/src/network/core/tcp_game.cpp
+++ b/src/network/core/tcp_game.cpp
@@ -14,7 +14,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "../../stdafx.h"
-#include "../../openttd.h"
 
 #include "../network_internal.h"
 #include "../../core/pool_func.hpp"
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 04624648c..cf67ca1fa 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -13,7 +13,6 @@
 
 #ifdef ENABLE_NETWORK
 
-#include "../openttd.h"
 #include "../strings_func.h"
 #include "../command_func.h"
 #include "../date_func.h"
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index e7bca2778..5db576ad6 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -13,7 +13,6 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../openttd.h"
 #include "network_internal.h"
 #include "network_gui.h"
 #include "../saveload/saveload.h"
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index a5aaf1def..1879446be 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -11,7 +11,6 @@
 
 #ifdef ENABLE_NETWORK
 #include "../stdafx.h"
-#include "../openttd.h"
 #include "../strings_func.h"
 #include "../date_func.h"
 #include "../fios.h"
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 898e471ee..641de9109 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -28,7 +28,6 @@
 #include "../company_func.h"
 #include "../company_gui.h"
 #include "../window_func.h"
-#include "../openttd.h"
 #include "../cargotype.h"
 
 #include "table/strings.h"
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 25fc2eba4..651c5e369 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -18,7 +18,6 @@
 #include "fileio_func.h"
 #include "engine_func.h"
 #include "engine_base.h"
-#include "spritecache.h"
 #include "variables.h"
 #include "bridge.h"
 #include "town.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 4840aca3e..29645cb0a 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -15,7 +15,6 @@
 #include "variables.h"
 #undef VARDEF
 
-#include "openttd.h"
 
 #include "blitter/factory.hpp"
 #include "sound/sound_driver.hpp"
@@ -59,9 +58,7 @@
 #include "rev.h"
 #include "highscore.h"
 #include "thread/thread.h"
-#include "base_station_base.h"
 #include "station_base.h"
-#include "airport.h"
 #include "crashlog.h"
 
 #include "newgrf_commons.h"
diff --git a/src/saveload/cargopacket_sl.cpp b/src/saveload/cargopacket_sl.cpp
index 9e07fa226..8090ed6ea 100644
--- a/src/saveload/cargopacket_sl.cpp
+++ b/src/saveload/cargopacket_sl.cpp
@@ -10,7 +10,6 @@
 /** @file cargopacket_sl.cpp Code handling saving and loading of cargo packets */
 
 #include "../stdafx.h"
-#include "../cargopacket.h"
 #include "../vehicle_base.h"
 #include "../station_base.h"
 
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp
index 8ac406ec8..05e7ece45 100644
--- a/src/saveload/order_sl.cpp
+++ b/src/saveload/order_sl.cpp
@@ -11,7 +11,6 @@
 
 #include "../stdafx.h"
 #include "../order_base.h"
-#include "../core/alloc_func.hpp"
 #include "../settings_type.h"
 
 #include "saveload.h"
diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp
index 60dccae4b..8b82f52d0 100644
--- a/src/saveload/strings_sl.cpp
+++ b/src/saveload/strings_sl.cpp
@@ -10,8 +10,6 @@
 /** @file strings_sl.cpp Code handling saving and loading of strings */
 
 #include "../stdafx.h"
-#include "../core/alloc_func.hpp"
-#include "../core/math_func.hpp"
 #include "../string_func.h"
 #include "saveload_internal.h"
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 94d341271..882e5e83e 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "stdafx.h"
-#include "openttd.h"
 #include "currency.h"
 #include "screenshot.h"
 #include "variables.h"
diff --git a/src/station.cpp b/src/station.cpp
index ba0020c73..f1bf4b2bd 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -11,7 +11,6 @@
 
 #include "stdafx.h"
 #include "company_func.h"
-#include "newgrf_cargo.h"
 #include "cargotype.h"
 #include "roadveh.h"
 #include "functions.h"
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index 0434fe75b..73d7da29a 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -16,7 +16,6 @@
 #include "viewport_func.h"
 #include "company_base.h"
 #include "town.h"
-#include "sprite.h"
 #include "bridge_map.h"
 #include "genworld.h"
 #include "autoslope.h"
diff --git a/src/widget.cpp b/src/widget.cpp
index 2a43b58ef..0129fca4b 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -15,7 +15,6 @@
 #include "window_gui.h"
 #include "viewport_func.h"
 #include "zoom_func.h"
-#include "debug.h"
 #include "strings_func.h"
 #include "transparency.h"
 
diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
index 547521754..72bc30856 100644
--- a/src/widgets/dropdown.cpp
+++ b/src/widgets/dropdown.cpp
@@ -16,7 +16,6 @@
 #include "../window_func.h"
 #include "dropdown_type.h"
 
-#include "table/strings.h"
 
 void DropDownListItem::Draw(int left, int right, int top, int bottom, bool sel, int bg_colour) const
 {