--- a/console_cmds.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/console_cmds.c	Thu Oct 12 14:13:39 2006 +0000
@@ -22,11 +22,7 @@
 #include "screenshot.h"
 #include "genworld.h"
 #include "date.h"
-
-#ifdef ENABLE_NETWORK
-	#include "table/strings.h"
-	#include "network.h"
-#endif /*ENABLE_NETWORK*/
+#include "network.h"
 
 // ** scriptfile handling ** //
 static FILE *_script_file;
@@ -1193,6 +1189,10 @@
 	return true;
 }
 
+#ifdef ENABLE_NETWORK
+	#include "table/strings.h"
+#endif /* ENABLE_NETWORK */
+
 DEF_CONSOLE_CMD(ConPlayers)
 {
 	Player *p;

--- a/network.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,16 +1,7 @@
 /* $Id$ */
 
 #include "stdafx.h"
-#include "openttd.h"
-#include "debug.h"
-#include "functions.h"
-#include "string.h"
-#include "strings.h"
-#include "map.h"
 #include "network_data.h"
-#include "command.h"
-#include "variables.h"
-#include "date.h"
 
 #if defined(WITH_REV)
 	extern const char _openttd_revision[];
@@ -24,6 +15,15 @@
 
 #ifdef ENABLE_NETWORK
 
+#include "openttd.h"
+#include "debug.h"
+#include "functions.h"
+#include "string.h"
+#include "strings.h"
+#include "map.h"
+#include "command.h"
+#include "variables.h"
+#include "date.h"
 #include "table/strings.h"
 #include "network_client.h"
 #include "network_server.h"

--- a/network_client.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network_client.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,14 +1,13 @@
 /* $Id$ */
 
+#ifdef ENABLE_NETWORK
+
 #include "stdafx.h"
 #include "debug.h"
 #include "string.h"
 #include "strings.h"
 #include "network_data.h"
 #include "date.h"
-
-#ifdef ENABLE_NETWORK
-
 #include "table/strings.h"
 #include "functions.h"
 #include "network_client.h"

--- a/network_data.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network_data.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,12 +1,10 @@
 /* $Id$ */
 
+#ifdef ENABLE_NETWORK
+
 #include "stdafx.h"
 #include "debug.h"
 #include "network_data.h"
-
-// Is the network enabled?
-#ifdef ENABLE_NETWORK
-
 #include "functions.h"
 #include "string.h"
 #include "table/strings.h"

--- a/network_gamelist.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network_gamelist.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,11 +1,11 @@
 /* $Id$ */
 
+#ifdef ENABLE_NETWORK
+
 #include "stdafx.h"
 #include "debug.h"
 #include "network_data.h"
 
-#ifdef ENABLE_NETWORK
-
 // This file handles the GameList
 // Also, it handles the request to a server for data about the server
 

--- a/network_gui.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network_gui.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,5 +1,6 @@
 /* $Id$ */
 
+#ifdef ENABLE_NETWORK
 #include "stdafx.h"
 #include "openttd.h"
 #include "string.h"
@@ -9,13 +10,11 @@
 #include "date.h"
 
 #include "fios.h"
-
-#ifdef ENABLE_NETWORK
-
 #include "table/strings.h"
 #include "functions.h"
 #include "network_data.h"
 #include "network_client.h"
+#include "network_gui.h"
 #include "network_gamelist.h"
 #include "window.h"
 #include "gui.h"

--- a/network_server.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network_server.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,5 +1,7 @@
 /* $Id$ */
 
+#ifdef ENABLE_NETWORK
+
 #include "stdafx.h"
 #include "debug.h"
 #include "string.h"
@@ -7,9 +9,6 @@
 #include "network_data.h"
 #include "train.h"
 #include "date.h"
-
-#ifdef ENABLE_NETWORK
-
 #include "table/strings.h"
 #include "functions.h"
 #include "network_server.h"

--- a/network_udp.c	Thu Oct 12 13:46:45 2006 +0000
+++ b/network_udp.c	Thu Oct 12 14:13:39 2006 +0000
@@ -1,13 +1,12 @@
 /* $Id$ */
 
+#ifdef ENABLE_NETWORK
+
 #include "stdafx.h"
 #include "debug.h"
 #include "string.h"
 #include "network_data.h"
 #include "date.h"
-
-#ifdef ENABLE_NETWORK
-
 #include "map.h"
 #include "network_gamelist.h"
 #include "network_udp.h"