3 files changed, 7 insertions, 6 deletions
diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h
index ffd6608..a71d323 100644
--- a/Swiften/Avatars/AvatarManager.h
+++ b/Swiften/Avatars/AvatarManager.h
@@ -7,10 +7,10 @@
 #pragma once
 
 #include <boost/filesystem/path.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
     class JID;
@@ -22,6 +22,6 @@ namespace Swift {
             virtual ByteArray getAvatar(const JID&) const = 0;
             virtual boost::filesystem::path getAvatarPath(const JID&) const = 0;
 
-            boost::signal<void (const JID&)> onAvatarChanged;
+            boost::signals2::signal<void (const JID&)> onAvatarChanged;
     };
 }
diff --git a/Swiften/Avatars/AvatarProvider.h b/Swiften/Avatars/AvatarProvider.h
index 77d9cba..a92418f 100644
--- a/Swiften/Avatars/AvatarProvider.h
+++ b/Swiften/Avatars/AvatarProvider.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,8 +8,9 @@
 
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
     class JID;
@@ -20,6 +21,6 @@ namespace Swift {
 
             virtual boost::optional<std::string> getAvatarHash(const JID&) const = 0;
 
-            boost::signal<void (const JID&)> onAvatarChanged;
+            boost::signals2::signal<void (const JID&)> onAvatarChanged;
     };
 }
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.h b/Swiften/Avatars/VCardUpdateAvatarManager.h
index c58d491..19ed672 100644
--- a/Swiften/Avatars/VCardUpdateAvatarManager.h
+++ b/Swiften/Avatars/VCardUpdateAvatarManager.h
@@ -23,7 +23,7 @@ namespace Swift {
     class VCardManager;
     class CryptoProvider;
 
-    class SWIFTEN_API VCardUpdateAvatarManager : public AvatarProvider, public boost::bsignals::trackable {
+    class SWIFTEN_API VCardUpdateAvatarManager : public AvatarProvider, public boost::signals2::trackable {
         public:
             VCardUpdateAvatarManager(VCardManager*, StanzaChannel*, AvatarStorage*, CryptoProvider* crypto, MUCRegistry* = nullptr);