diff --git a/.beman-tidy.yaml b/.beman-tidy.yaml
index 2334360a..fc3dabe3 100644
--- a/.beman-tidy.yaml
+++ b/.beman-tidy.yaml
@@ -10,3 +10,4 @@ disabled_rules:
     - readme.implements # The repository currently implementes 3 papers. TODO: Split them into separate repos.
 ignored_paths:
     - tests/beman/utf_view/framework.cpp
+    - infra/
diff --git a/.exemplar_version b/.exemplar_version
index 14f62212..dae4ed7f 100644
--- a/.exemplar_version
+++ b/.exemplar_version
@@ -1 +1 @@
-ec861600898941a5114f352f1efcba57d825b6d0
+32b69bd5846676013a204ce3c3fcbd6c074ea701
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
index 233e7336..43b7fef1 100644
--- a/.github/workflows/ci_tests.yml
+++ b/.github/workflows/ci_tests.yml
@@ -17,10 +17,10 @@ concurrency:
 
 jobs:
   beman-submodule-check:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.4
 
   preset-test:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.4
     with:
       matrix_config: >
         [
@@ -31,7 +31,7 @@ jobs:
         ]
 
   build-and-test:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.4
     with:
       matrix_config: >
         {
@@ -138,7 +138,7 @@ jobs:
         }
 
   vcpkg-ci:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.4
     with:
       port_name: beman-utf-view
       feature_combinations: |
@@ -150,4 +150,4 @@ jobs:
   create-issue-when-fault:
     needs: [preset-test, build-and-test]
     if: failure() && github.event_name == 'schedule'
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.4
diff --git a/.github/workflows/pre-commit-check.yml b/.github/workflows/pre-commit-check.yml
index d65a3ccf..85350c4d 100644
--- a/.github/workflows/pre-commit-check.yml
+++ b/.github/workflows/pre-commit-check.yml
@@ -17,4 +17,4 @@ permissions:
 
 jobs:
   pre-commit:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.4
diff --git a/.github/workflows/pre-commit-update.yml b/.github/workflows/pre-commit-update.yml
index 423f0c3a..b97b1952 100644
--- a/.github/workflows/pre-commit-update.yml
+++ b/.github/workflows/pre-commit-update.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   auto-update-pre-commit:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.4
     secrets:
       APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
       PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}
diff --git a/.github/workflows/vcpkg-release.yml b/.github/workflows/vcpkg-release.yml
index e21871ea..641ec486 100644
--- a/.github/workflows/vcpkg-release.yml
+++ b/.github/workflows/vcpkg-release.yml
@@ -6,7 +6,7 @@ on:
     types: [published]
 jobs:
   vcpkg-release:
-    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.3
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.4
     with:
       port_name: beman-utf-view
     secrets:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 85e6e331..b8f2b671 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,14 +14,14 @@ repos:
     # This brings in a portable version of clang-format.
     # See also: https://github.com/ssciwr/clang-format-wheel
   # - repo: https://github.com/pre-commit/mirrors-clang-format
-  #   rev: v22.1.5
+  #   rev: v22.1.8
   #   hooks:
   #   - id: clang-format
   #     types_or: [c++, c]
 
     # CMake linting and formatting
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
-    rev: 0.27.7
+    rev: 0.28.0
     hooks:
     - id: gersemi
       name: CMake linting
@@ -36,13 +36,13 @@ repos:
   #   - id: markdownlint
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.2
+    rev: v2.4.3
     hooks:
       - id: codespell
 
     # Beman Standard checking via beman-tidy
   - repo: https://github.com/bemanproject/beman-tidy
-    rev: v0.5.2
+    rev: v0.5.4
     hooks:
     - id: beman-tidy
       args: [".", "--verbose", "--require-all"]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 745a9680..cbd70901 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSL-1.0
 
-cmake_minimum_required(VERSION 3.30...4.3)
+cmake_minimum_required(VERSION 3.30...4.4)
 
 include(infra/cmake/enable-experimental-import-std.cmake)
 
