diff --git a/include/Swiften/Server/Server.h b/include/Swiften/Server/Server.h
index b32ae463581e7a4587fc8b77c2253f5276fbf2e4..90bce626d3394fea432ce8cc7950bfc451a0127c 100644
--- a/include/Swiften/Server/Server.h
+++ b/include/Swiften/Server/Server.h
@@ -8,6 +8,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 #include <vector>
 
 #include "Swiften/Network/BoostIOServiceThread.h"
@@ -21,6 +22,7 @@
 #include "Swiften/Entity/Entity.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
+#include "Swiften/SwiftenCompat.h"
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 
@@ -53,7 +55,7 @@ namespace Swift {
 				return iqRouter_;
 			}
 
-			boost::shared_ptr<ConnectionServer> getConnectionServer() const {
+			SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ConnectionServer> getConnectionServer() const {
 				return serverFromClientConnectionServer;
 			}
 
@@ -63,10 +65,10 @@ namespace Swift {
 			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, CertificateWithKey::ref cert);
 
 		private:
-			void handleNewClientConnection(boost::shared_ptr<Connection> c);
-			void handleSessionStarted(boost::shared_ptr<ServerFromClientSession>);
-			void handleSessionFinished(boost::shared_ptr<ServerFromClientSession>);
-			void handleElementReceived(boost::shared_ptr<Element> element, boost::shared_ptr<ServerFromClientSession> session);
+			void handleNewClientConnection(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Connection> c);
+			void handleSessionStarted(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ServerFromClientSession>);
+			void handleSessionFinished(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ServerFromClientSession>);
+			void handleElementReceived(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Element> element, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ServerFromClientSession> session);
 			void handleDataRead(const SafeByteArray&);
 			void handleDataWritten(const SafeByteArray&);
 
@@ -77,9 +79,9 @@ namespace Swift {
 			EventLoop* eventLoop;
 			NetworkFactories* networkFactories_;
 			bool stopping;
-			boost::shared_ptr<ConnectionServer> serverFromClientConnectionServer;
-			std::vector<boost::bsignals::connection> serverFromClientConnectionServerSignalConnections;
-			std::list<boost::shared_ptr<ServerFromClientSession> > serverFromClientSessions;
+			SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ConnectionServer> serverFromClientConnectionServer;
+			std::vector<SWIFTEN_SIGNAL_NAMESPACE::connection> serverFromClientConnectionServerSignalConnections;
+			std::list<SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ServerFromClientSession> > serverFromClientSessions;
 			JID selfJID;
 			StanzaChannel *stanzaChannel_;
 			IQRouter *iqRouter_;