diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68abcaa..29e013f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-24.04
-            cxx: "clang++-16"
+            cxx: "clang++-18"
             link: "dynamic"
             optimization: "debug"
             assert: "debug"
@@ -29,14 +29,14 @@ jobs:
             llvm: ""
             secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
-            cc: "clang-16"
+            cc: "clang-18"
             flags: "-Og -fPIE"
             options: "--enable-isystem"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-24.04
-            cxx: "clang++-16"
+            cxx: "clang++-18"
             link: "static"
             optimization: "size"
             assert: "ndebug"
@@ -47,7 +47,7 @@ jobs:
             llvm: ""
             secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
-            cc: "clang-16"
+            cc: "clang-18"
             flags: "-Os -fPIE"
             options: "--enable-isystem"
             packager: "apt"
@@ -296,7 +296,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-24.04
-            cxx: "clang++-16"
+            cxx: "clang++-18"
             link: "dynamic"
             optimization: "debug"
             assert: "debug"
@@ -307,14 +307,14 @@ jobs:
             llvm: ""
             secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
-            cc: "clang-16"
+            cc: "clang-18"
             flags: "-Og -fPIE"
             options: ""
             packager: "apt"
             packages: ""
 
           - os: ubuntu-24.04
-            cxx: "clang++-16"
+            cxx: "clang++-18"
             link: "static"
             optimization: "size"
             assert: "ndebug"
@@ -325,7 +325,7 @@ jobs:
             llvm: ""
             secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
-            cc: "clang-16"
+            cc: "clang-18"
             flags: "-Os -fPIE"
             options: ""
             packager: "apt"
@@ -588,7 +588,7 @@ jobs:
         include:
           - os: ubuntu-24.04
             preset: "nix-gnu-debug-shared"
-            cxx: "clang++-16"
+            cxx: "clang++-18"
             link: "dynamic"
             optimization: "debug"
             assert: "debug"
@@ -599,7 +599,7 @@ jobs:
             llvm: ""
             secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
-            cc: "clang-16"
+            cc: "clang-18"
             flags: "-Og -fPIE"
             options: ""
             packager: "apt"
@@ -607,7 +607,7 @@ jobs:
 
           - os: ubuntu-24.04
             preset: "nix-gnu-release-static"
-            cxx: "clang++-16"
+            cxx: "clang++-18"
             link: "static"
             optimization: "size"
             assert: "ndebug"
@@ -618,7 +618,7 @@ jobs:
             llvm: ""
             secp256k1: "--build-secp256k1"
             zmq: "--build-zmq"
-            cc: "clang-16"
+            cc: "clang-18"
             flags: "-Os -fPIE"
             options: ""
             packager: "apt"
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
index 58f802c..59ce698 100644
--- a/builds/msvc/vs2022/libbitcoin-system.import.props
+++ b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -49,7 +49,7 @@
       <!-- WITH_ICU always defined in Visual Studio builds. -->
       <!-- NOMINMAX enables use of std::min/max without conflict. -->
       <!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
-      <PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- Disable auto-linking for all boost-json and its dependency boost-container so they can be header only. -->
       <PreprocessorDefinitions>BOOST_JSON_NO_LIB;BOOST_CONTAINER_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>