diff --git a/server/gameserver/loot.h b/server/gameserver/loot.h
index b5be2503..6dba5b2e 100644
--- a/server/gameserver/loot.h
+++ b/server/gameserver/loot.h
@@ -2,13 +2,6 @@
 
 #include "roomentity.h"
 
-namespace MetaData
-{
-    struct Player;
-    struct Equip;
-    struct MapThing;
-}
-
 class Human;
 class Loot : public RoomEntity
 {
diff --git a/server/gameserver/netdata.h b/server/gameserver/netdata.h
index d337f1d7..0cd08f50 100644
--- a/server/gameserver/netdata.h
+++ b/server/gameserver/netdata.h
@@ -2,11 +2,6 @@
 
 #include "weakptr.h"
 
-namespace MetaData
-{
-    struct Equip;
-}
-
 class Creature;
 class Obstacle;
 class Explosion;
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 217ed230..8b6dc705 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -52,6 +52,7 @@
 #include "custom_team.h"
 #include "custom_member.h"
 #include "GGListener.h"
+#include "netdata.h"
 
 #include "mt/Param.h"
 #include "mt/Buff.h"
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 4580597d..a09a87e3 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -34,6 +34,7 @@
 #include "stats.h"
 #include "mapinstance.h"
 #include "debugcmd.h"
+#include "netdata.h"
 
 #include "mt/Param.h"
 #include "mt/Equip.h"
@@ -842,8 +843,10 @@ void Player::ProcInteraction()
 #endif
         }
     }
+#ifdef MYDEBUG
     last_interaction_objids_ = std::move(interaction_objids);
     last_interaction_frameno_ = room->GetFrameNo();
+#endif
     interaction_objids.clear();
     if (notify_msg.items().size() > 0) {
         SendNotifyMsg(notify_msg);
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 12f168ba..94027e07 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -50,6 +50,7 @@
 #include "ingamevoice.h"
 #include "jsondatamgr.h"
 #include "httpproxy.h"
+#include "netdata.h"
 
 #include "mt/Param.h"
 #include "mt/Hero.h"
diff --git a/server/gameserver/roommgr.h b/server/gameserver/roommgr.h
index 8f234775..3bafe5a7 100644
--- a/server/gameserver/roommgr.h
+++ b/server/gameserver/roommgr.h
@@ -6,8 +6,6 @@
 #include <f8/protoutils.h>
 #include <f8/timer.h>
 
-#include "netdata.h"
-
 namespace cs
 {
     class CMJoin;
@@ -15,11 +13,6 @@ namespace cs
     class CMPing;
 }
 
-namespace MetaData
-{
-    struct Map;
-}
-
 class GridService;
 class MapService;
 class MapInstance;
diff --git a/server/gameserver/types.h b/server/gameserver/types.h
index ac37eb99..112f0c54 100644
--- a/server/gameserver/types.h
+++ b/server/gameserver/types.h
@@ -3,12 +3,6 @@
 #include "weakptr.h"
 #include "DetourNavMesh.h"
 
-namespace MetaData
-{
-    struct Equip;
-    struct Skill;
-}
-
 namespace cs
 {
     struct CMJoin;