diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61bfe0ec6e09628a568fceb088b1064a6e83e716..a0516fe5c8f6d015b0b02b589861092d22ca5dd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -402,10 +402,6 @@ if (WIN32)
 	ADD_DEFINITIONS(-DBOOST_THREAD_USE_LIB)
 endif()
 
-# We cannot use boost:signals2, because Swiften does not use them,
-# for now, just ignore the deprecation warning.
-ADD_DEFINITIONS(-DBOOST_SIGNALS_NO_DEPRECATION_WARNING)
-
 if(CMAKE_BUILD_TYPE MATCHES Debug)
 	if (CMAKE_COMPILER_IS_GNUCXX)
 		ADD_DEFINITIONS(-O0)
diff --git a/backends/twitter/Requests/FetchFriends.h b/backends/twitter/Requests/FetchFriends.h
index e0bddc12d60eb10a30f2a4936ec08252ccf8fefa..a5ab15779d74be7de588d5f31164668e10160b4f 100644
--- a/backends/twitter/Requests/FetchFriends.h
+++ b/backends/twitter/Requests/FetchFriends.h
@@ -6,7 +6,6 @@
 #include "../TwitterResponseParser.h"
 #include "transport/Logging.h"
 #include <string>
-#include <boost/signals.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <iostream>
diff --git a/backends/twitter/Requests/ProfileImageRequest.h b/backends/twitter/Requests/ProfileImageRequest.h
index f212219dbb8d2468dd0ba5f042429dbb8f4cffd1..0112c79ca671c371c7494f70729a34a4d666be01 100644
--- a/backends/twitter/Requests/ProfileImageRequest.h
+++ b/backends/twitter/Requests/ProfileImageRequest.h
@@ -6,7 +6,6 @@
 #include "transport/Logging.h"
 #include "transport/Config.h"
 #include <string>
-#include <boost/signals.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include <iostream>
diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h
index cb826676a351627143d89f0de4559ffa1c09cb92..2affb29d0b6a73a1c1dd5fc0f419948faac36f9b 100644
--- a/backends/twitter/TwitterPlugin.h
+++ b/backends/twitter/TwitterPlugin.h
@@ -19,7 +19,6 @@
 #include "sys/signal.h"
 #endif
 #include <boost/algorithm/string.hpp>
-#include <boost/signal.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 
diff --git a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h
index 528e739c9761431f41c365380eb62bf36f0b3188..18175b68bb6e3e1cf0f40dc59cb1489dc44c7f42 100644
--- a/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h
+++ b/include/Swiften/FileTransfer/MyOutgoingSIFileTransfer.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
 
 #include "Swiften/SwiftenCompat.h"
 
