From b2f85eb044df4ea47ce53115f11a113d2914df24 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 4 Jan 2007 21:21:14 +0000 Subject: (svn r7834) -Codechange: cleanup the includes of network/core a little; include headers in headers when the header needs types/constants defined in them. --- src/network/core/game.h | 4 ++++ src/network/core/packet.c | 2 -- src/network/core/packet.h | 2 ++ src/network/core/tcp.c | 4 +--- src/network/core/tcp.h | 3 +++ src/network/core/udp.c | 6 ------ src/network/core/udp.h | 5 +++++ 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/network/core/game.h b/src/network/core/game.h index 71268f7d2..2c0a0178b 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 957bd2ad6..aed0b6299 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 2510c69a7..a44c6b50e 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 ec073c7ce..807288a86 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 e3c307353..ab5c9b8e0 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 d688233b0..93c24a156 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 ab7682836..ce8b0e88f 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. */ -- cgit v1.2.3-70-g09d2