6 files changed, 14 insertions, 6 deletions
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index 7137b468b..3f5149ef9 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -22,10 +22,12 @@
 
 #include "net/eathena/messagein.h"
 
+#include "logger.h"
+
 #include "net/net.h"
 #include "net/packetcounters.h"
 
-#include "logger.h"
+#include "utils/stringutils.h"
 
 #include <SDL_endian.h>
 
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index c5f0adad5..21736333c 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -108,7 +108,7 @@ Network::~Network()
 void Network::registerHandlers()
 {
 #include "net/eathena/recvpackets.inc"
-RECVPACKETS_VOID
+    RECVPACKETS_VOID
 }
 
 void Network::clearHandlers()
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index c2e96335f..7292b27ab 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -22,10 +22,12 @@
 
 #include "net/messageout.h"
 
+#include "logger.h"
+
 #include "net/net.h"
 #include "net/packetcounters.h"
 
-#include "logger.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/net.h b/src/net/net.h
index 70dbbe1d5..4d84830b0 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -31,7 +31,9 @@
  * implementations depending on the type of server the client is connecting to.
  */
 
-#include "net/serverinfo.h"
+#include "enums/net/servertype.h"
+
+class ServerInfo;
 
 namespace Net
 {
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 095ee91bf..ffea1ee4e 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -22,10 +22,12 @@
 
 #include "net/tmwa/messagein.h"
 
+#include "logger.h"
+
 #include "net/net.h"
 #include "net/packetcounters.h"
 
-#include "logger.h"
+#include "utils/stringutils.h"
 
 #include <SDL_endian.h>
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index bf574b567..12a5b1555 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -86,7 +86,7 @@ Network::~Network()
 void Network::registerHandlers()
 {
 #include "net/tmwa/recvpackets.inc"
-RECVPACKETS_VOID
+    RECVPACKETS_VOID
 }
 
 void Network::clearHandlers()