diff --git a/src/servers/sapphire_zone/Framework.cpp b/src/servers/sapphire_zone/Framework.cpp
index 04bde01a..aa9cb4b4 100644
--- a/src/servers/sapphire_zone/Framework.cpp
+++ b/src/servers/sapphire_zone/Framework.cpp
@@ -50,7 +50,7 @@ Core::ServerZone& Core::Framework::getServerZone()
    return g_serverZone;
 }
 
-Core::Social::SocialMgr< Core::Social::FriendList > Core::Framework::getFriendsListMgr()
+Core::Social::SocialMgr< Core::Social::FriendList >& Core::Framework::getFriendsListMgr()
 {
    return g_friendListMgr;
 }
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Framework.h b/src/servers/sapphire_zone/Framework.h
index fda0ff2e..4859e874 100644
--- a/src/servers/sapphire_zone/Framework.h
+++ b/src/servers/sapphire_zone/Framework.h
@@ -54,7 +54,7 @@ public:
    Db::DbWorkerPool< Db::CharaDbConnection >& getCharaDb();
    ServerZone& getServerZone();
 
-   Social::SocialMgr< Social::FriendList > getFriendsListMgr();
+   Social::SocialMgr< Social::FriendList >& getFriendsListMgr();
 
 };
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 87bcd02b..98e6e233 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -44,6 +44,9 @@
 #include "Forwards.h"
 #include "Framework.h"
 
+#include "Social/Group.h"
+#include "Social/FriendList.h"
+
 extern Core::Framework g_framework;
 
 using namespace Core::Common;