Fix code style.

32 files changed, 91 insertions, 201 deletions

diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index d8287205f..cf0df34e4 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -22,37 +22,13 @@
 
 #include "net/tmwa/beinghandler.h"
 
-#include "actormanager.h"
-#include "effectmanager.h"
-#include "guild.h"
-#include "party.h"
-
-#include "being/localplayer.h"
-
-#include "particle/particle.h"
-
-#include "input/keyboardconfig.h"
-
-#include "gui/windows/outfitwindow.h"
-#include "gui/windows/socialwindow.h"
-
-#include "net/serverfeatures.h"
-
 #include "net/ea/beingrecv.h"
 
 #include "net/tmwa/beingrecv.h"
-#include "net/tmwa/guildmanager.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 #include "net/tmwa/sprite.h"
 
-#include "resources/iteminfo.h"
-
-#include "resources/db/itemdb.h"
-
-#include "utils/stringutils.h"
-#include "utils/timer.h"
-
 #include "debug.h"
 
 extern Net::BeingHandler *beingHandler;
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 6e326ea65..d77a4bffa 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -36,13 +36,13 @@
 #include "gui/windows/outfitwindow.h"
 #include "gui/windows/socialwindow.h"
 
+#include "net/beinghandler.h"
+#include "net/messagein.h"
 #include "net/serverfeatures.h"
 
 #include "net/ea/beingrecv.h"
 
 #include "net/tmwa/guildmanager.h"
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
 #include "net/tmwa/sprite.h"
 
 #include "resources/iteminfo.h"
@@ -750,7 +750,8 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
     const uint16_t shield = msg.readInt16("shield");
     const uint16_t headTop = msg.readInt16("head top");
     const uint16_t headMid = msg.readInt16("head mid");
-    const ItemColor hairColor = fromInt(msg.readUInt8("hair color"), ItemColor);
+    const ItemColor hairColor = fromInt(msg.readUInt8("hair color"),
+        ItemColor);
     msg.readUInt8("unused");
     const uint16_t shoes = msg.readInt16("shoes / clothes color");
 
diff --git a/src/net/tmwa/beingrecv.h b/src/net/tmwa/beingrecv.h
index 9bc660b4f..adb059a6a 100644
--- a/src/net/tmwa/beingrecv.h
+++ b/src/net/tmwa/beingrecv.h
@@ -20,12 +20,27 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef NET_TMWA_BEING_H
-#define NET_TMWA_BEING_H
+#ifndef NET_TMWA_BEINGRECV_H
+#define NET_TMWA_BEINGRECV_H
 
-#include "net/ea/beinghandler.h"
+#if defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if defined(__APPLE__)
+#include <tr1/cstdint>
+#else
+#include <cstdint>
+#endif
+#else
+#include <stdint.h>
+#endif
 
-#include "net/tmwa/messagehandler.h"
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
+class Being;
 
 namespace TmwAthena
 {
@@ -63,4 +78,4 @@ namespace TmwAthena
     }  // namespace BeingRecv
 }  // namespace TmwAthena
 
-#endif  // NET_TMWA_BEING_H
+#endif  // NET_TMWA_BEINGRECV_H
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 1d15f4ad7..963a40a5f 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -23,18 +23,10 @@
 #include "net/tmwa/buysellhandler.h"
 
 #include "configuration.h"
-#include "notifymanager.h"
 
-#include "being/playerinfo.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/buydialog.h"
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/shopwindow.h"
 
-#include "gui/widgets/createwidget.h"
-
 #include "net/chathandler.h"
 
 #include "net/ea/buysellrecv.h"
diff --git a/src/net/tmwa/buysellrecv.cpp b/src/net/tmwa/buysellrecv.cpp
index 78f55b378..52f04cac2 100644
--- a/src/net/tmwa/buysellrecv.cpp
+++ b/src/net/tmwa/buysellrecv.cpp
@@ -22,7 +22,6 @@
 
 #include "net/tmwa/buysellrecv.h"
 
-#include "configuration.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -30,19 +29,13 @@
 #include "enums/resources/notifytypes.h"
 
 #include "gui/windows/buydialog.h"
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/shopwindow.h"
 
 #include "gui/widgets/createwidget.h"
 
