4 files changed, 9 insertions, 3 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 44b73928f..2a9d56ae2 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -33,6 +33,7 @@
 #include "net/messagein.h"
 
 #include "net/ea/eaprotocol.h"
+#include "net/ea/equipbackend.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 6050baaff..fa2f2d0b2 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -25,9 +25,10 @@
 
 #include "localconsts.h"
 
+#include "enums/simpletypes/beingid.h"
+
 #include "net/inventoryhandler.h"
 
-#include "net/ea/equipbackend.h"
 #include "net/ea/inventoryitem.h"
 
 #include <queue>
@@ -40,6 +41,8 @@ namespace Net
 namespace Ea
 {
 
+class EquipBackend;
+
 typedef std::vector<InventoryItem> InventoryItems;
 typedef std::queue<BeingId> PickupQueue;
 
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 396eb1480..0ad5a91af 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -37,6 +37,8 @@
 #include "net/logindata.h"
 #include "net/messagein.h"
 
+#include "net/ea/token.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 1dbf97b1c..9bb41ec18 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -27,10 +27,10 @@
 
 #include "net/registrationoptions.h"
 
-#include "net/ea/token.h"
-
 class LoginData;
 
+struct Token;
+
 namespace Net
 {
     class MessageIn;