diff --git a/boost/multiprecision/uintwide_t_backend.hpp b/boost/multiprecision/uintwide_t_backend.hpp
index 84fd5e1..f229cff 100644
--- a/boost/multiprecision/uintwide_t_backend.hpp
+++ b/boost/multiprecision/uintwide_t_backend.hpp
@@ -47,7 +47,7 @@
   #endif
 
   #if (BOOST_VERSION < 108000)
-  #if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+  #if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
   #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wdeprecated-copy"
   #endif
@@ -1061,7 +1061,7 @@
   } // namespace std
 
   #if (BOOST_VERSION < 108000)
-  #if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+  #if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
   #pragma GCC diagnostic pop
   #endif
   #endif
diff --git a/examples/example008a_miller_rabin_prime.cpp b/examples/example008a_miller_rabin_prime.cpp
index cace64a..0dcb8fe 100644
--- a/examples/example008a_miller_rabin_prime.cpp
+++ b/examples/example008a_miller_rabin_prime.cpp
@@ -49,7 +49,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -207,7 +207,7 @@ auto main() -> int // NOLINT(bugprone-exception-escape)
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/math/wide_integer/uintwide_t.h b/math/wide_integer/uintwide_t.h
index 31185ae..d601956 100644
--- a/math/wide_integer/uintwide_t.h
+++ b/math/wide_integer/uintwide_t.h
@@ -50,6 +50,7 @@
   #include <string>
   #endif
   #include <type_traits>
+  #include <utility>
 
   #if (defined(__clang__) && (__clang_major__ <= 9))
   #define WIDE_INTEGER_NUM_LIMITS_CLASS_TYPE struct // NOLINT(cppcoreguidelines-macro-usage)
@@ -995,10 +996,10 @@
       {
         const size_type my_count = min_unsafe(lhs.size(), rhs.size());
 
-        b_result= std::lexicographical_compare(lhs.cbegin(),
-                                               lhs.cbegin() + my_count,
-                                               rhs.cbegin(),
-                                               rhs.cbegin() + my_count);
+        b_result = lexicographical_compare_unsafe(lhs.cbegin(),
+                                                  lhs.cbegin() + my_count,
+                                                  rhs.cbegin(),
+                                                  rhs.cbegin() + my_count);
       }
     }
 
diff --git a/test/test_uintwide_t_boost_backend.cpp b/test/test_uintwide_t_boost_backend.cpp
index 2bd34eb..8bf0c56 100644
--- a/test/test_uintwide_t_boost_backend.cpp
+++ b/test/test_uintwide_t_boost_backend.cpp
@@ -47,7 +47,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -136,7 +136,7 @@ auto ::math::wide_integer::test_uintwide_t_boost_backend() -> bool
 }
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/test/test_uintwide_t_boost_backend_via_test_arithmetic.cpp b/test/test_uintwide_t_boost_backend_via_test_arithmetic.cpp
index 1a7650c..e928ff6 100644
--- a/test/test_uintwide_t_boost_backend_via_test_arithmetic.cpp
+++ b/test/test_uintwide_t_boost_backend_via_test_arithmetic.cpp
@@ -35,7 +35,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -78,7 +78,7 @@ auto main() -> int
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/test/test_uintwide_t_edge_cases.cpp b/test/test_uintwide_t_edge_cases.cpp
index fcdd98b..4c8180b 100644
--- a/test/test_uintwide_t_edge_cases.cpp
+++ b/test/test_uintwide_t_edge_cases.cpp
@@ -56,7 +56,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -2624,7 +2624,7 @@ auto local_inf_ld() -> long double { return std::numeric_limits<long double>::in
 // LCOV_EXCL_STOP
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/test/test_uintwide_t_float_convert.cpp b/test/test_uintwide_t_float_convert.cpp
index 1d0db7a..4dc87da 100644
--- a/test/test_uintwide_t_float_convert.cpp
+++ b/test/test_uintwide_t_float_convert.cpp
@@ -51,7 +51,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -327,7 +327,7 @@ auto ::math::wide_integer::test_uintwide_t_float_convert() -> bool
 }
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/test/test_uintwide_t_int_convert.cpp b/test/test_uintwide_t_int_convert.cpp
index 65a4f0a..d777538 100644
--- a/test/test_uintwide_t_int_convert.cpp
+++ b/test/test_uintwide_t_int_convert.cpp
@@ -51,7 +51,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -210,7 +210,7 @@ auto ::math::wide_integer::test_uintwide_t_int_convert() -> bool
 }
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/test/test_uintwide_t_n_base.h b/test/test_uintwide_t_n_base.h
index 515ea8a..01662ab 100644
--- a/test/test_uintwide_t_n_base.h
+++ b/test/test_uintwide_t_n_base.h
@@ -45,7 +45,7 @@
   #endif
 
   #if (BOOST_VERSION < 108000)
-  #if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+  #if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
   #pragma GCC diagnostic push
   #pragma GCC diagnostic ignored "-Wdeprecated-copy"
   #endif
@@ -156,7 +156,7 @@
   };
 
   #if (BOOST_VERSION < 108000)
-  #if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+  #if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
   #pragma GCC diagnostic pop
   #endif
   #endif
diff --git a/test/test_uintwide_t_n_binary_ops_base.cpp b/test/test_uintwide_t_n_binary_ops_base.cpp
index b13df0c..7559818 100644
--- a/test/test_uintwide_t_n_binary_ops_base.cpp
+++ b/test/test_uintwide_t_n_binary_ops_base.cpp
@@ -47,7 +47,7 @@
 #endif
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-copy"
 #endif
@@ -70,7 +70,7 @@ auto test_uintwide_t_n_binary_ops_base::my_gen() -> test_uintwide_t_n_binary_ops
 }
 
 #if (BOOST_VERSION < 108000)
-#if (defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__)
+#if ((defined(__clang__) && (__clang_major__ > 9)) && !defined(__APPLE__))
 #pragma GCC diagnostic pop
 #endif
 #endif
diff --git a/wide_integer.vcxproj b/wide_integer.vcxproj
index e4c741f..a8b5f7a 100644
--- a/wide_integer.vcxproj
+++ b/wide_integer.vcxproj
@@ -72,19 +72,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);C:\boost\boost_1_83_0;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);C:\boost\boost_1_85_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);C:\boost\boost_1_84_0;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);C:\boost\boost_1_85_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);C:\boost\boost_1_83_0;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);C:\boost\boost_1_85_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);C:\boost\boost_1_84_0;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);C:\boost\boost_1_85_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>