8 files changed, 9 insertions, 21 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 7d13f2a70..a9b324b1e 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -1352,7 +1352,8 @@ void BeingHandler::processBeingMove2(Net::MessageIn &msg)
       * later versions of eAthena for both mobs and
       * players
       */
-    Being *const dstBeing = actorManager->findBeing(msg.readBeingId("being id"));
+    Being *const dstBeing = actorManager->findBeing(
+        msg.readBeingId("being id"));
 
     /*
       * This packet doesn't have enough info to actually
@@ -1387,7 +1388,8 @@ void BeingHandler::processBeingChangeDirection(Net::MessageIn &msg)
         return;
     }
 
-    Being *const dstBeing = actorManager->findBeing(msg.readBeingId("being id"));
+    Being *const dstBeing = actorManager->findBeing(
+        msg.readBeingId("being id"));
 
     if (!dstBeing)
     {
@@ -1525,7 +1527,8 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg)
         return;
     }
 
-    Being *const dstBeing = actorManager->findBeing(msg.readBeingId("being id"));
+    Being *const dstBeing = actorManager->findBeing(
+        msg.readBeingId("being id"));
 
     if (dstBeing)
     {
@@ -1598,7 +1601,8 @@ void BeingHandler::processIpResponse(Net::MessageIn &msg)
         return;
     }
 
-    Being *const dstBeing = actorManager->findBeing(msg.readBeingId("being id"));
+    Being *const dstBeing = actorManager->findBeing(
+        msg.readBeingId("being id"));
     if (dstBeing)
         dstBeing->setIp(ipToString(msg.readInt32("ip address")));
     BLOCK_END("BeingHandler::processIpResponse")
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 28261579e..7ee35c689 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -27,8 +27,6 @@
 
 #include "being/playerinfo.h"
 
-#include "enums/being/attributes.h"
-
 #include "gui/windows/buydialog.h"
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/shopwindow.h"
@@ -40,7 +38,6 @@
 
 #include "resources/notifytypes.h"
 
-#include "utils/stringutils.h"
 #include "utils/timer.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 32a09817a..71c56e457 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -26,10 +26,6 @@
 #include "configuration.h"
 #include "settings.h"
 
-#include "enums/being/attributes.h"
-
-#include "enums/gui/dialogtype.h"
-
 #include "gui/windows/charcreatedialog.h"
 #include "gui/windows/okdialog.h"
 
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index ed3a1318f..70ee87049 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -41,10 +41,6 @@
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "utils/stringutils.h"
-
-#include <string>
-
 #include "debug.h"
 
 extern Net::ChatHandler *chatHandler;
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 83bc6e966..f1d7cd748 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -23,6 +23,7 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
+#include "logger.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index e7da97a1d..8c173f248 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -25,8 +25,6 @@
 #include "client.h"
 #include "configuration.h"
 
-#include "enums/being/attributes.h"
-
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/statuswindow.h"
diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp
index bd96ba0f0..a83672f87 100644
--- a/src/net/tmwa/guildmanager.cpp
+++ b/src/net/tmwa/guildmanager.cpp
@@ -28,8 +28,6 @@
 
 #include "being/localplayer.h"
 
-#include "enums/net/packettype.h"
-
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/socialwindow.h"
 
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 8a730db8f..8707c5212 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -24,8 +24,6 @@
 
 #include "being/localplayer.h"
 
-#include "enums/being/attributes.h"
-
 #include "gui/windows/statuswindow.h"
 
 #include "net/tmwa/inventoryhandler.h"