2 files changed, 10 insertions, 8 deletions
diff --git a/Swiften/Whiteboard/WhiteboardSession.h b/Swiften/Whiteboard/WhiteboardSession.h
index 63d9670..0871f94 100644
--- a/Swiften/Whiteboard/WhiteboardSession.h
+++ b/Swiften/Whiteboard/WhiteboardSession.h
@@ -14,9 +14,10 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
 #include <Swiften/JID/JID.h>
@@ -41,11 +42,11 @@ namespace Swift {
         const JID& getTo() const;
 
     public:
-        boost::signal< void(const WhiteboardElement::ref element)> onElementReceived;
-        boost::signal< void(const WhiteboardOperation::ref operation)> onOperationReceived;
-        boost::signal< void(const JID& contact)> onSessionTerminated;
-        boost::signal< void(const JID& contact)> onRequestAccepted;
-        boost::signal< void(const JID& contact)> onRequestRejected;
+        boost::signals2::signal< void(const WhiteboardElement::ref element)> onElementReceived;
+        boost::signals2::signal< void(const WhiteboardOperation::ref operation)> onOperationReceived;
+        boost::signals2::signal< void(const JID& contact)> onSessionTerminated;
+        boost::signals2::signal< void(const JID& contact)> onRequestAccepted;
+        boost::signals2::signal< void(const JID& contact)> onRequestRejected;
 
     private:
         virtual void handleIncomingOperation(WhiteboardOperation::ref operation) = 0;
diff --git a/Swiften/Whiteboard/WhiteboardSessionManager.h b/Swiften/Whiteboard/WhiteboardSessionManager.h
index 44ce14a..4f14665 100644
--- a/Swiften/Whiteboard/WhiteboardSessionManager.h
+++ b/Swiften/Whiteboard/WhiteboardSessionManager.h
@@ -14,8 +14,9 @@
 
 #include <map>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Queries/IQRouter.h>
@@ -39,7 +40,7 @@ namespace Swift {
         WhiteboardSession::ref requestSession(const JID& to);
 
     public:
-        boost::signal< void (IncomingWhiteboardSession::ref)> onSessionRequest;
+        boost::signals2::signal< void (IncomingWhiteboardSession::ref)> onSessionRequest;
 
     private:
         JID getFullJID(const JID& bareJID);