--- a/src/network/core/game.h	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/game.h	Thu Jan 04 21:21:14 2007 +0000
@@ -5,6 +5,10 @@
 
 #ifdef ENABLE_NETWORK
 
+#include "config.h"
+#include "../../date.h"
+#include "../../newgrf_config.h"
+
 /**
  * @file game.h Information about a game that is sent between a
  *              game server, game client and masterserver.

--- a/src/network/core/packet.c	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/packet.c	Thu Jan 04 21:21:14 2007 +0000
@@ -6,8 +6,6 @@
 #include "../../macros.h"
 #include "../../string.h"
 
-#include "os_abstraction.h"
-#include "config.h"
 #include "packet.h"
 
 /**

--- a/src/network/core/packet.h	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/packet.h	Thu Jan 04 21:21:14 2007 +0000
@@ -5,6 +5,8 @@
 
 #ifdef ENABLE_NETWORK
 
+#include "config.h"
+
 /**
  * @file packet.h Basic functions to create, fill and read packets.
  */

--- a/src/network/core/tcp.c	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/tcp.c	Thu Jan 04 21:21:14 2007 +0000
@@ -9,10 +9,8 @@
 #include "table/strings.h"
 #include "../../functions.h"
 
-#include "os_abstraction.h"
-#include "config.h"
+#include "../network_data.h"
 #include "packet.h"
-#include "../network_data.h"
 #include "tcp.h"
 
 /**

--- a/src/network/core/tcp.h	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/tcp.h	Thu Jan 04 21:21:14 2007 +0000
@@ -5,6 +5,9 @@
 
 #ifdef ENABLE_NETWORK
 
+#include "os_abstraction.h"
+#include "packet.h"
+
 /**
  * @file tcp.h Basic functions to receive and send TCP packets.
  */

--- a/src/network/core/udp.c	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/udp.c	Thu Jan 04 21:21:14 2007 +0000
@@ -3,14 +3,8 @@
 #ifdef ENABLE_NETWORK
 
 #include "../../stdafx.h"
-#include "../../date.h"
 #include "../../debug.h"
 #include "../../macros.h"
-#include "../../newgrf_config.h"
-
-#include "os_abstraction.h"
-#include "config.h"
-#include "game.h"
 #include "packet.h"
 #include "udp.h"
 

--- a/src/network/core/udp.h	Thu Jan 04 20:33:50 2007 +0000
+++ b/src/network/core/udp.h	Thu Jan 04 21:21:14 2007 +0000
@@ -5,6 +5,11 @@
 
 #ifdef ENABLE_NETWORK
 
+#include "os_abstraction.h"
+#include "game.h"
+#include "packet.h"
+#include "../../newgrf_config.h"
+
 /**
  * @file udp.h Basic functions to receive and send UDP packets.
  */