@@ -36,7 +35,7 @@ namespace Swift {
 			virtual void stop();
 			virtual void cancel();
 
-			boost::signal<void (const boost::optional<FileTransferError>&)> onFinished;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (const boost::optional<FileTransferError>&)> onFinished;
 
 		private:
 			void handleStreamInitiationRequestResponse(StreamInitiation::ref, ErrorPayload::ref);
diff --git a/include/Swiften/Network/DummyConnectionServer.cpp b/include/Swiften/Network/DummyConnectionServer.cpp
index 8bce4f1835b98f7cacaabb6ad676921cc62a0fc6..0fe2a8ee0b5490e00d01b838300244fadefc1ee9 100644
--- a/include/Swiften/Network/DummyConnectionServer.cpp
+++ b/include/Swiften/Network/DummyConnectionServer.cpp
@@ -6,7 +6,6 @@
 
 #include <Swiften/Network/DummyConnectionServer.h>
 
-#include <boost/signal.hpp>
 #include <boost/bind.hpp>
 #include <boost/system/system_error.hpp>
 #include <boost/asio/placeholders.hpp>
diff --git a/include/Swiften/Server/Server.cpp b/include/Swiften/Server/Server.cpp
index 0ff125f077cfbfd5b9185bd657a5891866506c70..2dfda74ff097836deceebe4a15292a558adf4337 100644
--- a/include/Swiften/Server/Server.cpp
+++ b/include/Swiften/Server/Server.cpp
@@ -9,7 +9,6 @@
 #include <string>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
-#include <boost/signal.hpp>
 
 #include "Swiften/Base/String.h"
 #include "Swiften/Network/Connection.h"
@@ -96,7 +95,7 @@ void Server::stop() {
 
 	if (serverFromClientConnectionServer) {
 		serverFromClientConnectionServer->stop();
-		BOOST_FOREACH(SWIFTEN_SIGNAL_NAMESPACE::connection& connection, serverFromClientConnectionServerSignalConnections) {
+		BOOST_FOREACH(SWIFTEN_SIGNAL_CONNECTION_NAMESPACE::connection& connection, serverFromClientConnectionServerSignalConnections) {
 			connection.disconnect();
 		}
 		serverFromClientConnectionServerSignalConnections.clear();
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_;
diff --git a/include/Swiften/Server/ServerFromClientSession.h b/include/Swiften/Server/ServerFromClientSession.h
index d78fedaaaa8c379e6b1963550f8f74a97f9e6637..74f62384cec88b0b90f6dfac4161e6b438345527 100644
--- a/include/Swiften/Server/ServerFromClientSession.h
+++ b/include/Swiften/Server/ServerFromClientSession.h
@@ -8,7 +8,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
-#include <boost/signals.hpp>
 
 #include <string>
 #include <Swiften/Session/Session.h>
@@ -48,7 +47,7 @@ namespace Swift {
 					Swift::JID remoteJID = Swift::JID());
 			~ServerFromClientSession();
 
-			boost::signal<void ()> onSessionStarted;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onSessionStarted;
 			void setAllowSASLEXTERNAL();
 			const std::string &getUser() {
 				return user_;
diff --git a/include/Swiften/Server/UserRegistry.h b/include/Swiften/Server/UserRegistry.h
index 2ded68e32f0f0514c79c47c780d6497e95c5ad55..469446022a7a62e2b47122806fcf7fa839fb8982 100644
--- a/include/Swiften/Server/UserRegistry.h
+++ b/include/Swiften/Server/UserRegistry.h
@@ -8,7 +8,6 @@
 
 #include <string>
 #include <Swiften/Base/SafeByteArray.h>
-#include <boost/signal.hpp>
 #include "Swiften/Server/ServerFromClientSession.h"
 
 namespace Swift {
diff --git a/include/Swiften/StreamStack/TLSServerLayer.h b/include/Swiften/StreamStack/TLSServerLayer.h
index 34f99a037ea61e6a8bbfeea0e9391e999b067325..0e5a44dbf6627ce980149fb2ca9237f60fcb0b7d 100644
--- a/include/Swiften/StreamStack/TLSServerLayer.h
+++ b/include/Swiften/StreamStack/TLSServerLayer.h
@@ -4,8 +4,6 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include <boost/signals.hpp>
-
 #include "Swiften/Base/SafeByteArray.h"
 #include "Swiften/StreamStack/StreamLayer.h"
 #include "Swiften/TLS/Certificate.h"
@@ -37,8 +35,8 @@ namespace Swift {
 			}
 
 		public:
-			boost::signal<void ()> onError;
-			boost::signal<void ()> onConnected;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onError;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onConnected;
 
 		private:
 			TLSServerContext* context;
diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h
index cac12d2a12343a381a9741ccd2fe7934a9991c45..e445505f6ef29aad829a9724ba6f21342795a44d 100644
--- a/include/Swiften/SwiftenCompat.h
+++ b/include/Swiften/SwiftenCompat.h
@@ -26,6 +26,7 @@
  * Using these it is possible to declare shared pointers and signals like this:
  *
  * SWIFTEN_SIGNAL_NAMESPACE::signal signal;
+ * SWIFTEN_SIGNAL_CONNECTION_NAMESPACE::connection &connection;
  * SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Type> ptr;
  *
  * These are guaranteed to be the same implementation as Swift uses internally,
@@ -38,11 +39,16 @@
 #if (SWIFTEN_VERSION >= 0x040000)
 #define SWIFTEN_UNIQUE_PTR std::unique_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE std
+#include <boost/signals2.hpp>
 #define SWIFTEN_SIGNAL_NAMESPACE boost::signals2
+#define SWIFTEN_SIGNAL_CONNECTION_NAMESPACE boost::signals2
 #define SWIFT_HOSTADDRESS(x) *(Swift::HostAddress::fromString(x))
 #else
 #define SWIFTEN_UNIQUE_PTR std::auto_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE boost
-#define SWIFTEN_SIGNAL_NAMESPACE boost::signals
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING
+#include <boost/signals.hpp>
+#define SWIFTEN_SIGNAL_NAMESPACE boost
+#define SWIFTEN_SIGNAL_CONNECTION_NAMESPACE boost::signals
 #define SWIFT_HOSTADDRESS(x) Swift::HostAddress(x)
 #endif
diff --git a/include/Swiften/TLS/TLSServerContext.h b/include/Swiften/TLS/TLSServerContext.h
index f42b271b5f38d27d6faf7e97f52783c9a2c9c85b..63122bd891d9bc44c0038efe103873c4c6f26223 100644
--- a/include/Swiften/TLS/TLSServerContext.h
+++ b/include/Swiften/TLS/TLSServerContext.h
@@ -7,12 +7,12 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
 
 #include "Swiften/Base/SafeByteArray.h"
 #include "Swiften/TLS/Certificate.h"
 #include <Swiften/TLS/CertificateWithKey.h>
 #include "Swiften/TLS/CertificateVerificationError.h"
+#include "Swiften/SwiftenCompat.h"
 
 namespace Swift {
 	class PKCS12Certificate;
@@ -34,9 +34,9 @@ namespace Swift {
 			virtual ByteArray getFinishMessage() const = 0;
 
 		public:
-			boost::signal<void (const SafeByteArray&)> onDataForNetwork;
-			boost::signal<void (const SafeByteArray&)> onDataForApplication;
-			boost::signal<void ()> onError;
-			boost::signal<void ()> onConnected;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (const SafeByteArray&)> onDataForNetwork;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (const SafeByteArray&)> onDataForApplication;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onError;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onConnected;
 	};
 }
diff --git a/include/transport/Config.h b/include/transport/Config.h
index b4f1940acc3d4fbfac68b24f9dcfbc82dff4c66c..974ffa9a189bd01030d1f3c98f27771dd13c3dfd 100644
--- a/include/transport/Config.h
+++ b/include/transport/Config.h
@@ -26,7 +26,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign.hpp>
 #include <boost/bind.hpp>
-#include <boost/signalslib.hpp>
+#include <Swiften/SwiftenCompat.h>
 
 namespace Transport {
 
@@ -124,10 +124,10 @@ class Config {
 		const std::string &getConfigFile() { return m_file; }
 
 		/// This signal is emitted when config is loaded/reloaded.
-		boost::signal<void ()> onConfigReloaded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onConfigReloaded;
 
 		void updateBackendConfig(const std::string &backendConfig);
-		boost::signal<void ()> onBackendConfigUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onBackendConfigUpdated;
 
 		static Config *createFromArgs(int argc, char **argv, std::string &error, std::string &host, int &port);
 	
diff --git a/include/transport/Frontend.h b/include/transport/Frontend.h
index ed2179927e9463918e3da84cbf87e67055035663..8a9846de6cb3d40a212a2e14abf76bb341ca9d0d 100644
--- a/include/transport/Frontend.h
+++ b/include/transport/Frontend.h
@@ -32,8 +32,6 @@
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Config;
@@ -98,15 +96,15 @@ class Frontend {
 
 		virtual bool isRawXMLEnabled() { return false; }
 
-		boost::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
-		boost::signal<void (User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
-		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
-		boost::signal<void (Buddy *)> onBuddyRemoved;
-		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyAdded;
-		boost::signal<void (Swift::Message::ref message)> onMessageReceived;
-		boost::signal<void (bool /* isAvailable */)> onAvailableChanged;
-		boost::signal<void (SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Presence>) > onPresenceReceived;
-		boost::signal<void (const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::DiscoInfo> info)> onCapabilitiesReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *)> onBuddyRemoved;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyAdded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Swift::Message::ref message)> onMessageReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (bool /* isAvailable */)> onAvailableChanged;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Presence>) > onPresenceReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const Swift::JID& jid, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::DiscoInfo> info)> onCapabilitiesReceived;
 };
 
 }
diff --git a/include/transport/HTTPRequest.h b/include/transport/HTTPRequest.h
index 5eea41519cd3be4c1e4222fc3f004c9fac741ff2..c58fceb5efbcd287e035a79dc84b1099064b7547 100644
--- a/include/transport/HTTPRequest.h
+++ b/include/transport/HTTPRequest.h
@@ -9,7 +9,7 @@
 #include <string.h>
 #include "rapidjson/document.h"
 
-#include <boost/signal.hpp>
+#include <Swiften/SwiftenCompat.h>
 
 namespace Transport {
 
@@ -38,7 +38,7 @@ class HTTPRequest : public Thread {
 			return m_url;
 		}
 
-		boost::signal<void ()> onRequestFinished;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onRequestFinished;
 
 		static void globalInit() {
 			curl_global_init(CURL_GLOBAL_ALL);
diff --git a/include/transport/MemoryReadBytestream.h b/include/transport/MemoryReadBytestream.h
index 253c22c12a36e74990bb3abceed5109345150bf2..f0f3fea927d05b9422f1c1f6ed1a3eef42872d13 100644
--- a/include/transport/MemoryReadBytestream.h
+++ b/include/transport/MemoryReadBytestream.h
@@ -22,7 +22,6 @@
 
 #include <string>
 #include <map>
-#include <boost/signal.hpp>
 
 #include "Swiften/FileTransfer/ReadBytestream.h"
 #include "Swiften/SwiftenCompat.h"
@@ -41,7 +40,7 @@ class MemoryReadBytestream : public Swift::ReadBytestream {
 		void setFinished() { m_finished = true; }
 		bool isFinished() const;
 
-		boost::signal<void ()> onDataNeeded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onDataNeeded;
 
 	private:
 		bool m_finished;
diff --git a/include/transport/PresenceOracle.h b/include/transport/PresenceOracle.h
index fbad98ed4a257b7676f4ff2a5a182991c058b90e..2c5f56a629320fb1dd32ca608cc28883416670cc 100644
--- a/include/transport/PresenceOracle.h
+++ b/include/transport/PresenceOracle.h
@@ -22,11 +22,10 @@
 
 #include <map>
 
-#include <boost/signals.hpp>
-
 #include <string>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/SwiftenCompat.h>
 
 namespace Transport {
 
@@ -44,7 +43,7 @@ class PresenceOracle {
 		void clearPresences(const Swift::JID& bareJID);
 
 	public:
-		boost::signal<void (Swift::Presence::ref)> onPresenceChange;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Swift::Presence::ref)> onPresenceChange;
 
 	private:
 		void handleIncomingPresence(Swift::Presence::ref presence);
diff --git a/include/transport/RosterManager.h b/include/transport/RosterManager.h
index b8a8b4e988848e350d3570d22e344d43ed1dc775..7a460126f26a3845b0e875865e3c0ee5912c3993 100644
--- a/include/transport/RosterManager.h
+++ b/include/transport/RosterManager.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <algorithm>
 #include <map>
-#include <boost/signal.hpp>
 #include <boost/pool/pool_alloc.hpp>
 #include <boost/pool/object_pool.hpp>
 // #include "rosterstorage.h"
@@ -32,6 +31,7 @@
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Network/Timer.h"
+#include "Swiften/SwiftenCompat.h"
 
 namespace Transport {
 
@@ -94,15 +94,15 @@ class RosterManager {
 
 		/// Called when new Buddy is added to this roster.
 		/// \param buddy newly added Buddy
-		boost::signal<void (Buddy *buddy)> onBuddySet;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *buddy)> onBuddySet;
 
 		/// Called when Buddy has been removed from this roster.
 		/// \param buddy removed Buddy
-		boost::signal<void (Buddy *buddy)> onBuddyUnset;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *buddy)> onBuddyUnset;
 
-		boost::signal<void (Buddy *buddy)> onBuddyAdded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *buddy)> onBuddyAdded;
 		
-		boost::signal<void (Buddy *buddy)> onBuddyRemoved;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *buddy)> onBuddyRemoved;
 
 		void handleBuddyChanged(Buddy *buddy);
 
diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h
index 2760a4b0222500b182a7b97005eb2297bbd35c01..5902f9656dc10d84927caa6d745308ba12aa295b 100644
--- a/include/transport/ThreadPool.h
+++ b/include/transport/ThreadPool.h
@@ -2,10 +2,10 @@
 
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/signals2/signal.hpp>
 #include <queue>
 #include <iostream>
 #include "Swiften/EventLoop/EventLoop.h"
+#include "Swiften/SwiftenCompat.h"
 
 namespace Transport {
 
@@ -56,7 +56,7 @@ class ThreadPool
 	boost::mutex criticalregion;
 	Swift::EventLoop *loop;
 
-	boost::signals2::signal < void () > onWorkerAvailable;
+	SWIFTEN_SIGNAL_NAMESPACE::signal < void () > onWorkerAvailable;
 	
 	public:
 	ThreadPool(Swift::EventLoop *loop, int maxthreads);
diff --git a/include/transport/Transport.h b/include/transport/Transport.h
index 252646541c524e807e597880e1dba7cb844c0c77..1f5b400e5576f7ab8eb8357236d3d2f0f1688f4b 100644
--- a/include/transport/Transport.h
+++ b/include/transport/Transport.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include <vector>
-#include <boost/signal.hpp>
 #include <boost/bind.hpp>
 #include "Swiften/Network/BoostTimerFactory.h"
 #include "Swiften/Network/BoostIOServiceThread.h"
@@ -95,10 +94,10 @@ namespace Transport {
 			/// This signal is emitted when server disconnects the transport because of some error.
 
 			/// \param error disconnection error
-			boost::signal<void (const std::string &error)> onConnectionError;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &error)> onConnectionError;
 
 			/// This signal is emitted when transport successfully connects the server.
-			boost::signal<void ()> onConnected;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onConnected;
 
 			/// This signal is emitted when XML stanza is sent to server.
 
@@ -108,11 +107,11 @@ namespace Transport {
 			/// (for example to="j2j.domain.tld") and for presences comming to
 			/// MUC (for example to="#chat%irc.freenode.org@irc.domain.tld")
 			/// \param presence Presence.
-			boost::signal<void (Swift::Presence::ref presence)> onUserPresenceReceived;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (Swift::Presence::ref presence)> onUserPresenceReceived;
 
-			boost::signal<void (SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::IQ>)> onRawIQReceived;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void (SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::IQ>)> onRawIQReceived;
 
-			boost::signal<void ()> onAdminInterfaceSet;
+			SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onAdminInterfaceSet;
 			
 			void handlePresence(Swift::Presence::ref presence);
 			void handleConnected();
diff --git a/include/transport/User.h b/include/transport/User.h
index 0f837ee7dadd3690be9429223a1896ad6526ce3a..0518690d91c871c2059d25c6a880b8840d26cdcc 100644
--- a/include/transport/User.h
+++ b/include/transport/User.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <boost/signal.hpp>
 #include <time.h>
 #include "transport/StorageBackend.h"
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
@@ -149,12 +148,12 @@ class User {
 
 		void leaveRoom(const std::string &room);
 
-		boost::signal<void ()> onReadyToConnect;
-		boost::signal<void (Swift::Presence::ref presence)> onPresenceChanged;
-		boost::signal<void (Swift::Presence::ref presence)> onRawPresenceReceived;
-		boost::signal<void (const Swift::JID &who, const std::string &room, const std::string &nickname, const std::string &password)> onRoomJoined;
-		boost::signal<void (const std::string &room)> onRoomLeft;
-		boost::signal<void ()> onDisconnected;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onReadyToConnect;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Swift::Presence::ref presence)> onPresenceChanged;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Swift::Presence::ref presence)> onRawPresenceReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const Swift::JID &who, const std::string &room, const std::string &nickname, const std::string &password)> onRoomJoined;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &room)> onRoomLeft;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onDisconnected;
 
 	private:
 		void onConnectingTimeout();
diff --git a/include/transport/UserManager.h b/include/transport/UserManager.h
index e492369580668f5e4bb43050bc9f3af66c535ae0..235d906095c2916946e42c04af0b1b121f3d2c1d 100644
--- a/include/transport/UserManager.h
+++ b/include/transport/UserManager.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include <boost/signal.hpp>
 #include <string>
 #include <map>
 #include "Swiften/Elements/Message.h"
@@ -99,11 +98,11 @@ class UserManager /*: public Swift::EntityCapsProvider*/ {
 
 		/// Called when new User class is created.
 		/// \param user newly created User class
-		boost::signal<void (User *user)> onUserCreated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *user)> onUserCreated;
 
 		/// Called when User class is going to be removed
 		/// \param user removed User class
-		boost::signal<void (User *user)> onUserDestroyed;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *user)> onUserDestroyed;
 
 		/// Returns true if user is connected.
 		/// \return True if user is connected.
diff --git a/include/transport/UserRegistration.h b/include/transport/UserRegistration.h
index f95d0faecf71f5ce1cc1505066cd025e84e23c0f..87c2dc62d3ff74e9601dd6f6320c15daa296b8d6 100644
--- a/include/transport/UserRegistration.h
+++ b/include/transport/UserRegistration.h
@@ -23,8 +23,8 @@
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/InBandRegistrationPayload.h"
 #include "Swiften/Elements/RosterPayload.h"
-#include <boost/signal.hpp>
 #include <Swiften/Version.h>
+#include "Swiften/SwiftenCompat.h"
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 
 namespace Transport {
@@ -71,15 +71,15 @@ class UserRegistration {
 
 		/// Called when new user has been registered.
 		/// \param userInfo UserInfo struct with informations about user
-		boost::signal<void (const UserInfo &userInfo)> onUserRegistered;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const UserInfo &userInfo)> onUserRegistered;
 
 		/// Called when user has been unregistered.
 		/// \param userInfo UserInfo struct with informations about user
-		boost::signal<void (const UserInfo &userInfo)> onUserUnregistered;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const UserInfo &userInfo)> onUserUnregistered;
 
 		/// Called when user's registration has been updated.
 		/// \param userInfo UserInfo struct with informations about user
-		boost::signal<void (const UserInfo &userInfo)> onUserUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const UserInfo &userInfo)> onUserUpdated;
 
 	private:
 		Component *m_component;
diff --git a/include/transport/UserRegistry.h b/include/transport/UserRegistry.h
index e4bfa299368684f2e0a750f4843d15bc2ab0096c..c7d17aeda9f02a6d668287cf38c68f7a3ccb8771 100644
--- a/include/transport/UserRegistry.h
+++ b/include/transport/UserRegistry.h
@@ -96,10 +96,10 @@ class UserRegistry : public Swift::UserRegistry {
 		const std::string getUserPassword(const std::string &barejid);
 
 		/// Emitted when user wants to connect legacy network to validate the password.
-		boost::signal<void (const Swift::JID &user)> onConnectUser;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const Swift::JID &user)> onConnectUser;
 
 		/// Emitted when user disconnected XMPP server and therefore should disconnect legacy network.
-		boost::signal<void (const Swift::JID &user)> onDisconnectUser;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const Swift::JID &user)> onDisconnectUser;
 
 	private:
 		typedef struct {
diff --git a/include/transport/WebSocketClient.h b/include/transport/WebSocketClient.h
index a1efbfe008070a952eaa2a0cfafee1a21991d6bf..ebfa539f433f00fb59383c28a75ffc8cf0b09880 100644
--- a/include/transport/WebSocketClient.h
+++ b/include/transport/WebSocketClient.h
@@ -43,8 +43,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
@@ -60,10 +58,10 @@ class WebSocketClient {
 
 		void write(const std::string &data);
 
-		boost::signal<void (const std::string &payload)> onPayloadReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &payload)> onPayloadReceived;
 
-		boost::signal<void ()> onWebSocketConnected;
-		boost::signal<void (const boost::optional<Swift::Connection::Error> &error)> onWebSocketDisconnected;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onWebSocketConnected;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const boost::optional<Swift::Connection::Error> &error)> onWebSocketDisconnected;
 
 	private:
 		void handleDNSResult(const std::vector<Swift::HostAddress>&, boost::optional<Swift::DomainNameResolveError>);
diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
index 68eaa16b7cd89fbe044241e3c134780aae46a00e..a4487af04173b3baad0bcb3147dc91c174dd10ac 100644
--- a/libtransport/NetworkPluginServer.cpp
+++ b/libtransport/NetworkPluginServer.cpp
@@ -48,7 +48,6 @@
 #include "Swiften/Elements/SpectrumErrorPayload.h"
 
 #include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/signal.hpp"
 
 #include "transport/utf8.h"
 
@@ -87,7 +86,7 @@ class NetworkConversation : public Conversation {
 			onMessageToSend(this, message);
 		}
 
-		boost::signal<void (NetworkConversation *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> &)> onMessageToSend;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (NetworkConversation *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> &)> onMessageToSend;
 };
 
 class NetworkFactory : public Factory {
diff --git a/spectrum/src/frontends/slack/SlackAPI.h b/spectrum/src/frontends/slack/SlackAPI.h
index 49f3a0c602a7586410002c25f06cfa5f951be955..c6e10da375fcc7dd5cd21b810d8308dabc331233 100644
--- a/spectrum/src/frontends/slack/SlackAPI.h
+++ b/spectrum/src/frontends/slack/SlackAPI.h
@@ -28,8 +28,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
diff --git a/spectrum/src/frontends/slack/SlackIdManager.h b/spectrum/src/frontends/slack/SlackIdManager.h
index edcbfd590601734b2c8b3178612c90dd877bfc39..4d4c58d2cfb31abd262edb34eeb522e2d1db0139 100644
--- a/spectrum/src/frontends/slack/SlackIdManager.h
+++ b/spectrum/src/frontends/slack/SlackIdManager.h
@@ -47,8 +47,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class SlackIdManager {
diff --git a/spectrum/src/frontends/slack/SlackRTM.h b/spectrum/src/frontends/slack/SlackRTM.h
index b25cce00333f3b5d25a18360b8779910479ae86b..f5ce755a23caa69102066f6fa24b78592cd99d2f 100644
--- a/spectrum/src/frontends/slack/SlackRTM.h
+++ b/spectrum/src/frontends/slack/SlackRTM.h
@@ -47,8 +47,6 @@
 #include <algorithm>
 #include <map>
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
@@ -70,13 +68,13 @@ class SlackRTM {
 
 		void sendMessage(const std::string &channel, const std::string &message);
 
-		boost::signal<void ()> onRTMStarted;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onRTMStarted;
 
 		SlackAPI *getAPI() {
 			return m_api;
 		}
 
-		boost::signal<void (const std::string &channel, const std::string &user, const std::string &text, const std::string &ts)> onMessageReceived;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &channel, const std::string &user, const std::string &text, const std::string &ts)> onMessageReceived;
 
 #ifndef LIBTRANSPORT_TEST
 	private:
diff --git a/spectrum/src/frontends/slack/SlackSession.h b/spectrum/src/frontends/slack/SlackSession.h
index b74b302c5d167d8b26449cb79cd26d0c345ae9e2..4332d2a9fcf8de025b3fdf09d9e63307fb0bbd40 100644
--- a/spectrum/src/frontends/slack/SlackSession.h
+++ b/spectrum/src/frontends/slack/SlackSession.h
@@ -31,8 +31,6 @@
 #include "Swiften/Network/Timer.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class Component;
@@ -49,7 +47,7 @@ class SlackSession {
 
 		virtual ~SlackSession();
 
-		boost::signal<void (const std::string &user)> onInstallationDone;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const std::string &user)> onInstallationDone;
 
 		void sendMessage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> message);
 
diff --git a/spectrum/src/frontends/slack/SlackUserRegistration.h b/spectrum/src/frontends/slack/SlackUserRegistration.h
index a0369f8bcf04e925bb8e407f1fd6d61b69137081..8ed2438629f4735db79fa9de5393dbc132ad6661 100644
--- a/spectrum/src/frontends/slack/SlackUserRegistration.h
+++ b/spectrum/src/frontends/slack/SlackUserRegistration.h
@@ -22,8 +22,6 @@
 
 #include "transport/UserRegistration.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 struct UserInfo;
diff --git a/spectrum/src/frontends/xmpp/RosterResponder.h b/spectrum/src/frontends/xmpp/RosterResponder.h
index 27b6bf8c0f53594d67a801a2dc7bca225958dbaa..fe040ddc72b4037512063667df72f12f2005b89d 100644
--- a/spectrum/src/frontends/xmpp/RosterResponder.h
+++ b/spectrum/src/frontends/xmpp/RosterResponder.h
@@ -25,8 +25,6 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
-
 namespace Transport {
 
 class UserManager;
@@ -37,11 +35,11 @@ class RosterResponder : public Swift::Responder<Swift::RosterPayload> {
 		RosterResponder(Swift::IQRouter *router, UserManager *userManager);
 		~RosterResponder();
 
-		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyUpdated;
 
-		boost::signal<void (Buddy *)> onBuddyRemoved;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *)> onBuddyRemoved;
 
-		boost::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyAdded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *, const Swift::RosterItemPayload &item)> onBuddyAdded;
 
 	private:
 		virtual bool handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::RosterPayload> payload);
diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
index 87b879fdc80753bb4a78e5f131aa4ded61530dfb..1bded7ed954d137666161acc5c0a902f5e239c86 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
+++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
@@ -25,7 +25,6 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/SwiftenCompat.h"
 
-#include <boost/signal.hpp>
 #include <Swiften/Version.h>
 #include "transport/UserRegistration.h"
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
diff --git a/spectrum/src/frontends/xmpp/blockresponder.h b/spectrum/src/frontends/xmpp/blockresponder.h
index f5e233a26834bbb2cb34b40817140a6dc6933f3f..124492e77b76feaca99df657e6fdea36e587c038 100644
--- a/spectrum/src/frontends/xmpp/blockresponder.h
+++ b/spectrum/src/frontends/xmpp/blockresponder.h
@@ -23,7 +23,6 @@
 #include <vector>
 #include "Swiften/Queries/SetResponder.h"
 #include "BlockPayload.h"
-#include <boost/signal.hpp>
 
 namespace Transport {
 
@@ -35,7 +34,7 @@ class BlockResponder : public Swift::SetResponder<Transport::BlockPayload> {
 		BlockResponder(Swift::IQRouter *router, UserManager *userManager);
 		~BlockResponder();
 
-		boost::signal<void (Buddy *)> onBlockToggled;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (Buddy *)> onBlockToggled;
 
 	private:
 		virtual bool handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Transport::BlockPayload> payload);
diff --git a/spectrum/src/frontends/xmpp/discoinforesponder.h b/spectrum/src/frontends/xmpp/discoinforesponder.h
index 5b296ae38a1ea79a3a291f6eb64bb6ef9932b0fa..b450dce4e2076a3c562ec4d1b70afa3a5c3ceb63 100644
--- a/spectrum/src/frontends/xmpp/discoinforesponder.h
+++ b/spectrum/src/frontends/xmpp/discoinforesponder.h
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <list>
-#include <boost/signal.hpp>
 #include "Swiften/Queries/GetResponder.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Elements/CapsInfo.h"
@@ -53,7 +52,7 @@ class DiscoInfoResponder : public Swift::GetResponder<Swift::DiscoInfo> {
 
 		void addAdHocCommand(const std::string &node, const std::string &name);
 
-		boost::signal<void (const Swift::CapsInfo &capsInfo)> onBuddyCapsInfoChanged;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (const Swift::CapsInfo &capsInfo)> onBuddyCapsInfoChanged;
 
 		Swift::CapsInfo &getBuddyCapsInfo() {
 				return m_capsInfo;
diff --git a/spectrum/src/frontends/xmpp/formutils.h b/spectrum/src/frontends/xmpp/formutils.h
index 312de8823b224976812800a073626e244f0e25eb..1691ef722f43c4e93911c1608e07a7c8fd8b60fd 100644
--- a/spectrum/src/frontends/xmpp/formutils.h
+++ b/spectrum/src/frontends/xmpp/formutils.h
@@ -23,7 +23,6 @@
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/InBandRegistrationPayload.h"
 #include "Swiften/Elements/RosterPayload.h"
-#include <boost/signal.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 
diff --git a/spectrum/src/frontends/xmpp/vcardresponder.h b/spectrum/src/frontends/xmpp/vcardresponder.h
index 76c36e03af94a5299c1c106981d078af0f69bb87..e42ce473803164e95447c2c6befe9d6707917cc3 100644
--- a/spectrum/src/frontends/xmpp/vcardresponder.h
+++ b/spectrum/src/frontends/xmpp/vcardresponder.h
@@ -26,7 +26,6 @@
 #include "Swiften/Network/NetworkFactories.h"
 #include "Swiften/Network/Timer.h"
 #include "Swiften/SwiftenCompat.h"
-#include <boost/signal.hpp>
 
 namespace Transport {
 
@@ -41,8 +40,8 @@ class VCardResponder : public Swift::Responder<Swift::VCard> {
 
 		void sendVCard(unsigned int id, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard);
 
-		boost::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
-		boost::signal<void (User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *, const std::string &name, unsigned int id)> onVCardRequired;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (User *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::VCard> vcard)> onVCardUpdated;
 
 		void collectTimeouted();
 
diff --git a/spectrum_manager/src/APIServer.h b/spectrum_manager/src/APIServer.h
index 91ad37011b8334027a6f65ef7a8dfae854f18583..04f8cf6021155fd3ca2af76a492a9175946e6f34 100644
--- a/spectrum_manager/src/APIServer.h
+++ b/spectrum_manager/src/APIServer.h
@@ -26,7 +26,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign.hpp>
 #include <boost/bind.hpp>
-#include <boost/signal.hpp>
 
 #include "rapidjson/document.h"
 
diff --git a/spectrum_manager/src/managerconfig.h b/spectrum_manager/src/managerconfig.h
index 48ca15b81007b64ede87466f51fa740d7ce50051..261e6f5589e0b546b11890a94e63ed3648809987 100644
--- a/spectrum_manager/src/managerconfig.h
+++ b/spectrum_manager/src/managerconfig.h
@@ -26,7 +26,8 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign.hpp>
 #include <boost/bind.hpp>
-#include <boost/signal.hpp>
+
+#include "Swiften/SwiftenCompat.h"
 
 /// Represents variable:value pairs.
 typedef boost::program_options::variables_map Variables;
@@ -76,7 +77,7 @@ class ManagerConfig {
 		const std::string &getManagerConfigFile() { return m_file; }
 
 		/// This signal is emitted when config is loaded/reloaded.
-		boost::signal<void ()> onManagerConfigReloaded;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void ()> onManagerConfigReloaded;
 	
 	private:
 		Variables m_variables;
diff --git a/spectrum_manager/src/methods.h b/spectrum_manager/src/methods.h
index 7d4793353972845cd00eea2d03f2720c51f3459d..e15ff5c17d9beaabecc6ccbac2326a876567471b 100644
--- a/spectrum_manager/src/methods.h
+++ b/spectrum_manager/src/methods.h
@@ -26,7 +26,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign.hpp>
 #include <boost/bind.hpp>
-#include <boost/signal.hpp>
 
 #include "managerconfig.h"
 #include "transport/Config.h"
diff --git a/spectrum_manager/src/server.h b/spectrum_manager/src/server.h
index 847bb273d0b1adaef78334b1ae822d7e40868948..5014268a19c425559149eb931ab8f00d0f9afae8 100644
--- a/spectrum_manager/src/server.h
+++ b/spectrum_manager/src/server.h
@@ -26,7 +26,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/assign.hpp>
 #include <boost/bind.hpp>
-#include <boost/signal.hpp>
 
 #include "mongoose.h"
 #include "managerconfig.h"
diff --git a/tests/libtransport/basictest.h b/tests/libtransport/basictest.h
index 12133085781dd765a964fdada0263a3dceb9109d..ed21ac4953c79a4aee7f9ec6af741c240b0a00c7 100644
--- a/tests/libtransport/basictest.h
+++ b/tests/libtransport/basictest.h
@@ -66,7 +66,7 @@ class TestingConversation : public Conversation {
 			onMessageToSend(this, message);
 		}
 
-		boost::signal<void (TestingConversation *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> &)> onMessageToSend;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (TestingConversation *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> &)> onMessageToSend;
 };
 
 class TestingFactory : public Factory {
@@ -98,7 +98,7 @@ class TestingFactory : public Factory {
 			return buddy;
 		}
 
-		boost::signal<void (TestingConversation *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> &)> onMessageToSend;
+		SWIFTEN_SIGNAL_NAMESPACE::signal<void (TestingConversation *, SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> &)> onMessageToSend;
 };
 
 class TestingStorageBackend : public StorageBackend {