diff --git a/CMakePresets.json b/CMakePresets.json
index bd35911e..114e9f6e 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -8,8 +8,10 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_CXX_STANDARD": "23",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "./infra/cmake/use-fetch-content.cmake"
+        "CMAKE_CXX_EXTENSIONS": false,
+        "CMAKE_CXX_STANDARD_REQUIRED": true,
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/infra/cmake/use-fetch-content.cmake"
       }
     },
     {
@@ -35,7 +37,7 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/gnu-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/gnu-toolchain.cmake"
       }
     },
     {
@@ -46,7 +48,7 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/gnu-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/gnu-toolchain.cmake"
       }
     },
     {
@@ -57,7 +59,12 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/llvm-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {
@@ -68,7 +75,12 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/llvm-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {
@@ -79,7 +91,12 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/appleclang-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
       }
     },
     {
@@ -90,7 +107,12 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/appleclang-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
       }
     },
     {
@@ -101,7 +123,12 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/msvc-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/msvc-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     },
     {
@@ -112,7 +139,12 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/msvc-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/msvc-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     }
   ],
@@ -120,7 +152,11 @@
     {
       "name": "_root-build",
       "hidden": true,
-      "jobs": 0
+      "jobs": 0,
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "gcc-debug",
diff --git a/infra/.beman_submodule b/infra/.beman_submodule
index a24c23db..26f1dbf3 100644
--- a/infra/.beman_submodule
+++ b/infra/.beman_submodule
@@ -1,3 +1,3 @@
 [beman_submodule]
 remote=https://github.com/bemanproject/infra.git
-commit_hash=d536fc285ae058cf8f5b736b5ff73d18a421b296
+commit_hash=749c5588afe37daaa290b659d439cd7cd473ad1b
diff --git a/infra/cmake/enable-experimental-import-std.cmake b/infra/cmake/enable-experimental-import-std.cmake
index 0ac96043..3c6d6887 100644
--- a/infra/cmake/enable-experimental-import-std.cmake
+++ b/infra/cmake/enable-experimental-import-std.cmake
@@ -1,194 +1,28 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-if(CMAKE_VERSION VERSION_EQUAL "3.30.0")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0")
     set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
+        "f35a9ac6-8463-4d38-8eec-5d6008153e7d"
     )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.1")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.2")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.3")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.4")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.5")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.6")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.7")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.8")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.30.9")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.0")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.1")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.10")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.11")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.12")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.2")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.3")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.4")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.5")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.6")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.7")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.8")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "3.31.9")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.0")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "a9e1cf81-9932-4810-974b-6eccaf14e457"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.1")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "a9e1cf81-9932-4810-974b-6eccaf14e457"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.2")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "a9e1cf81-9932-4810-974b-6eccaf14e457"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.3")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.4")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.5")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.6")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.0.7")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.0")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.1")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.2")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.3")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.4")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.5")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.1.6")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.2.0")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.2.1")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.2.2")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.2.3")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.2.4")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.2.5")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "d0edc3af-4c50-42ea-a356-e2862fe7a444"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.3.0")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.3.1")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.3.2")
-    set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
-        "451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
-    )
-elseif(CMAKE_VERSION VERSION_EQUAL "4.3.3")
+elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0")
     set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
         "451f2fe2-a8a2-47c3-bc32-94786d8fc91b"
     )
+elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "3.30.0")
+    if(CMAKE_VERSION VERSION_LESS "3.31.8")
+        set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+            "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
+        )
+    elseif(CMAKE_VERSION VERSION_LESS "4.0.0")
+        set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+            "d0edc3af-4c50-42ea-a356-e2862fe7a444"
+        )
+    elseif(CMAKE_VERSION VERSION_LESS "4.0.3")
+        set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+            "a9e1cf81-9932-4810-974b-6eccaf14e457"
+        )
+    elseif(CMAKE_VERSION VERSION_LESS "4.3.0")
+        set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD
+            "d0edc3af-4c50-42ea-a356-e2862fe7a444"
+        )
+    endif()
 endif()
diff --git a/infra/cmake/llvm-libc++-toolchain.cmake b/infra/cmake/llvm-libc++-toolchain.cmake
index eabf3631..aac85022 100644
--- a/infra/cmake/llvm-libc++-toolchain.cmake
+++ b/infra/cmake/llvm-libc++-toolchain.cmake
@@ -16,5 +16,8 @@
 include(${CMAKE_CURRENT_LIST_DIR}/llvm-toolchain.cmake)
 
 if(NOT CMAKE_CXX_FLAGS MATCHES "-stdlib=libc\\+\\+")
-    string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
+    string(
+        APPEND CMAKE_CXX_FLAGS
+        " -stdlib=libc++ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"
+    )
 endif()