12 files changed, 8 insertions, 31 deletions
diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h
index 753191b8d..d3b6a642d 100644
--- a/src/net/ea/beingrecv.h
+++ b/src/net/ea/beingrecv.h
@@ -31,7 +31,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class Being;
 
diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h
index d34a54a2a..eced8fd0e 100644
--- a/src/net/ea/chatrecv.h
+++ b/src/net/ea/chatrecv.h
@@ -39,7 +39,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/guildrecv.h b/src/net/ea/guildrecv.h
index 1815db58a..330787bb8 100644
--- a/src/net/ea/guildrecv.h
+++ b/src/net/ea/guildrecv.h
@@ -27,7 +27,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class Guild;
 
diff --git a/src/net/ea/inventoryrecv.cpp b/src/net/ea/inventoryrecv.cpp
index 830675a44..3910011d4 100644
--- a/src/net/ea/inventoryrecv.cpp
+++ b/src/net/ea/inventoryrecv.cpp
@@ -28,8 +28,6 @@
 
 #include "const/net/inventory.h"
 
-#include "enums/equipslot.h"
-
 #include "enums/resources/notifytypes.h"
 
 #include "gui/widgets/createwidget.h"
diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h
index 472dc8362..731e01b85 100644
--- a/src/net/ea/inventoryrecv.h
+++ b/src/net/ea/inventoryrecv.h
@@ -34,7 +34,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 class Inventory;
 
diff --git a/src/net/ea/loginrecv.h b/src/net/ea/loginrecv.h
index 33d58eb1e..b134bc7b3 100644
--- a/src/net/ea/loginrecv.h
+++ b/src/net/ea/loginrecv.h
@@ -30,7 +30,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 9efc807c7..bee70d46f 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -29,8 +29,6 @@
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
 
-#include "net/packetinfo.h"
-
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/net/ea/npcrecv.h b/src/net/ea/npcrecv.h
index 1c26f5521..645b36fd1 100644
--- a/src/net/ea/npcrecv.h
+++ b/src/net/ea/npcrecv.h
@@ -30,7 +30,7 @@ class NpcDialog;
 namespace Net
 {
     class MessageIn;
-}
+} // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/partyrecv.h b/src/net/ea/partyrecv.h
index 4c56a0617..c65388716 100644
--- a/src/net/ea/partyrecv.h
+++ b/src/net/ea/partyrecv.h
@@ -29,7 +29,7 @@ class Party;
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index aeec03c7b..0c57ab0ef 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,21 +22,8 @@
 
 #include "net/ea/playerhandler.h"
 
-#include "party.h"
-#include "notifymanager.h"
-#include "units.h"
-
-#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/statuswindow.h"
-
-#include "net/ea/eaprotocol.h"
-#include "net/ea/playerrecv.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index d19fdd28a..6b3b85073 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -27,11 +27,6 @@
 
 #include <climits>
 
-namespace Net
-{
-    class MessageIn;
-}
-
 namespace Ea
 {
 
diff --git a/src/net/ea/playerrecv.h b/src/net/ea/playerrecv.h
index 715c8e16f..4c800d13b 100644
--- a/src/net/ea/playerrecv.h
+++ b/src/net/ea/playerrecv.h
@@ -28,7 +28,7 @@
 namespace Net
 {
     class MessageIn;
-}
+}  // namespace Net
 
 namespace Ea
 {
@@ -44,7 +44,6 @@ namespace Ea
         void processMapMusic(Net::MessageIn &msg);
         void processMapMask(Net::MessageIn &msg);
     }  // namespace PlayerRecv
-
 }  // namespace Ea
 
 #endif  // NET_EA_PLAYERRECV_H