-#include "net/chathandler.h"
+#include "net/buysellhandler.h"
 
 #include "net/ea/buysellrecv.h"
 
-#include "net/tmwa/protocol.h"
-
-#include "utils/timer.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/buysellrecv.h b/src/net/tmwa/buysellrecv.h
index 577f481e8..d0ba12e88 100644
--- a/src/net/tmwa/buysellrecv.h
+++ b/src/net/tmwa/buysellrecv.h
@@ -23,9 +23,10 @@
 #ifndef NET_TMWA_BUYSELLRECV_H
 #define NET_TMWA_BUYSELLRECV_H
 
-#include "net/ea/buysellhandler.h"
-
-#include "net/tmwa/messagehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 2be2f1250..4666ba7b9 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -23,13 +23,8 @@
 #include "net/tmwa/charserverhandler.h"
 
 #include "client.h"
-#include "configuration.h"
-#include "settings.h"
 
 #include "gui/windows/charcreatedialog.h"
-#include "gui/windows/okdialog.h"
-
-#include "gui/widgets/createwidget.h"
 
 #include "net/character.h"
 
@@ -38,19 +33,13 @@
 #include "net/ea/charserverrecv.h"
 
 #include "net/tmwa/charserverrecv.h"
-#include "net/tmwa/gamehandler.h"
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
-#include "net/tmwa/sprite.h"
-
-#include "resources/iteminfo.h"
 
 #include "resources/db/chardb.h"
-#include "resources/db/itemdb.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp
index fb8ef6f8e..4d9998ab2 100644
--- a/src/net/tmwa/charserverrecv.cpp
+++ b/src/net/tmwa/charserverrecv.cpp
@@ -32,19 +32,17 @@
 #include "gui/widgets/createwidget.h"
 
 #include "net/character.h"
+#include "net/charserverhandler.h"
 
 #include "net/ea/token.h"
 
 #include "net/tmwa/gamehandler.h"
 #include "net/tmwa/loginhandler.h"
-#include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
-#include "net/tmwa/protocol.h"
 #include "net/tmwa/sprite.h"
 
 #include "resources/iteminfo.h"
 
-#include "resources/db/chardb.h"
 #include "resources/db/itemdb.h"
 
 #include "utils/dtor.h"
diff --git a/src/net/tmwa/charserverrecv.h b/src/net/tmwa/charserverrecv.h
index fa01d8f95..13812a9da 100644
--- a/src/net/tmwa/charserverrecv.h
+++ b/src/net/tmwa/charserverrecv.h
@@ -23,9 +23,12 @@
 #ifndef NET_TMWA_CHARSERVERRECV_H
 #define NET_TMWA_CHARSERVERRECV_H
 
-#include "net/ea/charserverhandler.h"
+namespace Net
+{
+    class MessageIn;
 
-#include "net/tmwa/messagehandler.h"
+    struct Character;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index b13e44b91..ad34acb61 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -22,29 +22,20 @@
 
 #include "net/tmwa/chathandler.h"
 
-#include "actormanager.h"
-#include "configuration.h"
-
 #include "being/localplayer.h"
-#include "being/playerrelation.h"
-#include "being/playerrelations.h"
 
 #include "gui/chatconsts.h"
 
-#include "gui/widgets/tabs/chat/gmtab.h"
-
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/shopwindow.h"
-
 #include "net/serverfeatures.h"
 
 #include "net/ea/chatrecv.h"
 
 #include "net/tmwa/chatrecv.h"
-#include "net/tmwa/guildmanager.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
+#include "utils/stringutils.h"
+
 #include "debug.h"
 
 extern Net::ChatHandler *chatHandler;
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index de0b9a9ed..561511041 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -40,8 +40,9 @@
 
 #include "net/ea/chatrecv.h"
 
+#include "net/messagein.h"
+
 #include "net/tmwa/guildmanager.h"
-#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
@@ -63,7 +64,7 @@ void ChatRecv::processChat(Net::MessageIn &msg)
 }
 
 void ChatRecv::processChatContinue(std::string chatMsg,
-                                      const std::string &channel)
+                                   const std::string &channel)
 {
     const size_t pos = chatMsg.find(" : ", 0);
 
@@ -213,7 +214,7 @@ void ChatRecv::processWhisperResponse(Net::MessageIn &msg)
 }
 
 void ChatRecv::processWhisperContinue(const std::string &nick,
-                                         std::string chatMsg)
+                                      std::string chatMsg)
 {
     // ignoring future whisper messages
     if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0)
