diff --git a/include/boost/log/sources/severity_feature.hpp b/include/boost/log/sources/severity_feature.hpp
index e798fb0dd..2fdd21235 100644
--- a/include/boost/log/sources/severity_feature.hpp
+++ b/include/boost/log/sources/severity_feature.hpp
@@ -17,7 +17,7 @@
 
 #include <boost/cstdint.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/core/swap.hpp>
+#include <boost/core/invoke_swap.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility_core.hpp>
@@ -261,7 +261,7 @@ class basic_severity_logger :
     void swap_unlocked(basic_severity_logger& that)
     {
         base_type::swap_unlocked(static_cast< base_type& >(that));
-        boost::swap(m_DefaultSeverity, that.m_DefaultSeverity);
+        boost::core::invoke_swap(m_DefaultSeverity, that.m_DefaultSeverity);
         m_SeverityAttr.swap(that.m_SeverityAttr);
     }
 };
diff --git a/src/core.cpp b/src/core.cpp
index 4fe27c7ee..657de0eb8 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <boost/cstdint.hpp>
 #include <boost/assert.hpp>
-#include <boost/core/swap.hpp>
+#include <boost/core/invoke_swap.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
 #include <boost/smart_ptr/shared_ptr.hpp>
@@ -61,7 +61,7 @@ BOOST_LOG_ANONYMOUS_NAMESPACE {
 
 //! Sequence shuffling algorithm. Very similar to std::random_shuffle, used for forward portability with compilers that removed it from the standard library (C++17).
 template< typename Iterator, typename RandomNumberGenerator >
-void random_shuffle(Iterator begin, Iterator end, RandomNumberGenerator& rng)
+inline void random_shuffle(Iterator begin, Iterator end, RandomNumberGenerator& rng)
 {
     Iterator it = begin;
     ++it;
@@ -69,7 +69,7 @@ void random_shuffle(Iterator begin, Iterator end, RandomNumberGenerator& rng)
     {
         Iterator where = begin + rng() % (it - begin + 1u);
         if (where != it)
-            boost::swap(*where, *it);
+            boost::core::invoke_swap(*where, *it);
         ++it;
     }
 }