Apply boost yamaker helpers to unsafe subset

72 files changed, 28 insertions, 153 deletions

diff --git a/contrib/restricted/boost/align/CMakeLists.darwin.txt b/contrib/restricted/boost/align/CMakeLists.darwin.txt
index 284887ead4..326f1df987 100644
--- a/contrib/restricted/boost/align/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/align/CMakeLists.darwin.txt
@@ -13,10 +13,8 @@ target_include_directories(restricted-boost-align INTERFACE
 )
 target_link_libraries(restricted-boost-align INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-static_assert
-  restricted-boost-throw_exception
 )
diff --git a/contrib/restricted/boost/align/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/align/CMakeLists.linux-aarch64.txt
index c4dec3afad..050b85b7c9 100644
--- a/contrib/restricted/boost/align/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/align/CMakeLists.linux-aarch64.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-align INTERFACE
 target_link_libraries(restricted-boost-align INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-static_assert
-  restricted-boost-throw_exception
 )
diff --git a/contrib/restricted/boost/align/CMakeLists.linux.txt b/contrib/restricted/boost/align/CMakeLists.linux.txt
index c4dec3afad..050b85b7c9 100644
--- a/contrib/restricted/boost/align/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/align/CMakeLists.linux.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-align INTERFACE
 target_link_libraries(restricted-boost-align INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-static_assert
-  restricted-boost-throw_exception
 )
