diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 065d80b4d..ddacdbd5b 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -46,9 +46,6 @@ endif()
 
 # Boost
 
-# note: we're assuming that boost has been built with:
-# ./b2 toolset=clang-17 link=static,shared variant=debug,release stage
-
 #
 # Project settings
 #
@@ -285,9 +282,6 @@ CHECK_INCLUDE_FILE_CXX(hash_map HASH_MAP_FOUND)
 if(HASH_MAP_FOUND)
   archive_test(test_map_hashed A)
 endif()
-if(COMPILER_SUPPORTS_CXX11)
-  archive_test(test_map_unordered A)
-endif()
 archive_test(test_mi)
 archive_test(test_multiple_ptrs A)
 archive_test(test_multiple_inheritance)
@@ -312,9 +306,6 @@ CHECK_INCLUDE_FILE_CXX(hash_set HASH_SET_FOUND)
 if(HASH_SET_FOUND)
   archive_test(test_set_hashed A)
 endif()
-if(COMPILER_SUPPORTS_CXX11)
-  archive_test(test_set_unordered A)
-endif()
 
 archive_test(test_shared_ptr)
 archive_test(test_shared_ptr_multi_base)
@@ -336,10 +327,12 @@ archive_test(test_valarray)
 archive_test(test_variant A)
 archive_test(test_vector A)
 
-polymorphic_archive_test(test_dll_exported polymorphic_derived1)
-foreach(test_name IN ITEMS ${test_list} )
+if(BUILD_SHARED_LIBS)
+  polymorphic_archive_test(test_dll_exported polymorphic_derived1)
+  foreach(test_name IN ITEMS ${test_list} )
     target_link_libraries(${test_name} dll_polymorphic_derived2 dll_polymorphic_base serialization wserialization)
-endforeach()
+  endforeach()
+endif()
 
 polymorphic_archive_test(test_no_rtti polymorphic_base polymorphic_derived1 polymorphic_derived2)
 polymorphic_archive_test(test_exported polymorphic_base polymorphic_derived1 polymorphic_derived2)
diff --git a/include/boost/serialization/boost_unordered_map.hpp b/include/boost/serialization/boost_unordered_map.hpp
index 26a7b8197..b39d07040 100644
--- a/include/boost/serialization/boost_unordered_map.hpp
+++ b/include/boost/serialization/boost_unordered_map.hpp
@@ -18,11 +18,11 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config/pragma_message.hpp>
-
-BOOST_PRAGMA_MESSAGE(
-  "Boost.Unordered now provides its own Serialization support. "
-  "This header is no longer necessary and is now deprecated."
+#include <boost/static_assert.hpp>
+BOOST_STATIC_ASSERT_MSG(
+    false,
+    "Boost.Unordered now provides its own Serialization support. "
+    "This header is no longer necessary and is now deprecated."
 )
 
 #endif // BOOST_SERIALIZATION_BOOST_SERIALIZATION_UNORDERED_MAP_HPP
diff --git a/include/boost/serialization/boost_unordered_set.hpp b/include/boost/serialization/boost_unordered_set.hpp
index 5cda77d3a..9ede2479d 100644
--- a/include/boost/serialization/boost_unordered_set.hpp
+++ b/include/boost/serialization/boost_unordered_set.hpp
@@ -17,11 +17,11 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config/pragma_message.hpp>
-
-BOOST_PRAGMA_MESSAGE(
-  "Boost.Unordered now provides its own Serialization support. "
-  "This header is no longer necessary and is now deprecated."
+#include <boost/static_assert.hpp>
+BOOST_STATIC_ASSERT_MSG(
+    false,
+    "Boost.Unordered now provides its own Serialization support. "
+    "This header is no longer necessary and is now deprecated."
 )
 
 #endif // BOOST_SERIALIZATION_BOOST_UNORDERED_SET_HPP