diff --git a/src/net/tmwa/chatrecv.h b/src/net/tmwa/chatrecv.h
index 18d56a525..e8a448659 100644
--- a/src/net/tmwa/chatrecv.h
+++ b/src/net/tmwa/chatrecv.h
@@ -23,14 +23,15 @@
 #ifndef NET_TMWA_CHATRECV_H
 #define NET_TMWA_CHATRECV_H
 
-#include "net/ea/chathandler.h"
+#include <string>
 
-#include "net/tmwa/messagehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
-    class MessageOut;
-
     namespace ChatRecv
     {
         void processChat(Net::MessageIn &msg);
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index fee70405b..a3af6118b 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -23,7 +23,6 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
-#include "logger.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/net/tmwa/gamerecv.cpp b/src/net/tmwa/gamerecv.cpp
index b7cf5175c..ba68d9391 100644
--- a/src/net/tmwa/gamerecv.cpp
+++ b/src/net/tmwa/gamerecv.cpp
@@ -27,12 +27,9 @@
 
 #include "being/localplayer.h"
 
-#include "net/ea/token.h"
+#include "net/messagein.h"
 
-#include "net/tmwa/loginhandler.h"
-#include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
-#include "net/tmwa/protocol.h"
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/gamerecv.h b/src/net/tmwa/gamerecv.h
index 75af0b232..ab97ed621 100644
--- a/src/net/tmwa/gamerecv.h
+++ b/src/net/tmwa/gamerecv.h
@@ -23,9 +23,10 @@
 #ifndef NET_TMWA_GAMERECV_H
 #define NET_TMWA_GAMERECV_H
 
-#include "net/tmwa/messagehandler.h"
-
-#include "net/ea/gamehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/generalrecv.cpp b/src/net/tmwa/generalrecv.cpp
index bf84accb3..42fc75350 100644
--- a/src/net/tmwa/generalrecv.cpp
+++ b/src/net/tmwa/generalrecv.cpp
@@ -23,58 +23,10 @@
 #include "net/tmwa/generalrecv.h"
 
 #include "client.h"
-#include "configuration.h"
+#include "logger.h"
 
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/socialwindow.h"
-#include "gui/windows/statuswindow.h"
+#include "net/messagein.h"
 
-#include "gui/widgets/tabs/chat/guildtab.h"
-#include "gui/widgets/tabs/chat/partytab.h"
-
-#include "net/tmwa/adminhandler.h"
-#include "net/tmwa/beinghandler.h"
-#include "net/tmwa/buysellhandler.h"
-#include "net/tmwa/chathandler.h"
-#include "net/tmwa/charserverhandler.h"
-#include "net/tmwa/gamehandler.h"
-#include "net/tmwa/guildhandler.h"
-#include "net/tmwa/inventoryhandler.h"
-#include "net/tmwa/itemhandler.h"
-#include "net/tmwa/loginhandler.h"
-#include "net/tmwa/network.h"
-#include "net/tmwa/npchandler.h"
-#include "net/tmwa/partyhandler.h"
-#include "net/tmwa/pethandler.h"
-#include "net/tmwa/playerhandler.h"
-#include "net/tmwa/protocol.h"
-#include "net/tmwa/serverfeatures.h"
-#include "net/tmwa/tradehandler.h"
-#include "net/tmwa/skillhandler.h"
-#include "net/tmwa/questhandler.h"
-
-#ifdef EATHENA_SUPPORT
-#include "net/tmwa/auctionhandler.h"
-#include "net/tmwa/bankhandler.h"
-#include "net/tmwa/battlegroundhandler.h"
-#include "net/tmwa/buyingstorehandler.h"
-#include "net/tmwa/cashshophandler.h"
-#include "net/tmwa/elementalhandler.h"
-#include "net/tmwa/familyhandler.h"
-#include "net/tmwa/friendshandler.h"
-#include "net/tmwa/homunculushandler.h"
-#include "net/tmwa/mailhandler.h"
-#include "net/tmwa/maphandler.h"
-#include "net/tmwa/markethandler.h"
-#include "net/tmwa/mercenaryhandler.h"
-#include "net/tmwa/roulettehandler.h"
-#include "net/tmwa/searchstorehandler.h"
-#include "net/tmwa/vendinghandler.h"
-#endif
-
-#include "resources/db/itemdbstat.h"
-
-#include "utils/delete2.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/generalrecv.h b/src/net/tmwa/generalrecv.h
index 769fc9dfd..35db369b7 100644
--- a/src/net/tmwa/generalrecv.h
+++ b/src/net/tmwa/generalrecv.h
@@ -23,9 +23,10 @@
 #ifndef NET_TMWA_GENERALRECV_H
 #define NET_TMWA_GENERALRECV_H
 
-#include "net/generalhandler.h"
-
-#include "net/tmwa/messagehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 40beafcb3..957fe2ace 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -22,18 +22,12 @@
 #include "net/tmwa/guildhandler.h"
 
 #include "actormanager.h"
-#include "configuration.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/socialwindow.h"
-
 #include "net/serverfeatures.h"
 
-#include "gui/widgets/tabs/chat/guildtab.h"
-
 #include "net/ea/guildrecv.h"
 
 #include "net/tmwa/guildrecv.h"
diff --git a/src/net/tmwa/guildrecv.cpp b/src/net/tmwa/guildrecv.cpp
index 8e547d6b5..0a6a84fc7 100644
--- a/src/net/tmwa/guildrecv.cpp
+++ b/src/net/tmwa/guildrecv.cpp
@@ -21,8 +21,8 @@
 
 #include "net/tmwa/guildrecv.h"
 
-#include "actormanager.h"
 #include "configuration.h"
+#include "guild.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -32,13 +32,14 @@
 
 #include "net/serverfeatures.h"
 
+#include "net/messagein.h"
+
+#include "net/tmwa/guildhandler.h"
+
 #include "gui/widgets/tabs/chat/guildtab.h"
 
 #include "net/ea/guildrecv.h"
 
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/guildrecv.h b/src/net/tmwa/guildrecv.h
index 83d25bbaa..cabfa3910 100644
--- a/src/net/tmwa/guildrecv.h
+++ b/src/net/tmwa/guildrecv.h
@@ -22,9 +22,13 @@
 #ifndef NET_TMWA_GUILDRECV_H
 #define NET_TMWA_GUILDRECV_H
 
-#include "net/ea/guildhandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
-#include "net/tmwa/messagehandler.h"
+class Guild;
+class GuildTab;
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 99fda9a23..950a6b492 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -22,16 +22,11 @@
 
 #include "net/tmwa/inventoryhandler.h"
 
-#include "notifymanager.h"
+#include "item.h"
+#include "logger.h"
 
 #include "enums/equipslot.h"
 
-#include "being/localplayer.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "listeners/arrowslistener.h"
-
 #include "net/ea/inventoryrecv.h"
 
 #include "net/tmwa/inventoryrecv.h"
@@ -39,7 +34,6 @@
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
-#include "net/ea/equipbackend.h"
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp
index da3eb3f91..02dd36978 100644
--- a/src/net/tmwa/inventoryrecv.cpp
+++ b/src/net/tmwa/inventoryrecv.cpp
@@ -24,16 +24,13 @@
 
 #include "notifymanager.h"
 
-#include "enums/equipslot.h"
-
 #include "being/localplayer.h"
 
 #include "enums/resources/notifytypes.h"
 
 #include "listeners/arrowslistener.h"
 
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
+#include "net/messagein.h"
 
 #include "net/ea/eaprotocol.h"
 #include "net/ea/equipbackend.h"
diff --git a/src/net/tmwa/inventoryrecv.h b/src/net/tmwa/inventoryrecv.h
index 3fe506d3a..091d18ab5 100644
--- a/src/net/tmwa/inventoryrecv.h
+++ b/src/net/tmwa/inventoryrecv.h
@@ -23,9 +23,10 @@
 #ifndef NET_TMWA_INVENTORYRECV_H
 #define NET_TMWA_INVENTORYRECV_H
 
-#include "net/ea/inventoryhandler.h"
-
-#include "net/tmwa/messagehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index 990b91366..8bf6239d9 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/tmwa/itemhandler.h"
 
-#include "actormanager.h"
-
 #include "net/ea/itemrecv.h"
 
 #include "net/tmwa/itemrecv.h"
diff --git a/src/net/tmwa/itemrecv.cpp b/src/net/tmwa/itemrecv.cpp
index eca928f1b..0ba78fb43 100644
--- a/src/net/tmwa/itemrecv.cpp
+++ b/src/net/tmwa/itemrecv.cpp
@@ -24,7 +24,7 @@
 
 #include "actormanager.h"
 
-#include "net/tmwa/protocol.h"
+#include "net/messagein.h"
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/itemrecv.h b/src/net/tmwa/itemrecv.h
index 86e8a1a5a..a8e536302 100644
--- a/src/net/tmwa/itemrecv.h
+++ b/src/net/tmwa/itemrecv.h
@@ -23,9 +23,10 @@
 #ifndef NET_TMWA_ITEMRECV_H
 #define NET_TMWA_ITEMRECV_H
 
-#include "net/tmwa/messagehandler.h"
-
-#include "net/ea/itemhandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 880e951a9..035f22fa1 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -23,7 +23,6 @@
 #include "net/tmwa/loginhandler.h"
 
 #include "client.h"
-#include "logger.h"
 
 #include "net/serverfeatures.h"
 
@@ -34,8 +33,6 @@
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
 
-#include "utils/gettext.h"
-
 #include "debug.h"
 
 extern Net::LoginHandler *loginHandler;
diff --git a/src/net/tmwa/loginrecv.cpp b/src/net/tmwa/loginrecv.cpp
index fb1a0eee7..772691573 100644
--- a/src/net/tmwa/loginrecv.cpp
+++ b/src/net/tmwa/loginrecv.cpp
@@ -25,13 +25,9 @@
 #include "client.h"
 #include "logger.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/ea/loginrecv.h"
 
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/network.h"
-#include "net/tmwa/protocol.h"
+#include "net/messagein.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/net/tmwa/loginrecv.h b/src/net/tmwa/loginrecv.h
index 0945a7066..63940fb3d 100644
--- a/src/net/tmwa/loginrecv.h
+++ b/src/net/tmwa/loginrecv.h
@@ -23,9 +23,10 @@
 #ifndef NET_TMWA_LOGINRECV_H
 #define NET_TMWA_LOGINRECV_H
 
-#include "net/ea/loginhandler.h"
-
-#include "net/tmwa/messagehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 90fbee9d3..46a27b6e9 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -29,11 +29,6 @@
 
 #include "enums/resources/notifytypes.h"
 
-#include "gui/windows/chatwindow.h"
-#include "gui/windows/socialwindow.h"
-
-#include "gui/widgets/tabs/chat/partytab.h"
-
 #include "net/ea/partyrecv.h"
 
 #include "net/tmwa/messageout.h"
diff --git a/src/net/tmwa/partyrecv.cpp b/src/net/tmwa/partyrecv.cpp
index eaee64943..5458c8ccc 100644
--- a/src/net/tmwa/partyrecv.cpp
+++ b/src/net/tmwa/partyrecv.cpp
@@ -34,10 +34,9 @@
 
 #include "gui/widgets/tabs/chat/partytab.h"
 
-#include "net/ea/partyrecv.h"
+#include "net/messagein.h"
 
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
+#include "net/ea/partyrecv.h"
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/partyrecv.h b/src/net/tmwa/partyrecv.h
index 0d94cd738..aeda82ea2 100644
--- a/src/net/tmwa/partyrecv.h
+++ b/src/net/tmwa/partyrecv.h
@@ -22,9 +22,10 @@
 #ifndef NET_TMWA_PARTYRECV_H
 #define NET_TMWA_PARTYRECV_H
 
-#include "net/tmwa/messagehandler.h"
-
-#include "net/ea/partyhandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {