diff --git a/upstream_utils/json_patches/0004-Add-llvm-stream-support.patch b/upstream_utils/json_patches/0004-Add-llvm-stream-support.patch
index 6ed2e4749b..2a1066d532 100644
--- a/upstream_utils/json_patches/0004-Add-llvm-stream-support.patch
+++ b/upstream_utils/json_patches/0004-Add-llvm-stream-support.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 4/5] Add llvm stream support
  3 files changed, 59 insertions(+), 2 deletions(-)
 
 diff --git a/include/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp
-index 626f7c0c85e35ec51a90baa3bdd12cd8df7ba957..ecb2165d5e5ecc80b123cd60570f499f7a4e0ed1 100644
+index 626f7c0c85e35ec51a90baa3bdd12cd8df7ba957..2e2e92f9718ec13aaa585955707419f27b2088c6 100644
 --- a/include/nlohmann/detail/output/output_adapters.hpp
 +++ b/include/nlohmann/detail/output/output_adapters.hpp
 @@ -22,6 +22,8 @@
diff --git a/upstream_utils/llvm_patches/0015-Fixup-includes.patch b/upstream_utils/llvm_patches/0015-Fixup-includes.patch
index 4a0fd2a458..f5de1a4df6 100644
--- a/upstream_utils/llvm_patches/0015-Fixup-includes.patch
+++ b/upstream_utils/llvm_patches/0015-Fixup-includes.patch
@@ -67,7 +67,7 @@ index 4de36d969b3776b72ff85888355b64f7f3262ccc..e813fd3faa9f76148f9802c4b7308e51
  #include <ntstatus.h>
  #include <winerror.h>
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index a74b6b00d616828a8e5ab25c1fd15f2528b4d76d..a59603f9f2518428ae331e339dca2562de1ac4ff 100644
+index a74b6b00d616828a8e5ab25c1fd15f2528b4d76d..d8f0c5c7f0f4d5e468b30d53dc6eb8d777a0da9f 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
 @@ -15,6 +15,8 @@
diff --git a/upstream_utils/llvm_patches/0017-Windows-support.patch b/upstream_utils/llvm_patches/0017-Windows-support.patch
index 7d9a7d2623..d5f1ff36e5 100644
--- a/upstream_utils/llvm_patches/0017-Windows-support.patch
+++ b/upstream_utils/llvm_patches/0017-Windows-support.patch
@@ -91,7 +91,7 @@ index 83d5586ae8a77ec585e7e59df3075ca59cfb9d0c..395965bc6fc969ed9a2d92743a0010dd
  } // end namespace llvm.
  
 diff --git a/llvm/lib/Support/ConvertUTF.cpp b/llvm/lib/Support/ConvertUTF.cpp
-index bc04c5ab5113563fb82d7b3b168985369b611f4b..14fb61ff3465f08a931981f560ea5b176ca888b8 100644
+index bc04c5ab5113563fb82d7b3b168985369b611f4b..15e9a4e5b4cba5802c053e22e0536b0820615dd2 100644
 --- a/llvm/lib/Support/ConvertUTF.cpp
 +++ b/llvm/lib/Support/ConvertUTF.cpp
 @@ -67,6 +67,11 @@
@@ -204,7 +204,7 @@ index bc04c5ab5113563fb82d7b3b168985369b611f4b..14fb61ff3465f08a931981f560ea5b17
  
  ConvertUTF_RESTORE_WARNINGS
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index a59603f9f2518428ae331e339dca2562de1ac4ff..585f45d9eedc2d900886988010738dc390acbf90 100644
+index d8f0c5c7f0f4d5e468b30d53dc6eb8d777a0da9f..a1b40ae78da9fed4bb9d489f298c7adc9cf437b9 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
 @@ -524,7 +524,6 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
diff --git a/upstream_utils/llvm_patches/0021-Remove-unused-functions.patch b/upstream_utils/llvm_patches/0021-Remove-unused-functions.patch
index 099a7448c0..48f0b1811d 100644
--- a/upstream_utils/llvm_patches/0021-Remove-unused-functions.patch
+++ b/upstream_utils/llvm_patches/0021-Remove-unused-functions.patch
@@ -75,7 +75,7 @@ index 2f160c45b47cf57bb28f6393dd56cde06089639b..9ef6f7da66c66a35b1ce63e603e8590c
  
  #define WIN32_NO_STATUS
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 585f45d9eedc2d900886988010738dc390acbf90..841a30962da17fc3d7bd18e14b44993900b3f984 100644
+index a1b40ae78da9fed4bb9d489f298c7adc9cf437b9..3333890ed1b086c94cdfce8bc9efb3d191a47f89 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
 @@ -168,16 +168,6 @@ raw_ostream &raw_ostream::write_escaped(std::string_view Str,
diff --git a/upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch b/upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch
index 54cee1a5bd..709493e04b 100644
--- a/upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch
+++ b/upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch
@@ -9,7 +9,7 @@ See #1401
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 841a30962da17fc3d7bd18e14b44993900b3f984..7a838a544a3ee5919cc48f806bceeaa3c1cec0de 100644
+index 3333890ed1b086c94cdfce8bc9efb3d191a47f89..7561f818287d208c628a126c3f8a6f7d531df236 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
 @@ -608,9 +608,9 @@ raw_fd_ostream &llvm::outs() {
diff --git a/upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch b/upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch
index 3b73ba1832..31d0bf06a5 100644
--- a/upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch
+++ b/upstream_utils/llvm_patches/0031-raw_ostream-Replace-errnoAsErrorCode.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 31/36] raw_ostream: Replace errnoAsErrorCode()
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 7a838a544a3ee5919cc48f806bceeaa3c1cec0de..4b76e51dd3c3dcb050a8dc2e5d88f4575acd51b5 100644
+index 7561f818287d208c628a126c3f8a6f7d531df236..816242fa1139d66467435a4b1acbfa93f799c00f 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
 @@ -523,7 +523,7 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
diff --git a/upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch b/upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch
index dd681b6006..7497968116 100644
--- a/upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch
+++ b/upstream_utils/llvm_patches/0033-Remove-auto-conversion-from-raw_ostream.patch
@@ -8,11 +8,11 @@ Subject: [PATCH 33/36] Remove auto-conversion from raw_ostream
  1 file changed, 1 insertion(+), 10 deletions(-)
 
 diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
-index 4b76e51dd3c3dcb050a8dc2e5d88f4575acd51b5..e8536a0d98c78ab2bbf400418b37f5dd4b8a8c42 100644
+index 816242fa1139d66467435a4b1acbfa93f799c00f..40da41028c75f4906b76e85b36ca546494d5bd12 100644
 --- a/llvm/lib/Support/raw_ostream.cpp
 +++ b/llvm/lib/Support/raw_ostream.cpp
 @@ -19,7 +19,6 @@
- #include "wpi/util/SmallVector.h"
+ #include "wpi/util/SmallVector.hpp"
  #include "llvm/ADT/StringExtras.h"
  #include "llvm/Config/config.h"
 -#include "llvm/Support/AutoConvert.h"
diff --git a/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch b/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch
index 5d8e9e80d3..03d9cd5f70 100644
--- a/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch
+++ b/upstream_utils/sleipnir_patches/0003-Use-wpi-byteswap.patch
@@ -19,7 +19,7 @@ index 4f4c76204071f90bf49eddb8c2aceb583b5e09ba..03938557c2600a7a1f72c6b93c935602
 +  ^wpi/
  }
 diff --git a/include/sleipnir/util/spy.hpp b/include/sleipnir/util/spy.hpp
-index a2f94803e3744cee771669210d1af883160e9896..74dd7990b03783ce805a186920d5142caeb178c6 100644
+index a2f94803e3744cee771669210d1af883160e9896..43dcc748b679eac89986b154b26a1c0282345d82 100644
 --- a/include/sleipnir/util/spy.hpp
 +++ b/include/sleipnir/util/spy.hpp
 @@ -12,6 +12,7 @@
diff --git a/wpimath/src/main/native/thirdparty/sleipnir/include/gch/small_vector.hpp b/wpimath/src/main/native/thirdparty/sleipnir/include/gch/small_vector.hpp
index 9e2329d228..25f6710e9f 100644
--- a/wpimath/src/main/native/thirdparty/sleipnir/include/gch/small_vector.hpp
+++ b/wpimath/src/main/native/thirdparty/sleipnir/include/gch/small_vector.hpp
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "wpi/util/SmallVector.hpp"
+#include <wpi/util/SmallVector.hpp>
 
 namespace gch {
 
diff --git a/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/spy.hpp b/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/spy.hpp
index 18494cdab2..43dcc748b6 100644
--- a/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/spy.hpp
+++ b/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/spy.hpp
@@ -12,7 +12,7 @@
 #include <string_view>
 
 #include <Eigen/SparseCore>
-#include "wpi/util/bit.hpp"
+#include <wpi/util/bit.hpp>
 
 #include "sleipnir/util/symbol_exports.hpp"
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp
index 1564ebbe0e..6160cceb05 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/adl_serializer.hpp
@@ -10,10 +10,10 @@
 
 #include <utility>
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/conversions/from_json.hpp"
-#include "wpi/util/detail/conversions/to_json.hpp"
-#include "wpi/util/detail/meta/identity_tag.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/conversions/from_json.hpp>
+#include <wpi/util/detail/conversions/to_json.hpp>
+#include <wpi/util/detail/meta/identity_tag.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp
index b72bae5fb2..fe58f50e93 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/byte_container_with_subtype.hpp
@@ -12,7 +12,7 @@
 #include <tuple> // tie
 #include <utility> // move
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp
index 3492f32335..66afac08bc 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/from_json.hpp
@@ -20,14 +20,14 @@
 #include <utility> // pair, declval
 #include <valarray> // valarray
 
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/identity_tag.hpp"
-#include "wpi/util/detail/meta/std_fs.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/string_concat.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/identity_tag.hpp>
+#include <wpi/util/detail/meta/std_fs.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/string_concat.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp
index 30a02674f1..4347bb32b4 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_chars.hpp
@@ -16,7 +16,7 @@
 #include <limits> // numeric_limits
 #include <type_traits> // conditional
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp
index 1cf5b6e424..9dbca5493d 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/conversions/to_json.hpp
@@ -17,12 +17,12 @@
 #include <valarray> // valarray
 #include <vector> // vector
 
-#include "wpi/util/detail/iterators/iteration_proxy.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/std_fs.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/iterators/iteration_proxy.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/std_fs.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp
index 76052341d8..6c29730bd4 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/exceptions.hpp
@@ -17,13 +17,13 @@
 #include <string> // to_string
 #include <vector> // vector
 
-#include "wpi/util/detail/value_t.hpp"
-#include "wpi/util/detail/string_escape.hpp"
-#include "wpi/util/detail/input/position_t.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/string_concat.hpp"
+#include <wpi/util/detail/value_t.hpp>
+#include <wpi/util/detail/string_escape.hpp>
+#include <wpi/util/detail/input/position_t.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/string_concat.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp
index ed014b31fe..ab4dd5c52b 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/hash.hpp
@@ -12,8 +12,8 @@
 #include <cstddef> // size_t
 #include <functional> // hash
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp
index 3fdfb52dc1..a66b9224ef 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/binary_reader.hpp
@@ -21,15 +21,15 @@
 #include <utility> // make_pair, move
 #include <vector> // vector
 
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/input/input_adapters.hpp"
-#include "wpi/util/detail/input/json_sax.hpp"
-#include "wpi/util/detail/input/lexer.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/is_sax.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/string_concat.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/input/input_adapters.hpp>
+#include <wpi/util/detail/input/json_sax.hpp>
+#include <wpi/util/detail/input/lexer.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/is_sax.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/string_concat.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp
index 88078b8b70..a0caac3dca 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/input_adapters.hpp
@@ -23,9 +23,9 @@
     #include <istream>  // istream
 #endif                  // JSON_NO_IO
 
-#include "wpi/util/detail/iterators/iterator_traits.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
+#include <wpi/util/detail/iterators/iterator_traits.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp
index e754e8ee19..4885362393 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/json_sax.hpp
@@ -13,9 +13,9 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/string_concat.hpp"
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/string_concat.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp
index 6ca401bd7f..133939840a 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/lexer.hpp
@@ -18,10 +18,10 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include "wpi/util/detail/input/input_adapters.hpp"
-#include "wpi/util/detail/input/position_t.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
+#include <wpi/util/detail/input/input_adapters.hpp>
+#include <wpi/util/detail/input/position_t.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp
index 8afa99db02..edaf75db2a 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/parser.hpp
@@ -15,14 +15,14 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/input/input_adapters.hpp"
-#include "wpi/util/detail/input/json_sax.hpp"
-#include "wpi/util/detail/input/lexer.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/is_sax.hpp"
-#include "wpi/util/detail/string_concat.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/input/input_adapters.hpp>
+#include <wpi/util/detail/input/json_sax.hpp>
+#include <wpi/util/detail/input/lexer.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/is_sax.hpp>
+#include <wpi/util/detail/string_concat.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp
index f994bb5275..f765aa4aa7 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/input/position_t.hpp
@@ -10,7 +10,7 @@
 
 #include <cstddef> // size_t
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp
index dbe25c8130..96a2631b1f 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/internal_iterator.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/iterators/primitive_iterator.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/iterators/primitive_iterator.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp
index 035c63df4a..c49a87533e 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iter_impl.hpp
@@ -11,13 +11,13 @@
 #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
 #include <type_traits> // conditional, is_const, remove_const
 
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/iterators/internal_iterator.hpp"
-#include "wpi/util/detail/iterators/primitive_iterator.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/iterators/internal_iterator.hpp>
+#include <wpi/util/detail/iterators/primitive_iterator.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp
index b44a83f467..1898a3ed13 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iteration_proxy.hpp
@@ -18,9 +18,9 @@
     #include <ranges> // enable_borrowed_range
 #endif
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp
index b67df89eb5..8a4928818d 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/iterator_traits.hpp
@@ -10,9 +10,9 @@
 
 #include <iterator> // random_access_iterator_tag
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/meta/void_t.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/meta/void_t.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp
index 106c28b01f..67ff3475d4 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/json_reverse_iterator.hpp
@@ -12,7 +12,7 @@
 #include <iterator> // reverse_iterator
 #include <utility> // declval
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp
index c0181a610b..89bcfb9812 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/iterators/primitive_iterator.hpp
@@ -11,7 +11,7 @@
 #include <cstddef> // ptrdiff_t
 #include <limits>  // numeric_limits
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp
index c5a63b2fdc..e9ffb7f05b 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_custom_base_class.hpp
@@ -10,7 +10,7 @@
 
 #include <type_traits> // conditional, is_same
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp
index 0a1c45d3c2..914b752974 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_pointer.hpp
@@ -21,11 +21,11 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/string_concat.hpp"
-#include "wpi/util/detail/string_escape.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/string_concat.hpp>
+#include <wpi/util/detail/string_escape.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp
index e2c4a28b8d..2b52f9e0d4 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/json_ref.hpp
@@ -11,8 +11,8 @@
 #include <initializer_list>
 #include <utility>
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp
index 9b5eeb4747..924dc8bcdb 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_scope.hpp
@@ -9,13 +9,13 @@
 #pragma once
 
 #include <utility> // declval, pair
-#include "wpi/util/detail/meta/detected.hpp"
-#include "wpi/util/thirdparty/hedley/hedley.hpp"
+#include <wpi/util/detail/meta/detected.hpp>
+#include <wpi/util/thirdparty/hedley/hedley.hpp>
 
 // This file contains all internal macro definitions (except those affecting ABI)
 // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 // exclude unsupported compilers
 #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp
index f7fcc189f2..b3443ac80b 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/macro_unscope.hpp
@@ -42,4 +42,4 @@
     #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
 #endif
 
-#include "wpi/util/thirdparty/hedley/hedley_undef.hpp"
+#include <wpi/util/thirdparty/hedley/hedley_undef.hpp>
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp
index 542702ea95..496d4f3e37 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/begin.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp
index 60bdf1c4cd..96af913eae 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/call_std/end.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp
index 1619b1a116..b57d60ca9e 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/cpp_future.hpp
@@ -14,7 +14,7 @@
 #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
 #include <utility> // index_sequence, make_index_sequence, index_sequence_for
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp
index eefba15af3..83131c769c 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/detected.hpp
@@ -10,7 +10,7 @@
 
 #include <type_traits>
 
-#include "wpi/util/detail/meta/void_t.hpp"
+#include <wpi/util/detail/meta/void_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp
index d50f6dbac0..c283212d33 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/identity_tag.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp
index ec1dfe8b01..ec9f6c34c7 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/is_sax.hpp
@@ -12,9 +12,9 @@
 #include <utility> // declval
 #include <string> // string
 
-#include "wpi/util/detail/abi_macros.hpp"
-#include "wpi/util/detail/meta/detected.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
+#include <wpi/util/detail/meta/detected.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp
index 86fc457379..f5f25d7e84 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/std_fs.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
 #if JSON_HAS_EXPERIMENTAL_FILESYSTEM
 #include <experimental/filesystem>
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp
index 2218a45644..d98f445f5a 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/type_traits.hpp
@@ -14,13 +14,13 @@
 #include <tuple> // tuple
 #include <string> // char_traits
 
-#include "wpi/util/detail/iterators/iterator_traits.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/call_std/begin.hpp"
-#include "wpi/util/detail/meta/call_std/end.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/detected.hpp"
-#include "wpi/util/json_fwd.hpp"
+#include <wpi/util/detail/iterators/iterator_traits.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/call_std/begin.hpp>
+#include <wpi/util/detail/meta/call_std/end.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/detected.hpp>
+#include <wpi/util/json_fwd.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 /*!
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp
index eab70012b1..47d8ac95e5 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/meta/void_t.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp
index 8a9b687404..db68b085ee 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/binary_writer.hpp
@@ -19,10 +19,10 @@
 #include <utility> // move
 #include <vector> // vector
 
-#include "wpi/util/detail/input/binary_reader.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/output/output_adapters.hpp"
-#include "wpi/util/detail/string_concat.hpp"
+#include <wpi/util/detail/input/binary_reader.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/output/output_adapters.hpp>
+#include <wpi/util/detail/string_concat.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp
index 25e242054c..b904866b2a 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/output_adapters.hpp
@@ -20,9 +20,9 @@
     #include <ostream>  // basic_ostream
 #endif  // JSON_NO_IO
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 
-#include "wpi/util/raw_ostream.hpp"
+#include <wpi/util/raw_ostream.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp
index 1b1394879a..f466467cdb 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/output/serializer.hpp
@@ -22,14 +22,14 @@
 #include <type_traits> // is_same
 #include <utility> // move
 
-#include "wpi/util/detail/conversions/to_chars.hpp"
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/output/binary_writer.hpp"
-#include "wpi/util/detail/output/output_adapters.hpp"
-#include "wpi/util/detail/string_concat.hpp"
-#include "wpi/util/detail/value_t.hpp"
+#include <wpi/util/detail/conversions/to_chars.hpp>
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/output/binary_writer.hpp>
+#include <wpi/util/detail/output/output_adapters.hpp>
+#include <wpi/util/detail/string_concat.hpp>
+#include <wpi/util/detail/value_t.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp
index 19241cb315..ec6ad1fb45 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_concat.hpp
@@ -12,8 +12,8 @@
 #include <string> // string
 #include <utility> // forward
 
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/detected.hpp"
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/detected.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp
index 54b10207a9..479bbbd1e6 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/string_escape.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 namespace detail
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp
index 971f9e9bf2..6d649e3c2d 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/detail/value_t.hpp
@@ -13,7 +13,7 @@
 #include <cstdint> // uint8_t
 #include <string> // string
 
-#include "wpi/util/detail/macro_scope.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
 #if JSON_HAS_THREE_WAY_COMPARISON
     #include <compare> // partial_ordering
 #endif
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp
index c486ed3cdb..40ef8f2105 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json.hpp
@@ -31,35 +31,35 @@
 #include <utility> // declval, forward, move, pair, swap
 #include <vector> // vector
 
-#include "wpi/util/adl_serializer.hpp"
-#include "wpi/util/byte_container_with_subtype.hpp"
-#include "wpi/util/detail/conversions/from_json.hpp"
-#include "wpi/util/detail/conversions/to_json.hpp"
-#include "wpi/util/detail/exceptions.hpp"
-#include "wpi/util/detail/hash.hpp"
-#include "wpi/util/detail/input/binary_reader.hpp"
-#include "wpi/util/detail/input/input_adapters.hpp"
-#include "wpi/util/detail/input/lexer.hpp"
-#include "wpi/util/detail/input/parser.hpp"
-#include "wpi/util/detail/iterators/internal_iterator.hpp"
-#include "wpi/util/detail/iterators/iter_impl.hpp"
-#include "wpi/util/detail/iterators/iteration_proxy.hpp"
-#include "wpi/util/detail/iterators/json_reverse_iterator.hpp"
-#include "wpi/util/detail/iterators/primitive_iterator.hpp"
-#include "wpi/util/detail/json_custom_base_class.hpp"
-#include "wpi/util/detail/json_pointer.hpp"
-#include "wpi/util/detail/json_ref.hpp"
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/string_concat.hpp"
-#include "wpi/util/detail/string_escape.hpp"
-#include "wpi/util/detail/meta/cpp_future.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
-#include "wpi/util/detail/output/binary_writer.hpp"
-#include "wpi/util/detail/output/output_adapters.hpp"
-#include "wpi/util/detail/output/serializer.hpp"
-#include "wpi/util/detail/value_t.hpp"
-#include "wpi/util/json_fwd.hpp"
-#include "wpi/util/ordered_map.hpp"
+#include <wpi/util/adl_serializer.hpp>
+#include <wpi/util/byte_container_with_subtype.hpp>
+#include <wpi/util/detail/conversions/from_json.hpp>
+#include <wpi/util/detail/conversions/to_json.hpp>
+#include <wpi/util/detail/exceptions.hpp>
+#include <wpi/util/detail/hash.hpp>
+#include <wpi/util/detail/input/binary_reader.hpp>
+#include <wpi/util/detail/input/input_adapters.hpp>
+#include <wpi/util/detail/input/lexer.hpp>
+#include <wpi/util/detail/input/parser.hpp>
+#include <wpi/util/detail/iterators/internal_iterator.hpp>
+#include <wpi/util/detail/iterators/iter_impl.hpp>
+#include <wpi/util/detail/iterators/iteration_proxy.hpp>
+#include <wpi/util/detail/iterators/json_reverse_iterator.hpp>
+#include <wpi/util/detail/iterators/primitive_iterator.hpp>
+#include <wpi/util/detail/json_custom_base_class.hpp>
+#include <wpi/util/detail/json_pointer.hpp>
+#include <wpi/util/detail/json_ref.hpp>
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/string_concat.hpp>
+#include <wpi/util/detail/string_escape.hpp>
+#include <wpi/util/detail/meta/cpp_future.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
+#include <wpi/util/detail/output/binary_writer.hpp>
+#include <wpi/util/detail/output/output_adapters.hpp>
+#include <wpi/util/detail/output/serializer.hpp>
+#include <wpi/util/detail/value_t.hpp>
+#include <wpi/util/json_fwd.hpp>
+#include <wpi/util/ordered_map.hpp>
 
 #if defined(JSON_HAS_CPP_17)
     #if JSON_HAS_STATIC_RTTI
@@ -5257,6 +5257,6 @@ inline void swap(wpi::WPI_BASIC_JSON_TPL& j1, wpi::WPI_BASIC_JSON_TPL& j2) noexc
     #endif
 #endif
 
-#include "wpi/util/detail/macro_unscope.hpp"
+#include <wpi/util/detail/macro_unscope.hpp>
 
 #endif  // INCLUDE_WPI_JSON_HPP_
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp
index 23ff736628..e89bd74585 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/json_fwd.hpp
@@ -15,7 +15,7 @@
 #include <string> // string
 #include <vector> // vector
 
-#include "wpi/util/detail/abi_macros.hpp"
+#include <wpi/util/detail/abi_macros.hpp>
 
 /*!
 @brief namespace for Niels Lohmann
diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp
index 190a929228..a3462bcea0 100644
--- a/wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp
+++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/util/ordered_map.hpp
@@ -17,8 +17,8 @@
 #include <utility> // pair
 #include <vector> // vector
 
-#include "wpi/util/detail/macro_scope.hpp"
-#include "wpi/util/detail/meta/type_traits.hpp"
+#include <wpi/util/detail/macro_scope.hpp>
+#include <wpi/util/detail/meta/type_traits.hpp>
 
 WPI_JSON_NAMESPACE_BEGIN
 
diff --git a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp
index e50f614eed..282b81efa3 100644
--- a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp
+++ b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp
@@ -69,7 +69,7 @@
 
 #ifdef _WIN32
 #include "wpi/util/WindowsError.hpp"
-#include "Windows/WindowsSupport.h"
+#include "Windows/WindowsSupport.hpp"
 #endif
 
 /*
diff --git a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp
index 9618911c1f..3bd0e54104 100644
--- a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp
+++ b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp
@@ -176,7 +176,7 @@ void wpi::wpi_unreachable_internal(const char *msg, const char *file,
 #ifdef _WIN32
 
 #define WIN32_NO_STATUS
-#include "Windows/WindowsSupport.h"
+#include "Windows/WindowsSupport.hpp"
 #undef WIN32_NO_STATUS
 #include <ntstatus.h>
 #include <winerror.h>
diff --git a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp
index 598059f9f5..8214858d2e 100644
--- a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp
+++ b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp
@@ -54,7 +54,7 @@
 
 #ifdef _WIN32
 #include "wpi/util/ConvertUTF.hpp"
-#include "Windows/WindowsSupport.h"
+#include "Windows/WindowsSupport.hpp"
 #endif
 
 using namespace wpi;