8 files changed, 6 insertions, 7 deletions
diff --git a/src/network/core/core.cpp b/src/network/core/core.cpp
index 76049f6fb..4c724e47e 100644
--- a/src/network/core/core.cpp
+++ b/src/network/core/core.cpp
@@ -15,6 +15,7 @@
 
 #include "../../stdafx.h"
 #include "../../debug.h"
+#include "os_abstraction.h"
 #include "packet.h"
 
 
diff --git a/src/network/core/core.h b/src/network/core/core.h
index a47ebff87..bf013909a 100644
--- a/src/network/core/core.h
+++ b/src/network/core/core.h
@@ -14,7 +14,6 @@
 #ifndef NETWORK_CORE_H
 #define NETWORK_CORE_H
 
-#include "os_abstraction.h"
 #include "../../newgrf_config.h"
 
 #ifdef ENABLE_NETWORK
diff --git a/src/network/core/host.h b/src/network/core/host.h
index 48f24e318..46bfa4e1f 100644
--- a/src/network/core/host.h
+++ b/src/network/core/host.h
@@ -14,6 +14,8 @@
 #ifndef NETWORK_CORE_HOST_H
 #define NETWORK_CORE_HOST_H
 
+#include "address.h"
+
 void NetworkFindBroadcastIPs(NetworkAddressList *broadcast);
 
 #endif /* NETWORK_CORE_HOST_H */
diff --git a/src/network/core/tcp.h b/src/network/core/tcp.h
index b24e241f1..b9866cc4e 100644
--- a/src/network/core/tcp.h
+++ b/src/network/core/tcp.h
@@ -14,9 +14,7 @@
 #ifndef NETWORK_CORE_TCP_H
 #define NETWORK_CORE_TCP_H
 
-#include "os_abstraction.h"
 #include "address.h"
-#include "core.h"
 #include "packet.h"
 
 #ifdef ENABLE_NETWORK
diff --git a/src/network/core/tcp_game.cpp b/src/network/core/tcp_game.cpp
index 027498ea1..ec41d1327 100644
--- a/src/network/core/tcp_game.cpp
+++ b/src/network/core/tcp_game.cpp
@@ -15,6 +15,7 @@
 
 #include "../../stdafx.h"
 
+#include "../network.h"
 #include "../network_internal.h"
 #include "../../core/pool_func.hpp"
 
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
index 7c049dfe3..a678c247a 100644
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -16,7 +16,7 @@
 
 #include "os_abstraction.h"
 #include "tcp.h"
-#include "packet.h"
+#include "../network_type.h"
 #include "../../core/pool_type.hpp"
 
 #ifdef ENABLE_NETWORK
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index c9bbcf353..e855bdfcf 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -15,6 +15,7 @@
 
 #include "../../stdafx.h"
 #include "../../date_func.h"
+#include "../../debug.h"
 #include "udp.h"
 
 /**
diff --git a/src/network/core/udp.h b/src/network/core/udp.h
index b36c1c8b2..82435d9ff 100644
--- a/src/network/core/udp.h
+++ b/src/network/core/udp.h
@@ -71,12 +71,9 @@
 #ifndef NETWORK_CORE_UDP_H
 #define NETWORK_CORE_UDP_H
 
-#include "os_abstraction.h"
 #include "address.h"
-#include "core.h"
 #include "game.h"
 #include "packet.h"
-#include "../../debug.h"
 
 #ifdef ENABLE_NETWORK