diff --git a/contrib/restricted/boost/any/CMakeLists.darwin.txt b/contrib/restricted/boost/any/CMakeLists.darwin.txt
index c6a1c3a483..909957431f 100644
--- a/contrib/restricted/boost/any/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/any/CMakeLists.darwin.txt
@@ -13,10 +13,8 @@ target_include_directories(restricted-boost-any INTERFACE
 )
 target_link_libraries(restricted-boost-any INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_index
diff --git a/contrib/restricted/boost/any/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/any/CMakeLists.linux-aarch64.txt
index 0f5947a0b8..9e8f6070df 100644
--- a/contrib/restricted/boost/any/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/any/CMakeLists.linux-aarch64.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-any INTERFACE
 target_link_libraries(restricted-boost-any INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_index
diff --git a/contrib/restricted/boost/any/CMakeLists.linux.txt b/contrib/restricted/boost/any/CMakeLists.linux.txt
index 0f5947a0b8..9e8f6070df 100644
--- a/contrib/restricted/boost/any/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/any/CMakeLists.linux.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-any INTERFACE
 target_link_libraries(restricted-boost-any INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_index
diff --git a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt b/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
index 8ba28dd032..a8901ef07b 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.darwin.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-bimap INTERFACE
 )
 target_link_libraries(restricted-boost-bimap INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-container_hash
@@ -23,7 +22,6 @@ target_link_libraries(restricted-boost-bimap INTERFACE
   restricted-boost-mpl
   restricted-boost-multi_index
   restricted-boost-preprocessor
-  restricted-boost-property_map
   restricted-boost-serialization
   restricted-boost-static_assert
   restricted-boost-throw_exception
diff --git a/contrib/restricted/boost/bimap/CMakeLists.linux.txt b/contrib/restricted/boost/bimap/CMakeLists.linux.txt
index ec9f4d731c..2cc2d3a5aa 100644
--- a/contrib/restricted/boost/bimap/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/bimap/CMakeLists.linux.txt
@@ -14,7 +14,6 @@ target_include_directories(restricted-boost-bimap INTERFACE
 target_link_libraries(restricted-boost-bimap INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-container_hash
@@ -24,7 +23,6 @@ target_link_libraries(restricted-boost-bimap INTERFACE
   restricted-boost-mpl
   restricted-boost-multi_index
   restricted-boost-preprocessor
-  restricted-boost-property_map
   restricted-boost-serialization
   restricted-boost-static_assert
   restricted-boost-throw_exception
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt b/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
index f2f03435a6..45811abad1 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.darwin.txt
@@ -13,9 +13,8 @@ target_include_directories(restricted-boost-concept_check INTERFACE
 )
 target_link_libraries(restricted-boost-concept_check INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-mpl
   restricted-boost-preprocessor
+  restricted-boost-static_assert
   restricted-boost-type_traits
 )
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/concept_check/CMakeLists.linux-aarch64.txt
index 5390d28b10..e91bd0aee7 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.linux-aarch64.txt
@@ -14,9 +14,8 @@ target_include_directories(restricted-boost-concept_check INTERFACE
 target_link_libraries(restricted-boost-concept_check INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-mpl
   restricted-boost-preprocessor
+  restricted-boost-static_assert
   restricted-boost-type_traits
 )
diff --git a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt b/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
index 5390d28b10..e91bd0aee7 100644
--- a/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/concept_check/CMakeLists.linux.txt
@@ -14,9 +14,8 @@ target_include_directories(restricted-boost-concept_check INTERFACE
 target_link_libraries(restricted-boost-concept_check INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-mpl
   restricted-boost-preprocessor
+  restricted-boost-static_assert
   restricted-boost-type_traits
 )
diff --git a/contrib/restricted/boost/container/CMakeLists.darwin.txt b/contrib/restricted/boost/container/CMakeLists.darwin.txt
index a1155e5798..bc069639a0 100644
--- a/contrib/restricted/boost/container/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/container/CMakeLists.darwin.txt
@@ -16,15 +16,14 @@ target_include_directories(restricted-boost-container PUBLIC
 )
 target_link_libraries(restricted-boost-container PUBLIC
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
-  restricted-boost-container_hash
   restricted-boost-core
   restricted-boost-intrusive
   restricted-boost-move
   restricted-boost-static_assert
   restricted-boost-type_traits
+  restricted-boost-winapi
 )
 target_sources(restricted-boost-container PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/container/src/alloc_lib.c
diff --git a/contrib/restricted/boost/container/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/container/CMakeLists.linux-aarch64.txt
index 9cfe0ce4e5..5aeaf6ca89 100644
--- a/contrib/restricted/boost/container/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/container/CMakeLists.linux-aarch64.txt
@@ -17,15 +17,14 @@ target_include_directories(restricted-boost-container PUBLIC
 target_link_libraries(restricted-boost-container PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
-  restricted-boost-container_hash
   restricted-boost-core
   restricted-boost-intrusive
   restricted-boost-move
   restricted-boost-static_assert
   restricted-boost-type_traits
+  restricted-boost-winapi
 )
 target_sources(restricted-boost-container PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/container/src/alloc_lib.c
diff --git a/contrib/restricted/boost/container/CMakeLists.linux.txt b/contrib/restricted/boost/container/CMakeLists.linux.txt
index 9cfe0ce4e5..5aeaf6ca89 100644
--- a/contrib/restricted/boost/container/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/container/CMakeLists.linux.txt
@@ -17,15 +17,14 @@ target_include_directories(restricted-boost-container PUBLIC
 target_link_libraries(restricted-boost-container PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
-  restricted-boost-container_hash
   restricted-boost-core
   restricted-boost-intrusive
   restricted-boost-move
   restricted-boost-static_assert
   restricted-boost-type_traits
+  restricted-boost-winapi
 )
 target_sources(restricted-boost-container PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/container/src/alloc_lib.c
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
index 0b374b73b4..16176f4266 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.darwin.txt
@@ -19,11 +19,11 @@ target_link_libraries(boost-context-impl_common PUBLIC
   contrib-libs-cxxsupp
   restricted-boost-assert
   restricted-boost-config
+  restricted-boost-core
   restricted-boost-mp11
   restricted-boost-pool
   restricted-boost-predef
   restricted-boost-smart_ptr
-  restricted-boost-thread
 )
 target_sources(boost-context-impl_common PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/context/src/posix/stack_traits.cpp
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-aarch64.txt
index 7759c5b6f1..8d3c8c70ef 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.linux-aarch64.txt
@@ -20,11 +20,11 @@ target_link_libraries(boost-context-impl_common PUBLIC
   contrib-libs-cxxsupp
   restricted-boost-assert
   restricted-boost-config
+  restricted-boost-core
   restricted-boost-mp11
   restricted-boost-pool
   restricted-boost-predef
   restricted-boost-smart_ptr
-  restricted-boost-thread
 )
 target_sources(boost-context-impl_common PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/context/src/posix/stack_traits.cpp
diff --git a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt b/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
index 7759c5b6f1..8d3c8c70ef 100644
--- a/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/context/impl_common/CMakeLists.linux.txt
@@ -20,11 +20,11 @@ target_link_libraries(boost-context-impl_common PUBLIC
   contrib-libs-cxxsupp
   restricted-boost-assert
   restricted-boost-config
+  restricted-boost-core
   restricted-boost-mp11
   restricted-boost-pool
   restricted-boost-predef
   restricted-boost-smart_ptr
-  restricted-boost-thread
 )
 target_sources(boost-context-impl_common PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/context/src/posix/stack_traits.cpp
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt b/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
index 0bbb89d950..11112905e6 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.darwin.txt
@@ -26,9 +26,7 @@ target_link_libraries(restricted-boost-coroutine PUBLIC
   restricted-boost-core
   restricted-boost-exception
   restricted-boost-move
-  restricted-boost-range
   restricted-boost-system
-  restricted-boost-thread
   restricted-boost-throw_exception
   restricted-boost-type_traits
   restricted-boost-utility
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/coroutine/CMakeLists.linux-aarch64.txt
index 32a6048735..9b8026d622 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.linux-aarch64.txt
@@ -27,9 +27,7 @@ target_link_libraries(restricted-boost-coroutine PUBLIC
   restricted-boost-core
   restricted-boost-exception
   restricted-boost-move
-  restricted-boost-range
   restricted-boost-system
-  restricted-boost-thread
   restricted-boost-throw_exception
   restricted-boost-type_traits
   restricted-boost-utility
diff --git a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt b/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
index 32a6048735..9b8026d622 100644
--- a/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/coroutine/CMakeLists.linux.txt
@@ -27,9 +27,7 @@ target_link_libraries(restricted-boost-coroutine PUBLIC
   restricted-boost-core
   restricted-boost-exception
   restricted-boost-move
-  restricted-boost-range
   restricted-boost-system
-  restricted-boost-thread
   restricted-boost-throw_exception
   restricted-boost-type_traits
   restricted-boost-utility
diff --git a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt b/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
index 4b66c15f42..4f0af4c874 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.darwin.txt
@@ -19,7 +19,6 @@ target_link_libraries(restricted-boost-date_time INTERFACE
   restricted-boost-core
   restricted-boost-io
   restricted-boost-lexical_cast
-  restricted-boost-mpl
   restricted-boost-numeric_conversion
   restricted-boost-range
   restricted-boost-smart_ptr
diff --git a/contrib/restricted/boost/date_time/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/date_time/CMakeLists.linux-aarch64.txt
index da1e71530f..ff4b64aaa8 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.linux-aarch64.txt
@@ -20,7 +20,6 @@ target_link_libraries(restricted-boost-date_time INTERFACE
   restricted-boost-core
   restricted-boost-io
   restricted-boost-lexical_cast
-  restricted-boost-mpl
   restricted-boost-numeric_conversion
   restricted-boost-range
   restricted-boost-smart_ptr
diff --git a/contrib/restricted/boost/date_time/CMakeLists.linux.txt b/contrib/restricted/boost/date_time/CMakeLists.linux.txt
index da1e71530f..ff4b64aaa8 100644
--- a/contrib/restricted/boost/date_time/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/date_time/CMakeLists.linux.txt
@@ -20,7 +20,6 @@ target_link_libraries(restricted-boost-date_time INTERFACE
   restricted-boost-core
   restricted-boost-io
   restricted-boost-lexical_cast
-  restricted-boost-mpl
   restricted-boost-numeric_conversion
   restricted-boost-range
   restricted-boost-smart_ptr
diff --git a/contrib/restricted/boost/detail/CMakeLists.darwin.txt b/contrib/restricted/boost/detail/CMakeLists.darwin.txt
index 5d4334e746..494759d6e2 100644
--- a/contrib/restricted/boost/detail/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.darwin.txt
@@ -13,10 +13,8 @@ target_include_directories(restricted-boost-detail INTERFACE
 )
 target_link_libraries(restricted-boost-detail INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-static_assert
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/detail/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/detail/CMakeLists.linux-aarch64.txt
index 0fc2db177d..d6555ab93f 100644
--- a/contrib/restricted/boost/detail/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.linux-aarch64.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-detail INTERFACE
 target_link_libraries(restricted-boost-detail INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-static_assert
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/detail/CMakeLists.linux.txt b/contrib/restricted/boost/detail/CMakeLists.linux.txt
index 0fc2db177d..d6555ab93f 100644
--- a/contrib/restricted/boost/detail/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/detail/CMakeLists.linux.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-detail INTERFACE
 target_link_libraries(restricted-boost-detail INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-static_assert
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/endian/CMakeLists.darwin.txt b/contrib/restricted/boost/endian/CMakeLists.darwin.txt
index 7028a2d617..b37ca33634 100644
--- a/contrib/restricted/boost/endian/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.darwin.txt
@@ -13,13 +13,8 @@ target_include_directories(restricted-boost-endian INTERFACE
 )
 target_link_libraries(restricted-boost-endian INTERFACE
   contrib-libs-cxxsupp
-  yutil
-  restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-predef
   restricted-boost-static_assert
-  restricted-boost-system
   restricted-boost-type_traits
-  restricted-boost-utility
 )
diff --git a/contrib/restricted/boost/endian/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/endian/CMakeLists.linux-aarch64.txt
index cbbe3e149a..27cd726244 100644
--- a/contrib/restricted/boost/endian/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.linux-aarch64.txt
@@ -14,13 +14,8 @@ target_include_directories(restricted-boost-endian INTERFACE
 target_link_libraries(restricted-boost-endian INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
-  restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-predef
   restricted-boost-static_assert
-  restricted-boost-system
   restricted-boost-type_traits
-  restricted-boost-utility
 )
diff --git a/contrib/restricted/boost/endian/CMakeLists.linux.txt b/contrib/restricted/boost/endian/CMakeLists.linux.txt
index cbbe3e149a..27cd726244 100644
--- a/contrib/restricted/boost/endian/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/endian/CMakeLists.linux.txt
@@ -14,13 +14,8 @@ target_include_directories(restricted-boost-endian INTERFACE
 target_link_libraries(restricted-boost-endian INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
-  restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-predef
   restricted-boost-static_assert
-  restricted-boost-system
   restricted-boost-type_traits
-  restricted-boost-utility
 )
diff --git a/contrib/restricted/boost/function/CMakeLists.darwin.txt b/contrib/restricted/boost/function/CMakeLists.darwin.txt
index b9a37abc7a..844a3be533 100644
--- a/contrib/restricted/boost/function/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/function/CMakeLists.darwin.txt
@@ -13,14 +13,11 @@ target_include_directories(restricted-boost-function INTERFACE
 )
 target_link_libraries(restricted-boost-function INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-integer
-  restricted-boost-move
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-throw_exception
   restricted-boost-type_index
diff --git a/contrib/restricted/boost/function/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/function/CMakeLists.linux-aarch64.txt
index e46e962f8e..1eb86cf276 100644
--- a/contrib/restricted/boost/function/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/function/CMakeLists.linux-aarch64.txt
@@ -14,14 +14,11 @@ target_include_directories(restricted-boost-function INTERFACE
 target_link_libraries(restricted-boost-function INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-integer
-  restricted-boost-move
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-throw_exception
   restricted-boost-type_index
diff --git a/contrib/restricted/boost/function/CMakeLists.linux.txt b/contrib/restricted/boost/function/CMakeLists.linux.txt
index e46e962f8e..1eb86cf276 100644
--- a/contrib/restricted/boost/function/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/function/CMakeLists.linux.txt
@@ -14,14 +14,11 @@ target_include_directories(restricted-boost-function INTERFACE
 target_link_libraries(restricted-boost-function INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-integer
-  restricted-boost-move
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-throw_exception
   restricted-boost-type_index
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt b/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
index b80de74ab8..f0fe3fc375 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.darwin.txt
@@ -13,12 +13,10 @@ target_include_directories(restricted-boost-interprocess INTERFACE
 )
 target_link_libraries(restricted-boost-interprocess INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
   restricted-boost-core
-  restricted-boost-date_time
   restricted-boost-integer
   restricted-boost-intrusive
   restricted-boost-move
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/interprocess/CMakeLists.linux-aarch64.txt
index 9102c7a5ab..d9e726e2b2 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.linux-aarch64.txt
@@ -14,12 +14,10 @@ target_include_directories(restricted-boost-interprocess INTERFACE
 target_link_libraries(restricted-boost-interprocess INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
   restricted-boost-core
-  restricted-boost-date_time
   restricted-boost-integer
   restricted-boost-intrusive
   restricted-boost-move
diff --git a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt b/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
index 9102c7a5ab..d9e726e2b2 100644
--- a/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/interprocess/CMakeLists.linux.txt
@@ -14,12 +14,10 @@ target_include_directories(restricted-boost-interprocess INTERFACE
 target_link_libraries(restricted-boost-interprocess INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
   restricted-boost-core
-  restricted-boost-date_time
   restricted-boost-integer
   restricted-boost-intrusive
   restricted-boost-move
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt b/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
index 56da4b0c4e..4fbf68a9a3 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.darwin.txt
@@ -27,7 +27,6 @@ target_link_libraries(restricted-boost-iostreams PUBLIC
   ZLIB::ZLIB
   contrib-libs-zstd
   restricted-boost-assert
-  restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
@@ -35,6 +34,7 @@ target_link_libraries(restricted-boost-iostreams PUBLIC
   restricted-boost-integer
   restricted-boost-iterator
   restricted-boost-mpl
+  restricted-boost-numeric_conversion
   restricted-boost-preprocessor
   restricted-boost-random
   restricted-boost-range
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/iostreams/CMakeLists.linux-aarch64.txt
index e4137ffa8c..9ae997afc6 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.linux-aarch64.txt
@@ -28,7 +28,6 @@ target_link_libraries(restricted-boost-iostreams PUBLIC
   ZLIB::ZLIB
   contrib-libs-zstd
   restricted-boost-assert
-  restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
@@ -36,6 +35,7 @@ target_link_libraries(restricted-boost-iostreams PUBLIC
   restricted-boost-integer
   restricted-boost-iterator
   restricted-boost-mpl
+  restricted-boost-numeric_conversion
   restricted-boost-preprocessor
   restricted-boost-random
   restricted-boost-range
diff --git a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt b/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
index e4137ffa8c..9ae997afc6 100644
--- a/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/iostreams/CMakeLists.linux.txt
@@ -28,7 +28,6 @@ target_link_libraries(restricted-boost-iostreams PUBLIC
   ZLIB::ZLIB
   contrib-libs-zstd
   restricted-boost-assert
-  restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
@@ -36,6 +35,7 @@ target_link_libraries(restricted-boost-iostreams PUBLIC
   restricted-boost-integer
   restricted-boost-iterator
   restricted-boost-mpl
+  restricted-boost-numeric_conversion
   restricted-boost-preprocessor
   restricted-boost-random
   restricted-boost-range
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
index 8d670911c4..261ff4216a 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.darwin.txt
@@ -13,14 +13,12 @@ target_include_directories(restricted-boost-lexical_cast INTERFACE
 )
 target_link_libraries(restricted-boost-lexical_cast INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
   restricted-boost-core
   restricted-boost-integer
-  restricted-boost-mpl
   restricted-boost-numeric_conversion
   restricted-boost-range
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-aarch64.txt
index 76c0b377a0..c2f0df228f 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.linux-aarch64.txt
@@ -14,14 +14,12 @@ target_include_directories(restricted-boost-lexical_cast INTERFACE
 target_link_libraries(restricted-boost-lexical_cast INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
   restricted-boost-core
   restricted-boost-integer
-  restricted-boost-mpl
   restricted-boost-numeric_conversion
   restricted-boost-range
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt b/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
index 76c0b377a0..c2f0df228f 100644
--- a/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/lexical_cast/CMakeLists.linux.txt
@@ -14,14 +14,12 @@ target_include_directories(restricted-boost-lexical_cast INTERFACE
 target_link_libraries(restricted-boost-lexical_cast INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
   restricted-boost-core
   restricted-boost-integer
-  restricted-boost-mpl
   restricted-boost-numeric_conversion
   restricted-boost-range
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt b/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
index e4f3eec1c2..6f0f4e797a 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.darwin.txt
@@ -13,6 +13,4 @@ target_include_directories(restricted-boost-mp11 INTERFACE
 )
 target_link_libraries(restricted-boost-mp11 INTERFACE
   contrib-libs-cxxsupp
-  yutil
-  restricted-boost-config
 )
diff --git a/contrib/restricted/boost/mp11/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/mp11/CMakeLists.linux-aarch64.txt
index f5a346ab6e..897c1a10e3 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.linux-aarch64.txt
@@ -14,6 +14,4 @@ target_include_directories(restricted-boost-mp11 INTERFACE
 target_link_libraries(restricted-boost-mp11 INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
-  restricted-boost-config
 )
diff --git a/contrib/restricted/boost/mp11/CMakeLists.linux.txt b/contrib/restricted/boost/mp11/CMakeLists.linux.txt
index f5a346ab6e..897c1a10e3 100644
--- a/contrib/restricted/boost/mp11/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/mp11/CMakeLists.linux.txt
@@ -14,6 +14,4 @@ target_include_directories(restricted-boost-mp11 INTERFACE
 target_link_libraries(restricted-boost-mp11 INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
-  restricted-boost-config
 )
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt b/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
index 27b89de3a4..0106a2ad7d 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.darwin.txt
@@ -13,13 +13,11 @@ target_include_directories(restricted-boost-multi_index INTERFACE
 )
 target_link_libraries(restricted-boost-multi_index INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
-  restricted-boost-detail
   restricted-boost-foreach
   restricted-boost-integer
   restricted-boost-iterator
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/multi_index/CMakeLists.linux-aarch64.txt
index e6ccb9e635..aefa4822be 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.linux-aarch64.txt
@@ -14,13 +14,11 @@ target_include_directories(restricted-boost-multi_index INTERFACE
 target_link_libraries(restricted-boost-multi_index INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
-  restricted-boost-detail
   restricted-boost-foreach
   restricted-boost-integer
   restricted-boost-iterator
diff --git a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt b/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
index e6ccb9e635..aefa4822be 100644
--- a/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/multi_index/CMakeLists.linux.txt
@@ -14,13 +14,11 @@ target_include_directories(restricted-boost-multi_index INTERFACE
 target_link_libraries(restricted-boost-multi_index INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
-  restricted-boost-detail
   restricted-boost-foreach
   restricted-boost-integer
   restricted-boost-iterator
diff --git a/contrib/restricted/boost/optional/CMakeLists.darwin.txt b/contrib/restricted/boost/optional/CMakeLists.darwin.txt
index 8d4a6e6bf6..0d26f48531 100644
--- a/contrib/restricted/boost/optional/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.darwin.txt
@@ -13,13 +13,12 @@ target_include_directories(restricted-boost-optional INTERFACE
 )
 target_link_libraries(restricted-boost-optional INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
   restricted-boost-move
-  restricted-boost-mpl
+  restricted-boost-predef
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/optional/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/optional/CMakeLists.linux-aarch64.txt
index 67b0e1ddcd..e2ba8bc776 100644
--- a/contrib/restricted/boost/optional/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.linux-aarch64.txt
@@ -14,13 +14,12 @@ target_include_directories(restricted-boost-optional INTERFACE
 target_link_libraries(restricted-boost-optional INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
   restricted-boost-move
-  restricted-boost-mpl
+  restricted-boost-predef
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/optional/CMakeLists.linux.txt b/contrib/restricted/boost/optional/CMakeLists.linux.txt
index 67b0e1ddcd..e2ba8bc776 100644
--- a/contrib/restricted/boost/optional/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/optional/CMakeLists.linux.txt
@@ -14,13 +14,12 @@ target_include_directories(restricted-boost-optional INTERFACE
 target_link_libraries(restricted-boost-optional INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
   restricted-boost-move
-  restricted-boost-mpl
+  restricted-boost-predef
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt b/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
index 3f8514126f..c1a655382b 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.darwin.txt
@@ -13,10 +13,10 @@ target_include_directories(restricted-boost-parameter INTERFACE
 )
 target_link_libraries(restricted-boost-parameter INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-detail
+  restricted-boost-function
+  restricted-boost-fusion
   restricted-boost-mp11
   restricted-boost-mpl
   restricted-boost-optional
diff --git a/contrib/restricted/boost/parameter/CMakeLists.linux.txt b/contrib/restricted/boost/parameter/CMakeLists.linux.txt
index 9eb03cdf60..024b5dbef7 100644
--- a/contrib/restricted/boost/parameter/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/parameter/CMakeLists.linux.txt
@@ -14,10 +14,10 @@ target_include_directories(restricted-boost-parameter INTERFACE
 target_link_libraries(restricted-boost-parameter INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
-  restricted-boost-detail
+  restricted-boost-function
+  restricted-boost-fusion
   restricted-boost-mp11
   restricted-boost-mpl
   restricted-boost-optional
diff --git a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt b/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
index 6a302522b9..b7c60d2dc7 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.darwin.txt
@@ -13,10 +13,8 @@ target_include_directories(restricted-boost-property_map INTERFACE
 )
 target_link_libraries(restricted-boost-property_map INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-any
   restricted-boost-assert
-  restricted-boost-bind
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-core
@@ -24,9 +22,6 @@ target_link_libraries(restricted-boost-property_map INTERFACE
   restricted-boost-iterator
   restricted-boost-lexical_cast
   restricted-boost-mpl
-  restricted-boost-multi_index
-  restricted-boost-optional
-  restricted-boost-serialization
   restricted-boost-smart_ptr
   restricted-boost-static_assert
   restricted-boost-throw_exception
diff --git a/contrib/restricted/boost/property_map/CMakeLists.linux.txt b/contrib/restricted/boost/property_map/CMakeLists.linux.txt
index 3ad96f84f7..e85695aecc 100644
--- a/contrib/restricted/boost/property_map/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/property_map/CMakeLists.linux.txt
@@ -14,10 +14,8 @@ target_include_directories(restricted-boost-property_map INTERFACE
 target_link_libraries(restricted-boost-property_map INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-any
   restricted-boost-assert
-  restricted-boost-bind
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-core
@@ -25,9 +23,6 @@ target_link_libraries(restricted-boost-property_map INTERFACE
   restricted-boost-iterator
   restricted-boost-lexical_cast
   restricted-boost-mpl
-  restricted-boost-multi_index
-  restricted-boost-optional
-  restricted-boost-serialization
   restricted-boost-smart_ptr
   restricted-boost-static_assert
   restricted-boost-throw_exception
diff --git a/contrib/restricted/boost/range/CMakeLists.darwin.txt b/contrib/restricted/boost/range/CMakeLists.darwin.txt
index 29643ab305..dde55caac6 100644
--- a/contrib/restricted/boost/range/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/range/CMakeLists.darwin.txt
@@ -13,17 +13,16 @@ target_include_directories(restricted-boost-range INTERFACE
 )
 target_link_libraries(restricted-boost-range INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-container_hash
+  restricted-boost-conversion
   restricted-boost-core
   restricted-boost-detail
   restricted-boost-iterator
   restricted-boost-mpl
-  restricted-boost-numeric_conversion
   restricted-boost-optional
   restricted-boost-preprocessor
   restricted-boost-regex
diff --git a/contrib/restricted/boost/range/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/range/CMakeLists.linux-aarch64.txt
index c770ee52da..d4f7793f84 100644
--- a/contrib/restricted/boost/range/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/range/CMakeLists.linux-aarch64.txt
@@ -14,17 +14,16 @@ target_include_directories(restricted-boost-range INTERFACE
 target_link_libraries(restricted-boost-range INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-container_hash
+  restricted-boost-conversion
   restricted-boost-core
   restricted-boost-detail
   restricted-boost-iterator
   restricted-boost-mpl
-  restricted-boost-numeric_conversion
   restricted-boost-optional
   restricted-boost-preprocessor
   restricted-boost-regex
diff --git a/contrib/restricted/boost/range/CMakeLists.linux.txt b/contrib/restricted/boost/range/CMakeLists.linux.txt
index c770ee52da..d4f7793f84 100644
--- a/contrib/restricted/boost/range/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/range/CMakeLists.linux.txt
@@ -14,17 +14,16 @@ target_include_directories(restricted-boost-range INTERFACE
 target_link_libraries(restricted-boost-range INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-concept_check
   restricted-boost-config
   restricted-boost-container_hash
+  restricted-boost-conversion
   restricted-boost-core
   restricted-boost-detail
   restricted-boost-iterator
   restricted-boost-mpl
-  restricted-boost-numeric_conversion
   restricted-boost-optional
   restricted-boost-preprocessor
   restricted-boost-regex
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
index 53f7c2e4c8..56e02aa353 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.darwin.txt
@@ -13,12 +13,10 @@ target_include_directories(restricted-boost-smart_ptr INTERFACE
 )
 target_link_libraries(restricted-boost-smart_ptr INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-move
-  restricted-boost-predef
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-aarch64.txt
index 0daa8c459b..8db35ccd05 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.linux-aarch64.txt
@@ -14,12 +14,10 @@ target_include_directories(restricted-boost-smart_ptr INTERFACE
 target_link_libraries(restricted-boost-smart_ptr INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-move
-  restricted-boost-predef
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt b/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
index 0daa8c459b..8db35ccd05 100644
--- a/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/smart_ptr/CMakeLists.linux.txt
@@ -14,12 +14,10 @@ target_include_directories(restricted-boost-smart_ptr INTERFACE
 target_link_libraries(restricted-boost-smart_ptr INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-move
-  restricted-boost-predef
   restricted-boost-static_assert
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/thread/CMakeLists.darwin.txt b/contrib/restricted/boost/thread/CMakeLists.darwin.txt
index 0706ca8cc3..951cc87dfa 100644
--- a/contrib/restricted/boost/thread/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.darwin.txt
@@ -22,6 +22,7 @@ target_include_directories(restricted-boost-thread PUBLIC
 )
 target_link_libraries(restricted-boost-thread PUBLIC
   contrib-libs-cxxsupp
+  restricted-boost-algorithm
   restricted-boost-assert
   restricted-boost-atomic
   restricted-boost-bind
@@ -37,8 +38,8 @@ target_link_libraries(restricted-boost-thread PUBLIC
   restricted-boost-intrusive
   restricted-boost-io
   restricted-boost-iterator
+  restricted-boost-lexical_cast
   restricted-boost-move
-  restricted-boost-mpl
   restricted-boost-optional
   restricted-boost-predef
   restricted-boost-preprocessor
diff --git a/contrib/restricted/boost/thread/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/thread/CMakeLists.linux-aarch64.txt
index aa695d1aa5..42985ae40d 100644
--- a/contrib/restricted/boost/thread/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.linux-aarch64.txt
@@ -23,6 +23,7 @@ target_include_directories(restricted-boost-thread PUBLIC
 target_link_libraries(restricted-boost-thread PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
+  restricted-boost-algorithm
   restricted-boost-assert
   restricted-boost-atomic
   restricted-boost-bind
@@ -38,8 +39,8 @@ target_link_libraries(restricted-boost-thread PUBLIC
   restricted-boost-intrusive
   restricted-boost-io
   restricted-boost-iterator
+  restricted-boost-lexical_cast
   restricted-boost-move
-  restricted-boost-mpl
   restricted-boost-optional
   restricted-boost-predef
   restricted-boost-preprocessor
diff --git a/contrib/restricted/boost/thread/CMakeLists.linux.txt b/contrib/restricted/boost/thread/CMakeLists.linux.txt
index aa695d1aa5..42985ae40d 100644
--- a/contrib/restricted/boost/thread/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/thread/CMakeLists.linux.txt
@@ -23,6 +23,7 @@ target_include_directories(restricted-boost-thread PUBLIC
 target_link_libraries(restricted-boost-thread PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
+  restricted-boost-algorithm
   restricted-boost-assert
   restricted-boost-atomic
   restricted-boost-bind
@@ -38,8 +39,8 @@ target_link_libraries(restricted-boost-thread PUBLIC
   restricted-boost-intrusive
   restricted-boost-io
   restricted-boost-iterator
+  restricted-boost-lexical_cast
   restricted-boost-move
-  restricted-boost-mpl
   restricted-boost-optional
   restricted-boost-predef
   restricted-boost-preprocessor
diff --git a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt b/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
index 5a8d3251eb..ee86d3cc0e 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.darwin.txt
@@ -13,11 +13,9 @@ target_include_directories(restricted-boost-type_index INTERFACE
 )
 target_link_libraries(restricted-boost-type_index INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-smart_ptr
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/type_index/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/type_index/CMakeLists.linux-aarch64.txt
index f407007ea4..8b78d2fc07 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.linux-aarch64.txt
@@ -14,11 +14,9 @@ target_include_directories(restricted-boost-type_index INTERFACE
 target_link_libraries(restricted-boost-type_index INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-smart_ptr
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/type_index/CMakeLists.linux.txt b/contrib/restricted/boost/type_index/CMakeLists.linux.txt
index f407007ea4..8b78d2fc07 100644
--- a/contrib/restricted/boost/type_index/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_index/CMakeLists.linux.txt
@@ -14,11 +14,9 @@ target_include_directories(restricted-boost-type_index INTERFACE
 target_link_libraries(restricted-boost-type_index INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-smart_ptr
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt b/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
index 866fb09468..6c791f8970 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.darwin.txt
@@ -13,8 +13,6 @@ target_include_directories(restricted-boost-type_traits INTERFACE
 )
 target_link_libraries(restricted-boost-type_traits INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-core
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/type_traits/CMakeLists.linux-aarch64.txt
index 1bdfc68435..d6704deae9 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.linux-aarch64.txt
@@ -14,8 +14,6 @@ target_include_directories(restricted-boost-type_traits INTERFACE
 target_link_libraries(restricted-boost-type_traits INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-core
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt b/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
index 1bdfc68435..d6704deae9 100644
--- a/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/type_traits/CMakeLists.linux.txt
@@ -14,8 +14,6 @@ target_include_directories(restricted-boost-type_traits INTERFACE
 target_link_libraries(restricted-boost-type_traits INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-core
   restricted-boost-static_assert
 )
diff --git a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt b/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
index be47c6b449..909cef05f9 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.darwin.txt
@@ -13,10 +13,7 @@ target_include_directories(restricted-boost-typeof INTERFACE
 )
 target_link_libraries(restricted-boost-typeof INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-type_traits
 )
diff --git a/contrib/restricted/boost/typeof/CMakeLists.linux-aarch64.txt b/contrib/restricted/boost/typeof/CMakeLists.linux-aarch64.txt
index e9bb20051b..544ed14c25 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.linux-aarch64.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.linux-aarch64.txt
@@ -14,10 +14,7 @@ target_include_directories(restricted-boost-typeof INTERFACE
 target_link_libraries(restricted-boost-typeof INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-type_traits
 )
diff --git a/contrib/restricted/boost/typeof/CMakeLists.linux.txt b/contrib/restricted/boost/typeof/CMakeLists.linux.txt
index e9bb20051b..544ed14c25 100644
--- a/contrib/restricted/boost/typeof/CMakeLists.linux.txt
+++ b/contrib/restricted/boost/typeof/CMakeLists.linux.txt
@@ -14,10 +14,7 @@ target_include_directories(restricted-boost-typeof INTERFACE
 target_link_libraries(restricted-boost-typeof INTERFACE
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
-  restricted-boost-core
-  restricted-boost-mpl
   restricted-boost-preprocessor
   restricted-boost-type_traits
 )