diff --git a/include/Swiften/Server/Server.h b/include/Swiften/Server/Server.h
index 90bce626d3394fea432ce8cc7950bfc451a0127c..6f55409b1b1420c352deea01423cba0829c37717 100644
--- a/include/Swiften/Server/Server.h
+++ b/include/Swiften/Server/Server.h
@@ -8,7 +8,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
-#include <boost/signals2.hpp>
 #include <vector>
 
 #include "Swiften/Network/BoostIOServiceThread.h"
@@ -25,6 +24,7 @@
 #include "Swiften/SwiftenCompat.h"
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
+#include <Swiften/SwiftenCompat.h>
 
 namespace Swift {
 	class ConnectionServer;
@@ -59,8 +59,8 @@ namespace Swift {
 				return serverFromClientConnectionServer;
 			}
 
-			boost::signal<void (const SafeByteArray&)> onDataRead;
-			boost::signal<void (const SafeByteArray&)> onDataWritten;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (const SafeByteArray&)> onDataRead;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (const SafeByteArray&)> onDataWritten;
 
 			void addTLSEncryption(TLSServerContextFactory* tlsContextFactory, CertificateWithKey::ref cert);
 
@@ -80,7 +80,7 @@ namespace Swift {
 			NetworkFactories* networkFactories_;
 			bool stopping;
 			SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ConnectionServer> serverFromClientConnectionServer;
-			std::vector<SWIFTEN_SIGNAL_NAMESPACE::connection> serverFromClientConnectionServerSignalConnections;
+			std::vector<SWIFTEN_SIGNAL_CONNECTION_NAMESPACE::connection> serverFromClientConnectionServerSignalConnections;
 			std::list<SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<ServerFromClientSession> > serverFromClientSessions;
 			JID selfJID;
 			StanzaChannel *stanzaChannel_;