(svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.

src/network/core/packet.cpp

@@ -8,7 +8,6 @@
 
 #include "../../stdafx.h"
 #include "../../string.h"
-#include "../../helpers.hpp"
 
 #include "packet.h"
 

src/network/core/tcp.cpp

@@ -16,7 +16,6 @@
 #include "../network_data.h"
 #include "packet.h"
 #include "tcp.h"
-#include "../../helpers.hpp"
 
 /** Very ugly temporary hack !!! */
 void NetworkTCPSocketHandler::Initialize()

src/network/core/udp.cpp

@@ -10,6 +10,7 @@
 #include "../../debug.h"
 #include "../../core/bitmath_func.hpp"
 #include "../../core/math_func.hpp"
+#include "../../core/alloc_func.hpp"
 #include "packet.h"
 #include "udp.h"
 

src/network/network_client.cpp

@@ -19,7 +19,7 @@
 #include "../console.h"
 #include "../variables.h"
 #include "../ai/ai.h"
-#include "../helpers.hpp"
+#include "../core/alloc_func.hpp"
 #include "../fileio.h"
 #include "../md5.h"
 #include "../strings_func.h"

src/network/network_data.cpp

@@ -9,7 +9,7 @@
 #include "network_client.h"
 #include "../command_func.h"
 #include "../callback_table.h"
-#include "../helpers.hpp"
+#include "../core/alloc_func.hpp"
 
 // Add a command to the local command queue
 void NetworkAddCommandQueue(NetworkTCPSocketHandler *cs, CommandPacket *cp)

src/network/network_gamelist.cpp

@@ -10,7 +10,7 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../newgrf_config.h"
-#include "../helpers.hpp"
+#include "../core/alloc_func.hpp"
 #include "core/game.h"
 #include "network_udp.h"
 #include "network_gamelist.h"

src/network/network_gui.cpp

@@ -26,7 +26,6 @@
 #include "../string.h"
 #include "../town.h"
 #include "../newgrf.h"
-#include "../helpers.hpp"
 
 #define BGC 5
 #define BTC 15

src/network/network_server.cpp

@@ -23,7 +23,7 @@
 #include "../station.h"
 #include "../variables.h"
 #include "../genworld.h"
-#include "../helpers.hpp"
+#include "../core/alloc_func.hpp"
 #include "../fileio.h"
 
 // This file handles all the server-commands