diff --git a/spectrum/src/frontends/xmpp/XMPPUser.cpp b/spectrum/src/frontends/xmpp/XMPPUser.cpp
index 45a0e4e6c8a17f754272aefd6cbff4f06a05baed..2f26b73f5985660084686855d71572f6164751a8 100644
--- a/spectrum/src/frontends/xmpp/XMPPUser.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPUser.cpp
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-using namespace boost;
-
 #define foreach         BOOST_FOREACH
 
 namespace Transport {
@@ -45,15 +43,15 @@ XMPPUser::XMPPUser(const Swift::JID &jid, UserInfo &userInfo, Component *compone
 	m_component = component;
 	m_userManager = userManager;
 	m_userInfo = userInfo;
-	m_rooms = boost::shared_ptr<Swift::DiscoItems>(new Swift::DiscoItems());
+	m_rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::DiscoItems>(new Swift::DiscoItems());
 }
 
 XMPPUser::~XMPPUser(){
 	if (m_component->inServerMode()) {
 #if HAVE_SWIFTEN_3
-		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::ToplevelElement>());
+		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::ToplevelElement>());
 #else
-		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>());
+		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Element>());
 #endif
 	}
 
@@ -77,14 +75,14 @@ void XMPPUser::disconnectUser(const std::string &error, Swift::SpectrumErrorPayl
 		// in finishSession(...) call and if not, remove it here.
 		std::string jid = m_jid.toBare().toString();
 #if HAVE_SWIFTEN_3
-		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::ToplevelElement>(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error)));
+		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::ToplevelElement>(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error)));
 #else
-		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error)));
+		dynamic_cast<Swift::ServerStanzaChannel *>(static_cast<XMPPFrontend*>(m_component->getFrontend())->getStanzaChannel())->finishSession(m_jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Element>(new Swift::StreamError(Swift::StreamError::UndefinedCondition, error)));
 #endif
 	}
 }
 
-void XMPPUser::handleVCardReceived(boost::shared_ptr<Swift::VCard> vcard, Swift::ErrorPayload::ref error, Swift::GetVCardRequest::ref request) {
+void XMPPUser::handleVCardReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard, Swift::ErrorPayload::ref error, Swift::GetVCardRequest::ref request) {
 	m_vcardRequests.remove(request);
 	request->onResponse.disconnect_all_slots();
 	m_component->getFrontend()->onVCardUpdated(this, vcard);
@@ -100,7 +98,7 @@ void XMPPUser::requestVCard() {
 }
 
 void XMPPUser::clearRoomList() {
-	m_rooms = boost::shared_ptr<Swift::DiscoItems>(new Swift::DiscoItems());
+	m_rooms = SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::DiscoItems>(new Swift::DiscoItems());
 }
 
 void XMPPUser::addRoomToRoomList(const std::string &handle, const std::string &name) {