4 files changed, 10 insertions, 9 deletions
diff --git a/Swiften/TLS/CAPICertificate.h b/Swiften/TLS/CAPICertificate.h
index 5322a03..0259db5 100644
--- a/Swiften/TLS/CAPICertificate.h
+++ b/Swiften/TLS/CAPICertificate.h
@@ -13,7 +13,7 @@
 #pragma once
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 #include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/Network/Timer.h>
@@ -43,7 +43,7 @@ namespace Swift {
             const std::string& getSmartCardReaderName() const;
 
         public:
-            boost::signal<void ()> onCertificateCardRemoved;
+            boost::signals2::signal<void ()> onCertificateCardRemoved;
 
         private:
             void setUri (const std::string& capiUri);
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.h b/Swiften/TLS/OpenSSL/OpenSSLContext.h
index 54a8dcb..e75b3c9 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.h
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include <boost/noncopyable.hpp>
+#include <boost/signals2.hpp>
 
 #include <openssl/ssl.h>
 
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 #include <Swiften/TLS/TLSContext.h>
 
diff --git a/Swiften/TLS/Schannel/SchannelContext.h b/Swiften/TLS/Schannel/SchannelContext.h
index 4cb086e..a3748fe 100644
--- a/Swiften/TLS/Schannel/SchannelContext.h
+++ b/Swiften/TLS/Schannel/SchannelContext.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swiften/TLS/TLSContext.h>
 #include <Swiften/TLS/Schannel/SchannelUtil.h>
diff --git a/Swiften/TLS/TLSContext.h b/Swiften/TLS/TLSContext.h
index b0d9296..79e3485 100644
--- a/Swiften/TLS/TLSContext.h
+++ b/Swiften/TLS/TLSContext.h
@@ -8,9 +8,10 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/TLS/Certificate.h>
 #include <Swiften/TLS/CertificateVerificationError.h>
 #include <Swiften/TLS/CertificateWithKey.h>
@@ -36,9 +37,9 @@ namespace Swift {
             virtual ByteArray getFinishMessage() const = 0;
 
         public:
-            boost::signal<void (const SafeByteArray&)> onDataForNetwork;
-            boost::signal<void (const SafeByteArray&)> onDataForApplication;
-            boost::signal<void (std::shared_ptr<TLSError>)> onError;
-            boost::signal<void ()> onConnected;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataForNetwork;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataForApplication;
+            boost::signals2::signal<void (std::shared_ptr<TLSError>)> onError;
+            boost::signals2::signal<void ()> onConnected;
     };
 }