16 files changed, 16 insertions, 60 deletions
diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h
index 9b77ce714..6a6397a4d 100644
--- a/src/net/ea/beingrecv.h
+++ b/src/net/ea/beingrecv.h
@@ -60,7 +60,7 @@ namespace Ea
                        const ItemColor colorId = ItemColor_one,
                        const bool isWeapon = false,
                        const bool isTempSprite = false);
-    }  // namespace Being
+    }  // namespace BeingRecv
 }  // namespace Ea
 
 #endif  // NET_EA_BEINGRECV_H
diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp
index e49305a7f..28c0409f8 100644
--- a/src/net/ea/buysellrecv.cpp
+++ b/src/net/ea/buysellrecv.cpp
@@ -23,6 +23,7 @@
 #include "net/ea/buysellrecv.h"
 
 #include "inventory.h"
+#include "item.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -35,7 +36,7 @@
 
 #include "gui/widgets/createwidget.h"
 
-#include "net/buysellhandler.h"
+#include "net/messagein.h"
 
 #include "net/ea/eaprotocol.h"
 
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index c8964b1a1..0983a2007 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/ea/charserverhandler.h"
 
-#include "net/character.h"
 #include "net/serverinfo.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index ffac7e282..313485dd4 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -29,8 +29,6 @@
 
 #include "net/inventoryhandler.h"
 
-#include "net/ea/inventoryitem.h"
-
 #include <queue>
 
 namespace Ea
diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h
index a55d88716..b6d6dbdce 100644
--- a/src/net/ea/inventoryrecv.h
+++ b/src/net/ea/inventoryrecv.h
@@ -40,10 +40,10 @@ class Inventory;
 
 namespace Ea
 {
-    class EquipBackend;
-
     typedef std::queue<BeingId> PickupQueue;
 
+    class EquipBackend;
+
     namespace InventoryRecv
     {
         extern EquipBackend mEquips;
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index e87650a29..bf3621c53 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -32,7 +32,6 @@
 #include "net/logindata.h"
 
 #include "net/ea/loginrecv.h"
-#include "net/ea/token.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index 6ebfa90c8..37cc96b8b 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -36,8 +36,6 @@
 #include "net/loginhandler.h"
 #include "net/messagein.h"
 
-#include "net/ea/token.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/loginrecv.h b/src/net/ea/loginrecv.h
index 2f2c509a3..57f6e08b0 100644
--- a/src/net/ea/loginrecv.h
+++ b/src/net/ea/loginrecv.h
@@ -27,10 +27,6 @@
 
 #include "net/ea/token.h"
 
-#include <string>
-
-class LoginData;
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 8910beccc..ac938f7bc 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/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 70d162cbc..907c6e61e 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,10 +22,8 @@
 
 #include "net/ea/playerhandler.h"
 
-#include "game.h"
 #include "party.h"
 #include "notifymanager.h"
-#include "soundmanager.h"
 #include "units.h"
 
 #include "being/localplayer.h"
@@ -33,22 +31,14 @@
 
 #include "enums/resources/notifytypes.h"
 
-#include "gui/viewport.h"
-
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
-#include "resources/map/map.h"
-
 #include "net/ea/eaprotocol.h"
 #include "net/ea/playerrecv.h"
 
 #include "debug.h"
 
-// Max. distance we are willing to scroll after a teleport;
-// everything beyond will reset the port hard.
-static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
-
 namespace Ea
 {
 
diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp
index cd24559dd..e223cfdbb 100644
--- a/src/net/ea/playerrecv.cpp
+++ b/src/net/ea/playerrecv.cpp
@@ -23,10 +23,8 @@
 #include "net/ea/playerrecv.h"
 
 #include "game.h"
-#include "party.h"
 #include "notifymanager.h"
 #include "soundmanager.h"
-#include "units.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -35,12 +33,12 @@
 
 #include "gui/viewport.h"
 
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
 #include "resources/map/map.h"
 
-#include "net/ea/eaprotocol.h"
+#include "net/messagein.h"
+#include "net/playerhandler.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/playerrecv.h b/src/net/ea/playerrecv.h
index ec1d20685..35ef92d4a 100644
--- a/src/net/ea/playerrecv.h
+++ b/src/net/ea/playerrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EA_PLAYERRECV_H
 #define NET_EA_PLAYERRECV_H
 
-#include "net/playerhandler.h"
-
 #include <climits>
 
 namespace Net
@@ -45,6 +43,7 @@ namespace Ea
         void processPlayerArrowMessage(Net::MessageIn &msg);
         void processMapMusic(Net::MessageIn &msg);
     }  // namespace PlayerRecv
+
     static const int NoStat = INT_MAX;
 }  // namespace Ea
 
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index c5ce14cdf..ff121bf4a 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -22,12 +22,6 @@
 
 #include "net/ea/skillhandler.h"
 
-#include "being/playerinfo.h"
-
-#include "gui/windows/skilldialog.h"
-
-#include "net/messagein.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/skillrecv.h b/src/net/ea/skillrecv.h
index a980d9739..f968f0f36 100644
--- a/src/net/ea/skillrecv.h
+++ b/src/net/ea/skillrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EA_SKILLRECV_H
 #define NET_EA_SKILLRECV_H
 
-#include "net/skillhandler.h"
-
 #include "localconsts.h"
 
 namespace Net
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 9329844c9..e82f29dc2 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -22,28 +22,10 @@
 
 #include "net/ea/tradehandler.h"
 
-#include "notifymanager.h"
-
-#include "being/playerinfo.h"
-#include "being/playerrelation.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/tradewindow.h"
-
-#include "gui/widgets/createwidget.h"
-
-#include "net/messagein.h"
-
-#include "utils/gettext.h"
-#include "utils/stringutils.h"
-
 #include "listeners/requesttradelistener.h"
 
 #include "debug.h"
 
-extern std::string tradePartnerName;
-
 /**
  * Listener for request trade dialogs
  */
diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h
index 2d388a135..e1abdb433 100644
--- a/src/net/ea/traderecv.h
+++ b/src/net/ea/traderecv.h
@@ -23,7 +23,13 @@
 #ifndef NET_EA_TRADERECV_H
 #define NET_EA_TRADERECV_H
 
-#include "net/tradehandler.h"
+#if defined(__GXX_EXPERIMENTAL_CXX0X__)
+#include <cstdint>
+#else
+#include <stdint.h>
+#endif
+
+#include <string>
 
 namespace Net
 {
@@ -39,7 +45,7 @@ namespace Ea
         void processTradeComplete(Net::MessageIn &msg);
         void processTradeRequestContinue(const std::string &partner);
         void processTradeResponseContinue(const uint8_t type);
-    } // namespace TradeRecv
+    }  // namespace TradeRecv
 }  // namespace Ea
 
 #endif  // NET_EA_TRADERECV_H