13 files changed, 16 insertions, 0 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 5d9c434de..769a498b3 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -26,6 +26,8 @@
 #include "settings.h"
 
 #include "fs/files.h"
+
+#include "utils/cast.h"
 #include "utils/sdlhelper.h"
 
 #include <zlib.h>
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 0596e9952..28aefef7a 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -27,6 +27,7 @@
 #include "logger.h"
 #include "settings.h"
 
+#include "utils/cast.h"
 #include "utils/dtor.h"
 
 #include "net/logindata.h"
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 949d82cf6..ad7909c7a 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -27,6 +27,7 @@
 
 #include "net/packetinfo.h"
 
+#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
diff --git a/src/net/eathena/generalrecv.cpp b/src/net/eathena/generalrecv.cpp
index 58f16c9df..2074fe31e 100644
--- a/src/net/eathena/generalrecv.cpp
+++ b/src/net/eathena/generalrecv.cpp
@@ -27,6 +27,7 @@
 
 #include "net/messagein.h"
 
+#include "utils/cast.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index a53748be0..c5cb79fda 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -27,6 +27,7 @@
 #include "net/net.h"
 #include "net/packetcounters.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 4c6194fdd..79ac29f51 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -79,6 +79,7 @@
 
 #include "resources/db/networkdb.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/foreach.h"
 
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 11b28d510..f474da086 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -24,6 +24,7 @@
 
 #include "net/packetcounters.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 #include "logger.h"
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 1be005220..3e07ee28b 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -31,6 +31,8 @@
 
 #include "localconsts.h"
 
+UTILS_CAST_H
+
 #define createOutPacket(name) MessageOut outMsg(name); \
     outMsg.writeInt16(CAST_S16(name), #name)
 
diff --git a/src/net/packetlimiter.cpp b/src/net/packetlimiter.cpp
index b6eee37ae..8dc8211b2 100644
--- a/src/net/packetlimiter.cpp
+++ b/src/net/packetlimiter.cpp
@@ -23,6 +23,7 @@
 #include "configuration.h"
 #include "settings.h"
 
+#include "utils/cast.h"
 #include "utils/checkutils.h"
 #include "utils/timer.h"
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 577d384b7..1e0019219 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -67,6 +67,7 @@
 #include "net/tmwa/searchstorehandler.h"
 #include "net/tmwa/vendinghandler.h"
 
+#include "utils/cast.h"
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
diff --git a/src/net/tmwa/generalrecv.cpp b/src/net/tmwa/generalrecv.cpp
index f9f933d85..0bc1c6a4c 100644
--- a/src/net/tmwa/generalrecv.cpp
+++ b/src/net/tmwa/generalrecv.cpp
@@ -27,6 +27,7 @@
 
 #include "net/messagein.h"
 
+#include "utils/cast.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 845df01e3..792f88743 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -27,6 +27,7 @@
 #include "net/net.h"
 #include "net/packetcounters.h"
 
+#include "utils/cast.h"
 #include "utils/stringutils.h"
 
 PRAGMA48(GCC diagnostic push)
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 30ec6e8ec..ebc4db9e6 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -59,6 +59,8 @@
 
 #include "net/tmwa/messagein.h"
 
+#include "utils/cast.h"
+
 #include "debug.h"
 
 namespace TmwAthena