5 files changed, 15 insertions, 13 deletions
diff --git a/Swiften/StreamStack/CompressionLayer.h b/Swiften/StreamStack/CompressionLayer.h
index 32fad37..04a9251 100644
--- a/Swiften/StreamStack/CompressionLayer.h
+++ b/Swiften/StreamStack/CompressionLayer.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <boost/noncopyable.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Compress/ZLibCompressor.h>
 #include <Swiften/Compress/ZLibDecompressor.h>
 #include <Swiften/Compress/ZLibException.h>
@@ -43,7 +43,7 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void ()> onError;
+            boost::signals2::signal<void ()> onError;
 
         private:
             ZLibCompressor compressor_;
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h
index 62bd026..b12a69f 100644
--- a/Swiften/StreamStack/StreamStack.h
+++ b/Swiften/StreamStack/StreamStack.h
@@ -9,8 +9,9 @@
 #include <memory>
 #include <vector>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/Stanza.h>
 
 namespace Swift {
diff --git a/Swiften/StreamStack/TLSLayer.h b/Swiften/StreamStack/TLSLayer.h
index 8782753..415a3f0 100644
--- a/Swiften/StreamStack/TLSLayer.h
+++ b/Swiften/StreamStack/TLSLayer.h
@@ -6,9 +6,10 @@
 
 #pragma once
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/StreamStack/StreamLayer.h>
 #include <Swiften/TLS/Certificate.h>
 #include <Swiften/TLS/CertificateVerificationError.h>
@@ -40,8 +41,8 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void (std::shared_ptr<TLSError>)> onError;
-            boost::signal<void ()> onConnected;
+            boost::signals2::signal<void (std::shared_ptr<TLSError>)> onError;
+            boost::signals2::signal<void ()> onConnected;
 
         private:
             TLSContext* context;
diff --git a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
index 6d50b77..f0f82c9 100644
--- a/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
+++ b/Swiften/StreamStack/UnitTest/StreamStackTest.cpp
@@ -4,10 +4,10 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
 #include <vector>
 
 #include <boost/bind.hpp>
-#include <boost/smart_ptr.hpp>
 
 #include <QA/Checker/IO.h>
 
diff --git a/Swiften/StreamStack/XMPPLayer.h b/Swiften/StreamStack/XMPPLayer.h
index 74ea519..1d4abf8 100644
--- a/Swiften/StreamStack/XMPPLayer.h
+++ b/Swiften/StreamStack/XMPPLayer.h
@@ -9,10 +9,10 @@
 #include <memory>
 
 #include <boost/noncopyable.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/StreamType.h>
 #include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/Parser/XMPPParserClient.h>
@@ -50,11 +50,11 @@ namespace Swift {
             void writeDataInternal(const SafeByteArray& data);
 
         public:
-            boost::signal<void (const ProtocolHeader&)> onStreamStart;
-            boost::signal<void (std::shared_ptr<ToplevelElement>)> onElement;
-            boost::signal<void (const SafeByteArray&)> onWriteData;
-            boost::signal<void (const SafeByteArray&)> onDataRead;
-            boost::signal<void ()> onError;
+            boost::signals2::signal<void (const ProtocolHeader&)> onStreamStart;
+            boost::signals2::signal<void (std::shared_ptr<ToplevelElement>)> onElement;
+            boost::signals2::signal<void (const SafeByteArray&)> onWriteData;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataRead;
+            boost::signals2::signal<void ()> onError;
 
         private:
             void handleStreamStart(const ProtocolHeader&);