(svn r15299) -Cleanup: remove many redundant includes

10 files changed, 1 insertions, 47 deletions

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 237dbd57a..99b63cf4a 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -8,13 +8,10 @@
 #ifdef ENABLE_NETWORK
 
 #include "../openttd.h"
-#include "../debug.h"
 #include "../strings_func.h"
-#include "../map_func.h"
 #include "../command_func.h"
 #include "../variables.h"
 #include "../date_func.h"
-#include "../newgrf_config.h"
 #include "network_internal.h"
 #include "network_client.h"
 #include "network_server.h"
@@ -22,18 +19,15 @@
 #include "network_udp.h"
 #include "network_gamelist.h"
 #include "core/udp.h"
-#include "core/tcp.h"
-#include "core/core.h"
 #include "core/host.h"
 #include "network_gui.h"
 #include "../console_func.h"
-#include <stdarg.h> /* va_list */
 #include "../md5.h"
-#include "../texteff.hpp"
 #include "../core/random_func.hpp"
 #include "../window_func.h"
 #include "../string_func.h"
 #include "../company_func.h"
+#include "../company_base.h"
 #include "../settings_type.h"
 #include "../landscape_type.h"
 #include "../rev.h"
@@ -42,7 +36,6 @@
 	#include "../fileio_func.h"
 #endif /* DEBUG_DUMP_COMMANDS */
 #include "table/strings.h"
-#include "../company_base.h"
 #include "../oldpool_func.h"
 
 DECLARE_POSTFIX_INCREMENT(ClientID);
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 8968007ea..e53a8dbf3 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -7,8 +7,6 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "network.h"
-#include "network_type.h"
 #include "../date_func.h"
 #include "../gfx_func.h"
 #include "../strings_func.h"
@@ -16,12 +14,9 @@
 #include "../console_func.h"
 #include "../video/video_driver.hpp"
 #include "../table/sprites.h"
-#include "../window_gui.h"
-#include "../textbuf_gui.h"
 #include "../querystring_gui.h"
 #include "../town.h"
 #include "../window_func.h"
-#include "../settings_type.h"
 #include "network_internal.h"
 #include "network_client.h"
 
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 59a0b3922..52cc42e8f 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -9,15 +9,10 @@
 #include "../openttd.h"
 #include "../gfx_func.h"
 #include "network_internal.h"
-#include "core/tcp.h"
-#include "network_client.h"
-#include "network_gamelist.h"
 #include "network_gui.h"
 #include "../saveload/saveload.h"
 #include "../command_func.h"
 #include "../console_func.h"
-#include "../variables.h"
-#include "../core/alloc_func.hpp"
 #include "../fileio_func.h"
 #include "../md5.h"
 #include "../strings_func.h"
@@ -26,7 +21,6 @@
 #include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
-#include "../company_type.h"
 #include "../settings_type.h"
 #include "../rev.h"
 
diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp
index 4adeb92f6..36a3a1136 100644
--- a/src/network/network_command.cpp
+++ b/src/network/network_command.cpp
@@ -12,7 +12,6 @@
 #include "../callback_table.h"
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
-#include "../date_func.h"
 #include "../company_func.h"
 
 /** Local queue of packets */
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index fa7f83624..6f918f2e3 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -5,18 +5,13 @@
 #if defined(ENABLE_NETWORK)
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "../rev.h"
-#include "../core/alloc_func.hpp"
-#include "../core/math_func.hpp"
-#include "../newgrf_config.h"
 #include "../fileio_func.h"
 #include "../string_func.h"
 #include "../ai/ai.hpp"
 #include "../window_func.h"
 #include "../gui.h"
 #include "../variables.h"
-#include "core/host.h"
 #include "network_content.h"
 
 #include "table/strings.h"
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index c5ccd933b..633db8687 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -10,7 +10,6 @@
 #include "../window_func.h"
 #include "../window_gui.h"
 #include "../gui.h"
-#include "../core/smallvec_type.hpp"
 #include "../ai/ai.hpp"
 #include "../gfxinit.h"
 #include "../sortlist_type.h"
diff --git a/src/network/network_gamelist.cpp b/src/network/network_gamelist.cpp
index e50f5cc38..8d897d9bd 100644
--- a/src/network/network_gamelist.cpp
+++ b/src/network/network_gamelist.cpp
@@ -9,15 +9,12 @@
 
 #include "../stdafx.h"
 #include "../debug.h"
-#include "../newgrf_config.h"
 #include "../core/alloc_func.hpp"
 #include "../thread.h"
 #include "../string_func.h"
 #include "network_internal.h"
-#include "core/game.h"
 #include "network_udp.h"
 #include "network_gamelist.h"
-#include "network_gui.h"
 
 NetworkGameList *_network_game_list = NULL;
 
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 712e800d5..6a59e1a6c 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -6,26 +6,18 @@
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../strings_func.h"
-#include "network.h"
 #include "../date_func.h"
 #include "../fios.h"
 #include "network_internal.h"
 #include "network_client.h"
-#include "network_content.h"
 #include "network_gui.h"
 #include "network_gamelist.h"
 #include "../gui.h"
-#include "../window_gui.h"
-#include "../variables.h"
 #include "network_server.h"
 #include "network_udp.h"
-#include "../newgrf.h"
-#include "../functions.h"
 #include "../window_func.h"
-#include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "../gfx_func.h"
-#include "../company_func.h"
 #include "../settings_type.h"
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index f33714f0b..20820c4ab 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -5,13 +5,10 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../openttd.h" // XXX StringID
 #include "../debug.h"
 #include "../strings_func.h"
 #include "network_internal.h"
-#include "core/tcp.h"
 #include "../vehicle_base.h"
-#include "../vehicle_func.h"
 #include "../date_func.h"
 #include "network_server.h"
 #include "network_udp.h"
@@ -19,12 +16,9 @@
 #include "../command_func.h"
 #include "../saveload/saveload.h"
 #include "../station_base.h"
-#include "../variables.h"
 #include "../genworld.h"
-#include "../core/alloc_func.hpp"
 #include "../fileio_func.h"
 #include "../string_func.h"
-#include "../company_base.h"
 #include "../company_func.h"
 #include "../company_gui.h"
 #include "../settings_type.h"
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp
index 193b21b68..00c5410db 100644
--- a/src/network/network_udp.cpp
+++ b/src/network/network_udp.cpp
@@ -10,20 +10,16 @@
 #ifdef ENABLE_NETWORK
 
 #include "../stdafx.h"
-#include "../debug.h"
 #include "../date_func.h"
 #include "../map_func.h"
 #include "network_gamelist.h"
 #include "network_internal.h"
 #include "network_udp.h"
 #include "core/host.h"
-#include "../variables.h"
-#include "../newgrf_config.h"
 #include "../core/endian_func.hpp"
 #include "../core/alloc_func.hpp"
 #include "../string_func.h"
 #include "../company_base.h"
-#include "../company_func.h"
 #include "../settings_type.h"
 #include "../thread.h"
 #include "../rev.h"