(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.

5 files changed, 11 insertions, 7 deletions

diff --git a/src/network/core/tcp.cpp b/src/network/core/tcp.cpp
index eaed4bd07..a4b763b1a 100644
--- a/src/network/core/tcp.cpp
+++ b/src/network/core/tcp.cpp
@@ -10,12 +10,13 @@
 #include "../../debug.h"
 #include "../../openttd.h"
 #include "../../variables.h"
-#include "table/strings.h"
 
 #include "../network_data.h"
 #include "packet.h"
 #include "tcp.h"
 
+#include "table/strings.h"
+
 /** Very ugly temporary hack !!! */
 void NetworkTCPSocketHandler::Initialize()
 {
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 7b44daa5c..7040a4d71 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -15,7 +15,6 @@ extern const char _openttd_revision[];
 #include "../variables.h"
 #include "../date_func.h"
 #include "../newgrf_config.h"
-#include "table/strings.h"
 #include "network_client.h"
 #include "network_server.h"
 #include "network_udp.h"
@@ -37,6 +36,8 @@ extern const char _openttd_revision[];
 	#include "../core/alloc_func.hpp"
 #endif /* DEBUG_DUMP_COMMANDS */
 
+#include "table/strings.h"
+
 /* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */
 assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE);
 
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 190f6b944..378e6de56 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -7,7 +7,6 @@
 #include "../openttd.h"
 #include "network_data.h"
 #include "core/tcp.h"
-#include "table/strings.h"
 #include "network_client.h"
 #include "network_gamelist.h"
 #include "network_gui.h"
@@ -26,6 +25,8 @@
 #include "../player_base.h"
 #include "../player_gui.h"
 
+#include "table/strings.h"
+
 // This file handles all the client-commands
 
 
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index ee7106bcf..7cee89512 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -4,12 +4,9 @@
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../strings_func.h"
-#include "../table/sprites.h"
 #include "network.h"
 #include "../date_func.h"
-
 #include "../fios.h"
-#include "table/strings.h"
 #include "network_data.h"
 #include "network_client.h"
 #include "network_gui.h"
@@ -29,6 +26,9 @@
 #include "../gfx_func.h"
 #include "../player_func.h"
 
+#include "table/strings.h"
+#include "../table/sprites.h"
+
 #define BGC 5
 #define BTC 15
 
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index bb56bba89..b0f4ed659 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -11,7 +11,6 @@
 #include "../train.h"
 #include "../aircraft.h"
 #include "../date_func.h"
-#include "table/strings.h"
 #include "network_server.h"
 #include "network_udp.h"
 #include "../console.h"
@@ -27,6 +26,8 @@
 #include "../player_func.h"
 #include "../player_gui.h"
 
+#include "table/strings.h"
+
 // This file handles all the server-commands
 
 static void NetworkHandleCommandQueue(NetworkTCPSocketHandler* cs);