diff --git a/src/network/core/game.h b/src/network/core/game.h
index 71268f7d2a..2c0a0178b4 100644
--- a/src/network/core/game.h
+++ b/src/network/core/game.h
@@ -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.
diff --git a/src/network/core/packet.c b/src/network/core/packet.c
index 957bd2ad6a..aed0b6299d 100644
--- a/src/network/core/packet.c
+++ b/src/network/core/packet.c
@@ -6,8 +6,6 @@
 #include "../../macros.h"
 #include "../../string.h"
 
-#include "os_abstraction.h"
-#include "config.h"
 #include "packet.h"
 
 /**
diff --git a/src/network/core/packet.h b/src/network/core/packet.h
index 2510c69a7f..a44c6b50ec 100644
--- a/src/network/core/packet.h
+++ b/src/network/core/packet.h
@@ -5,6 +5,8 @@
 
 #ifdef ENABLE_NETWORK
 
+#include "config.h"
+
 /**
  * @file packet.h Basic functions to create, fill and read packets.
  */
diff --git a/src/network/core/tcp.c b/src/network/core/tcp.c
index ec073c7ce2..807288a86d 100644
--- a/src/network/core/tcp.c
+++ b/src/network/core/tcp.c
@@ -9,10 +9,8 @@
 #include "table/strings.h"
 #include "../../functions.h"
 
-#include "os_abstraction.h"
-#include "config.h"
-#include "packet.h"
 #include "../network_data.h"
+#include "packet.h"
 #include "tcp.h"
 
 /**
diff --git a/src/network/core/tcp.h b/src/network/core/tcp.h
index e3c3073531..ab5c9b8e0a 100644
--- a/src/network/core/tcp.h
+++ b/src/network/core/tcp.h
@@ -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.
  */
diff --git a/src/network/core/udp.c b/src/network/core/udp.c
index d688233b07..93c24a1561 100644
--- a/src/network/core/udp.c
+++ b/src/network/core/udp.c
@@ -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"
 
diff --git a/src/network/core/udp.h b/src/network/core/udp.h
index ab7682836f..ce8b0e88f6 100644
--- a/src/network/core/udp.h
+++ b/src/network/core/udp.h
@@ -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.
  */