diff --git a/doc/apply_permutation.qbk b/doc/apply_permutation.qbk
index 86bebf1..a713548 100644
--- a/doc/apply_permutation.qbk
+++ b/doc/apply_permutation.qbk
@@ -16,12 +16,12 @@ The routine `apply_permutation` takes a item sequence and a order sequence. It r
 The routine `apply_reverse_permutation` takes a item sequence and a order sequence. It will reshuffle item sequence according to order sequence. Every value in order sequence means where the item goes to. Order sequence needs to be exactly a permutation of the sequence [0, 1, ... , N], where N is the biggest index in the item sequence (zero-indexed).
 
 Implementations are based on these articles:
-https://blogs.msdn.microsoft.com/oldnewthing/20170102-00/?p=95095
-https://blogs.msdn.microsoft.com/oldnewthing/20170103-00/?p=95105
-https://blogs.msdn.microsoft.com/oldnewthing/20170104-00/?p=95115
-https://blogs.msdn.microsoft.com/oldnewthing/20170109-00/?p=95145
-https://blogs.msdn.microsoft.com/oldnewthing/20170110-00/?p=95155
-https://blogs.msdn.microsoft.com/oldnewthing/20170111-00/?p=95165
+https://devblogs.microsoft.com/oldnewthing/20170102-00/?p=95095
+https://devblogs.microsoft.com/oldnewthing/20170103-00/?p=95105
+https://devblogs.microsoft.com/oldnewthing/20170104-00/?p=95115
+https://devblogs.microsoft.com/oldnewthing/20170109-00/?p=95145
+https://devblogs.microsoft.com/oldnewthing/20170110-00/?p=95155
+https://devblogs.microsoft.com/oldnewthing/20170111-00/?p=95165
 
 The routines come in 2 forms; the first one takes two iterators to define the item range and one iterator to define the beginning of index range. The second form takes range to define the item sequence and range to define index sequence.
 
diff --git a/include/boost/algorithm/algorithm.hpp b/include/boost/algorithm/algorithm.hpp
index 76753cd..85b43c0 100644
--- a/include/boost/algorithm/algorithm.hpp
+++ b/include/boost/algorithm/algorithm.hpp
@@ -20,7 +20,7 @@
 #include <functional> // for plus and multiplies
 
 #include <boost/config.hpp>
-#include <boost/utility/enable_if.hpp> // for boost::disable_if
+#include <boost/core/enable_if.hpp> // for boost::disable_if
 #include <boost/type_traits/is_integral.hpp>
 
 namespace boost { namespace algorithm {
diff --git a/include/boost/algorithm/clamp.hpp b/include/boost/algorithm/clamp.hpp
index 1378f95..2f160a0 100644
--- a/include/boost/algorithm/clamp.hpp
+++ b/include/boost/algorithm/clamp.hpp
@@ -27,7 +27,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/type_traits/type_identity.hpp> // for boost::type_identity
-#include <boost/utility/enable_if.hpp>         // for boost::disable_if
+#include <boost/core/enable_if.hpp>            // for boost::disable_if
 
 namespace boost { namespace algorithm {
 
diff --git a/include/boost/algorithm/cxx11/is_permutation.hpp b/include/boost/algorithm/cxx11/is_permutation.hpp
index 31eac93..693f54a 100644
--- a/include/boost/algorithm/cxx11/is_permutation.hpp
+++ b/include/boost/algorithm/cxx11/is_permutation.hpp
@@ -20,7 +20,7 @@
 #include <boost/config.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace boost { namespace algorithm {
diff --git a/include/boost/algorithm/cxx11/is_sorted.hpp b/include/boost/algorithm/cxx11/is_sorted.hpp
index e02fb36..2526a87 100644
--- a/include/boost/algorithm/cxx11/is_sorted.hpp
+++ b/include/boost/algorithm/cxx11/is_sorted.hpp
@@ -20,7 +20,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/type_identity.hpp> // for boost::type_identity
 
diff --git a/include/boost/algorithm/hex.hpp b/include/boost/algorithm/hex.hpp
index 3cba2f9..f945804 100644
--- a/include/boost/algorithm/hex.hpp
+++ b/include/boost/algorithm/hex.hpp
@@ -30,7 +30,7 @@
 #include <boost/exception/info.hpp>
 #include <boost/throw_exception.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_integral.hpp>
 
 
diff --git a/include/boost/algorithm/is_palindrome.hpp b/include/boost/algorithm/is_palindrome.hpp
index 8e1df18..531f82e 100644
--- a/include/boost/algorithm/is_palindrome.hpp
+++ b/include/boost/algorithm/is_palindrome.hpp
@@ -113,7 +113,7 @@ bool is_palindrome(const R& range, Predicate p)
 /// \note This function will return true for empty sequences and for palindromes.
 ///     For other sequences function will return false.
 ///     Complexity: O(N).
-bool is_palindrome(const char* str)
+inline bool is_palindrome(const char* str)
 {
     if(!str)
 	    return true;
diff --git a/include/boost/algorithm/searching/boyer_moore.hpp b/include/boost/algorithm/searching/boyer_moore.hpp
index 4bf7657..80a5a44 100644
--- a/include/boost/algorithm/searching/boyer_moore.hpp
+++ b/include/boost/algorithm/searching/boyer_moore.hpp
@@ -19,7 +19,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/algorithm/searching/detail/bm_traits.hpp>
diff --git a/include/boost/algorithm/searching/boyer_moore_horspool.hpp b/include/boost/algorithm/searching/boyer_moore_horspool.hpp
index dd354cc..b8038fd 100644
--- a/include/boost/algorithm/searching/boyer_moore_horspool.hpp
+++ b/include/boost/algorithm/searching/boyer_moore_horspool.hpp
@@ -19,7 +19,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/algorithm/searching/detail/bm_traits.hpp>
diff --git a/include/boost/algorithm/searching/knuth_morris_pratt.hpp b/include/boost/algorithm/searching/knuth_morris_pratt.hpp
index 7c1541c..4c93fff 100644
--- a/include/boost/algorithm/searching/knuth_morris_pratt.hpp
+++ b/include/boost/algorithm/searching/knuth_morris_pratt.hpp
@@ -20,7 +20,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/algorithm/searching/detail/debugging.hpp>