diff --git a/factory/test/factory_allocator_throws.cpp b/factory/test/factory_allocator_throws.cpp
index 856e2dd..0186b79 100644
--- a/factory/test/factory_allocator_throws.cpp
+++ b/factory/test/factory_allocator_throws.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/functional/factory.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 
 struct type {
     explicit type(bool b) {
diff --git a/factory/test/factory_default_allocator.cpp b/factory/test/factory_default_allocator.cpp
index 4b8565f..c6450ba 100644
--- a/factory/test/factory_default_allocator.cpp
+++ b/factory/test/factory_default_allocator.cpp
@@ -8,13 +8,14 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/functional/factory.hpp>
 #include <boost/core/default_allocator.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/config.hpp>
 #include <exception>
 
 #if defined(BOOST_NO_EXCEPTIONS)
 namespace boost {
 
-void throw_exception(const std::exception&)
+BOOST_NORETURN void throw_exception(const std::exception&)
 {
     std::terminate();
 }
diff --git a/factory/test/factory_with_allocator.cpp b/factory/test/factory_with_allocator.cpp
index 544fd59..f321df1 100644
--- a/factory/test/factory_with_allocator.cpp
+++ b/factory/test/factory_with_allocator.cpp
@@ -9,7 +9,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/functional/factory.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 
 class sum  {
 public:
diff --git a/factory/test/factory_with_std_allocator.cpp b/factory/test/factory_with_std_allocator.cpp
index 5f0af35..6b7def4 100644
--- a/factory/test/factory_with_std_allocator.cpp
+++ b/factory/test/factory_with_std_allocator.cpp
@@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0.
 */
 #include <boost/functional/factory.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <memory>
 
 class sum  {