diff --git a/include/transport/abstractbuddy.h b/include/transport/abstractbuddy.h
index 0e3fdb644f44060b7afbc345474f16e96af2b505..4c470eae81cf37e21855d22cdd6e3f00731091b8 100644
--- a/include/transport/abstractbuddy.h
+++ b/include/transport/abstractbuddy.h
@@ -31,7 +31,9 @@ typedef enum { 	SPECTRUM_BUDDY_NO_FLAG = 0,
 				SPECTRUM_BUDDY_IGNORE = 4
 			} SpectrumBuddyFlag;
 
-using namespace Transport;
+namespace Transport {
+
+class RosterManager;
 
 // Wrapper for PurpleBuddy.
 class AbstractBuddy {
@@ -69,6 +71,9 @@ class AbstractBuddy {
 		// Returns flags.
 		int getFlags();
 
+		void setRosterManager(RosterManager *rosterManager) { m_rosterManager = rosterManager; }
+		RosterManager *getRosterManager() { return m_rosterManager; }
+
 		// Returns buddy's name (so for example UIN for ICQ, JID for XMPP...).
 		virtual std::string getName() = 0;
 
@@ -95,4 +100,7 @@ class AbstractBuddy {
 		std::string m_subscription;
 		Swift::Presence::ref m_lastPresence;
 		int m_flags;
+		RosterManager *m_rosterManager;
 };
+
+}