diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index a5919bda6d..74383b95d3 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -17,21 +17,15 @@ Program               Locations
 -------               ---------
 RoboRIO Libraries     ni-libraries
 Google Test           gtest
-LLVM                  wpiutil/src/main/native/include/wpi/{various files}
-                      wpiutil/src/main/native/cpp/llvm/
-                      wpiutil/src/main/native/cpp/leb128.cpp
-                      wpiutil/src/test/native/cpp/leb128Test.cpp
-JSON for Modern C++   wpiutil/src/main/native/include/wpi/json.h
-                      wpiutil/src/main/native/cpp/json_*.cpp
+LLVM                  wpiutil/src/main/native/thirdparty/llvm
+                      wpiutil/src/test/native/cpp/llvm/
+JSON for Modern C++   wpiutil/src/main/native/thirdparty/json
                       wpiutil/src/test/native/cpp/json/
 libuv                 wpinet/src/main/native/thirdparty/libuv/
-fmtlib                wpiutil/src/main/native/fmtlib/
-sigslot               wpiutil/src/main/native/include/wpi/Signal.h
-                      wpiutil/src/test/native/cpp/sigslot/
-tcpsockets            wpiutil/src/main/native/cpp/TCP{Stream,Connector,Acceptor}.cpp
-                      wpiutil/src/main/native/include/wpi/TCP*.h
-MPack                 wpiutil/src/main/native/include/mpack.h
-                      wpiutil/src/main/native/cpp/mpack.cpp
+fmtlib                wpiutil/src/main/native/thirdparty/fmtlib/
+sigslot               wpiutil/src/main/native/thirdparty/sigslot
+tcpsockets            wpinet/src/main/native/thirdparty/tcpsockets
+MPack                 wpiutil/src/main/native/thirdparty/mpack
 Bootstrap             wpinet/src/main/native/resources/bootstrap-*
 CoreUI                wpinet/src/main/native/resources/coreui-*
 Feather Icons         wpinet/src/main/native/resources/feather-*
@@ -40,9 +34,9 @@ popper.js             wpinet/src/main/native/resources/popper-*
 units                 wpimath/src/main/native/include/units/
 Eigen                 wpimath/src/main/native/thirdparty/eigen/include/
 StackWalker           wpiutil/src/main/native/windows/StackWalker.*
-TCB span              wpiutil/src/main/native/include/wpi/span.h
+TCB span              wpiutil/src/main/native/thirdparty/include/wpi/span.h
                       wpiutil/src/test/native/cpp/span/
-GHC filesystem        wpiutil/src/main/native/include/wpi/ghc/
+GHC filesystem        wpiutil/src/main/native/thirdparty/include/wpi/ghc/
 Team 254 Library      wpilibj/src/main/java/edu/wpi/first/wpilibj/spline/SplineParameterizer.java
                       wpilibj/src/main/java/edu/wpi/first/wpilibj/trajectory/TrajectoryParameterizer.java
                       wpilibc/src/main/native/include/spline/SplineParameterizer.h
diff --git a/upstream_utils/update_llvm.py b/upstream_utils/update_llvm.py
index e759bac11c..9f117aa309 100755
--- a/upstream_utils/update_llvm.py
+++ b/upstream_utils/update_llvm.py
@@ -102,10 +102,7 @@ def find_wpiutil_llvm_files(wpiutil_root, subfolder):
         for f in files:
             if f not in ignore_list:
                 full_file = os.path.join(root, f)
-                with open(full_file, 'r') as ff:
-                    contents = ff.read()
-                    if "LLVM Compiler" in contents or "LLVM Project" in contents:
-                        wpiutil_files.append(full_file)
+                wpiutil_files.append(full_file)
 
     return wpiutil_files
 
@@ -129,8 +126,9 @@ def overwrite_source(wpiutil_root, llvm_root):
         "llvm/include/llvm/Support/", "llvm/lib/Support/"
     ])
     wpi_files = find_wpiutil_llvm_files(
-        wpiutil_root, "src/main/native/include/wpi") + find_wpiutil_llvm_files(
-            wpiutil_root, "src/main/native/cpp/llvm")
+        wpiutil_root, "src/main/native/thirdparty/llvm/include/wpi"
+    ) + find_wpiutil_llvm_files(wpiutil_root,
+                                "src/main/native/thirdparty/llvm/cpp/llvm")
 
     overwrite_files(wpi_files, llvm_files)
     run_global_replacements(wpi_files)
diff --git a/wpinet/.styleguide b/wpinet/.styleguide
index 92a2608225..ab557576b2 100644
--- a/wpinet/.styleguide
+++ b/wpinet/.styleguide
@@ -9,20 +9,15 @@ cppSrcFileInclude {
 }
 
 generatedFileExclude {
+  src/main/native/thirdparty/
+
   src/main/native/cpp/http_parser\.cpp$
   src/main/native/include/wpinet/http_parser\.h$
-  src/main/native/thirdparty/libuv/
   src/main/native/resources/
   src/main/native/linux/AvahiClient
 }
 
 licenseUpdateExclude {
-  src/main/native/cpp/TCPAcceptor\.cpp$
-  src/main/native/cpp/TCPConnector\.cpp$
-  src/main/native/cpp/TCPStream\.cpp$
-  src/main/native/include/wpinet/TCPAcceptor\.h$
-  src/main/native/include/wpinet/TCPConnector\.h$
-  src/main/native/include/wpinet/TCPStream\.h$
 }
 
 repoRootNameOverride {
diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt
index abdcd6541d..7fd19c753b 100644
--- a/wpinet/CMakeLists.txt
+++ b/wpinet/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
 
 GENERATE_RESOURCES(src/main/native/resources generated/main/cpp WPI wpi wpinet_resources_src)
 
-file(GLOB_RECURSE wpinet_native_src src/main/native/cpp/*.cpp)
+file(GLOB_RECURSE wpinet_native_src src/main/native/cpp/*.cpp src/main/native/thirdparty/tcpsockets/cpp/*.cpp)
 list(REMOVE_ITEM wpinet_native_src ${wpinet_jni_src})
 file(GLOB_RECURSE wpinet_unix_src src/main/native/unix/*.cpp)
 file(GLOB_RECURSE wpinet_linux_src src/main/native/linux/*.cpp)
@@ -167,6 +167,9 @@ endif()
 target_include_directories(wpinet PUBLIC
                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
                             $<INSTALL_INTERFACE:${include_dest}/wpinet>)
+target_include_directories(wpinet PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/tcpsockets/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpinet>)
 
 install(TARGETS wpinet EXPORT wpinet DESTINATION "${main_lib_dest}")
 install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpinet")
diff --git a/wpinet/build.gradle b/wpinet/build.gradle
index 44343776b3..9853e31c9b 100644
--- a/wpinet/build.gradle
+++ b/wpinet/build.gradle
@@ -23,6 +23,15 @@ ext {
                     srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src'
                 }
             }
+            tcpsocketsCpp(CppSourceSet) {
+                source {
+                    srcDirs 'src/main/native/thirdparty/tcpsockets/cpp'
+                    include '*.cpp'
+                }
+                exportedHeaders {
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/tcpsockets/include'
+                }
+            }
             resourcesCpp(CppSourceSet) {
                 source {
                     srcDirs "$buildDir/generated/main/cpp", "$rootDir/shared/singlelib"
@@ -201,6 +210,9 @@ cppHeadersZip {
     from('src/main/native/thirdparty/libuv/include') {
         into '/'
     }
+    from('src/main/native/third_party/tcpsockets/include') {
+        into '/'
+    }
 }
 
 model {
@@ -208,7 +220,7 @@ model {
         all {
             it.sources.each {
                 it.exportedHeaders {
-                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/libuv/src'
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/libuv/include', 'src/main/native/thirdparty/tcpsockets/include', 'src/main/native/thirdparty/libuv/src'
                 }
             }
         }
diff --git a/wpinet/src/main/native/cpp/TCPAcceptor.cpp b/wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPAcceptor.cpp
similarity index 100%
rename from wpinet/src/main/native/cpp/TCPAcceptor.cpp
rename to wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPAcceptor.cpp
diff --git a/wpinet/src/main/native/cpp/TCPConnector.cpp b/wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPConnector.cpp
similarity index 100%
rename from wpinet/src/main/native/cpp/TCPConnector.cpp
rename to wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPConnector.cpp
diff --git a/wpinet/src/main/native/cpp/TCPConnector_parallel.cpp b/wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPConnector_parallel.cpp
similarity index 100%
rename from wpinet/src/main/native/cpp/TCPConnector_parallel.cpp
rename to wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPConnector_parallel.cpp
diff --git a/wpinet/src/main/native/cpp/TCPStream.cpp b/wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPStream.cpp
similarity index 100%
rename from wpinet/src/main/native/cpp/TCPStream.cpp
rename to wpinet/src/main/native/thirdparty/tcpsockets/cpp/TCPStream.cpp
diff --git a/wpinet/src/main/native/include/wpinet/TCPAcceptor.h b/wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPAcceptor.h
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/TCPAcceptor.h
rename to wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPAcceptor.h
diff --git a/wpinet/src/main/native/include/wpinet/TCPConnector.h b/wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPConnector.h
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/TCPConnector.h
rename to wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPConnector.h
diff --git a/wpinet/src/main/native/include/wpinet/TCPStream.h b/wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPStream.h
similarity index 100%
rename from wpinet/src/main/native/include/wpinet/TCPStream.h
rename to wpinet/src/main/native/thirdparty/tcpsockets/include/wpinet/TCPStream.h
diff --git a/wpiutil/.styleguide b/wpiutil/.styleguide
index 78e24fbf0d..6e8b294ebb 100644
--- a/wpiutil/.styleguide
+++ b/wpiutil/.styleguide
@@ -11,79 +11,21 @@ cppSrcFileInclude {
 }
 
 generatedFileExclude {
-  src/main/native/cpp/llvm/
-  src/main/native/include/llvm/
-  src/main/native/include/wpi/AllocatorBase\.h$
-  src/main/native/include/wpi/AlignOf\.h$
-  src/main/native/include/wpi/ArrayRef\.h$
-  src/main/native/include/wpi/Chrono\.h$
-  src/main/native/include/wpi/Compiler\.h$
-  src/main/native/include/wpi/ConvertUTF\.h$
-  src/main/native/include/wpi/DenseMap\.h$
-  src/main/native/include/wpi/DenseMapInfo\.h$
-  src/main/native/include/wpi/DJB\.h$
-  src/main/native/include/wpi/EpochTracker\.h$
-  src/main/native/include/wpi/Endian\.h$
-  src/main/native/include/wpi/Errc\.h$
-  src/main/native/include/wpi/Errno\.h$
-  src/main/native/include/wpi/Error\.h$
-  src/main/native/include/wpi/ErrorHandling\.h$
-  src/main/native/include/wpi/ErrorOr\.h$
-  src/main/native/include/wpi/FileSystem\.h$
-  src/main/native/include/wpi/Format\.h$
-  src/main/native/include/wpi/FunctionExtras\.h$
-  src/main/native/include/wpi/Hashing\.h$
-  src/main/native/include/wpi/IntrusiveRefCntPtr\.h$
-  src/main/native/include/wpi/ManagedStatic\.h$
-  src/main/native/include/wpi/MapVector\.h$
-  src/main/native/include/wpi/MathExtras\.h$
-  src/main/native/include/wpi/MemAlloc\.h$
-  src/main/native/include/wpi/NativeFormatting\.h$
-  src/main/native/include/wpi/Path\.h$
-  src/main/native/include/wpi/PointerIntPair\.h$
-  src/main/native/include/wpi/PointerLikeTypeTraits\.h$
-  src/main/native/include/wpi/PointerUnion\.h$
-  src/main/native/include/wpi/ReverseIteration\.h$
-  src/main/native/include/wpi/STLExtras\.h$
-  src/main/native/include/wpi/Signal\.h$
-  src/main/native/include/wpi/SmallPtrSet\.h$
-  src/main/native/include/wpi/SmallSet\.h$
-  src/main/native/include/wpi/SmallString\.h$
-  src/main/native/include/wpi/SmallVector\.h$
-  src/main/native/include/wpi/StringMap\.h$
-  src/main/native/include/wpi/StringMapEntry\.h$
-  src/main/native/include/wpi/STLForwardCompat\.h$
-  src/main/native/include/wpi/StringRef\.h$
-  src/main/native/include/wpi/SwapByteOrder\.h$
-  src/main/native/include/wpi/Twine\.h$
-  src/main/native/include/wpi/VersionTuple\.h$
-  src/main/native/include/wpi/WindowsError\.h$
-  src/main/native/include/wpi/iterator\.h$
-  src/main/native/include/wpi/iterator_range\.h$
-  src/main/native/include/wpi/raw_os_ostream\.h$
-  src/main/native/include/wpi/raw_ostream\.h$
-  src/main/native/include/wpi/span\.h$
+  src/main/native/thirdparty/
+
   src/main/native/include/wpi/fs\.h$
-  src/main/native/include/wpi/mpack\.h$
   src/main/native/cpp/fs\.cpp$
-  src/main/native/cpp/mpack\.cpp$
-  src/main/native/include/wpi/ghc/
-  src/test/native/cpp/span/
-  src/main/native/include/wpi/type_traits\.h$
-  src/main/native/cpp/json
-  src/main/native/include/wpi/json
-  src/test/native/cpp/json/
-  src/main/native/fmtlib/
   src/main/native/resources/
-  src/test/native/cpp/llvm/
   src/main/native/windows/StackWalker
+  src/test/native/cpp/llvm/
+  src/test/native/cpp/span/
+  src/test/native/cpp/json/
 }
 
 licenseUpdateExclude {
   src/main/native/cpp/Base64\.cpp$
   src/main/native/cpp/sha1\.cpp$
   src/main/native/include/wpi/ConcurrentQueue\.h$
-  src/main/native/include/wpi/Path\.h$
   src/main/native/include/wpi/sha1\.h$
 }
 
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
index 5609fd0951..fadf86727b 100644
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -87,14 +87,17 @@ endif()
 
 GENERATE_RESOURCES(src/main/native/resources generated/main/cpp WPI wpi wpiutil_resources_src)
 
-file(GLOB_RECURSE wpiutil_native_src src/main/native/cpp/*.cpp)
+file(GLOB_RECURSE wpiutil_native_src src/main/native/cpp/*.cpp
+                                     src/main/native/thirdparty/json/cpp/*.cpp
+                                     src/main/native/thirdparty/llvm/cpp/*.cpp
+                                     src/main/native/thirdparty/mpack/cpp/*.cpp)
 list(REMOVE_ITEM wpiutil_native_src ${wpiutil_jni_src})
 file(GLOB_RECURSE wpiutil_unix_src src/main/native/unix/*.cpp)
 file(GLOB_RECURSE wpiutil_linux_src src/main/native/linux/*.cpp)
 file(GLOB_RECURSE wpiutil_macos_src src/main/native/macOS/*.cpp)
 file(GLOB_RECURSE wpiutil_windows_src src/main/native/windows/*.cpp)
 
-file(GLOB fmtlib_native_src src/main/native/fmtlib/src/*.cpp)
+file(GLOB fmtlib_native_src src/main/native/thirdparty/fmtlib/src/*.cpp)
 
 add_library(wpiutil ${wpiutil_native_src} ${fmtlib_native_src} ${wpiutil_resources_src})
 set_target_properties(wpiutil PROPERTIES DEBUG_POSTFIX "d")
@@ -118,7 +121,7 @@ if (NOT USE_VCPKG_FMTLIB)
     target_sources(wpiutil PRIVATE ${fmtlib_native_src})
     install(DIRECTORY src/main/native/fmtlib/include/ DESTINATION "${include_dest}/wpiutil")
     target_include_directories(wpiutil PUBLIC
-                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/fmtlib/include>
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/fmtlib/include>
                             $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
 else()
     find_package(fmt CONFIG REQUIRED)
@@ -139,6 +142,24 @@ endif()
 target_include_directories(wpiutil PUBLIC
                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
                             $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+target_include_directories(wpiutil PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/ghc/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+target_include_directories(wpiutil PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+target_include_directories(wpiutil PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+target_include_directories(wpiutil PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/mpack/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+target_include_directories(wpiutil PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/sigslot/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
+target_include_directories(wpiutil PUBLIC
+                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/tcb_span/include>
+                            $<INSTALL_INTERFACE:${include_dest}/wpiutil>)
 
 install(TARGETS wpiutil EXPORT wpiutil DESTINATION "${main_lib_dest}")
 install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpiutil")
diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
index 4960835f57..efd9183cac 100644
--- a/wpiutil/build.gradle
+++ b/wpiutil/build.gradle
@@ -17,11 +17,57 @@ ext {
         it.sources {
             fmtlibCpp(CppSourceSet) {
                 source {
-                    srcDirs 'src/main/native/fmtlib/src'
+                    srcDirs 'src/main/native/thirdparty/fmtlib/src'
                     include '*.cpp'
                 }
                 exportedHeaders {
-                    srcDirs 'src/main/native/fmtlib/include'
+                    srcDirs 'src/main/native/thirdparty/fmtlib/include'
+                }
+            }
+            ghcCpp(CppSourceSet) {
+                exportedHeaders {
+                    srcDirs 'src/main/native/thirdparty/ghc/include'
+                }
+            }
+            jsonCpp(CppSourceSet) {
+                source {
+                    srcDirs 'src/main/native/thirdparty/json/cpp'
+                    include '*.cpp'
+                }
+                exportedHeaders {
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/fmtlib/include'
+                }
+            }
+            llvmCpp(CppSourceSet) {
+                source {
+                    srcDirs 'src/main/native/thirdparty/llvm'
+                    include '**/*.cpp'
+                }
+                exportedHeaders {
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/ghc/include'
+                }
+            }
+            mpackCpp(CppSourceSet) {
+                source {
+                    srcDirs 'src/main/native/thirdparty/mpack/src'
+                    include '*.cpp'
+                }
+                exportedHeaders {
+                    srcDirs 'src/main/native/thirdparty/mpack/include'
+                }
+            }
+            sigslotCpp(CppSourceSet) {
+                source {
+                    srcDirs 'src/main/native/thirdparty/sigslot/src'
+                    include '*.cpp'
+                }
+                exportedHeaders {
+                    srcDirs 'src/main/native/thirdparty/sigslot/include'
+                }
+            }
+            tcbSpanCpp(CppSourceSet) {
+                exportedHeaders {
+                    srcDirs 'src/main/native/thirdparty/tcb_span/include'
                 }
             }
             resourcesCpp(CppSourceSet) {
@@ -43,7 +89,7 @@ ext {
                         include '**/*.cpp'
                     }
                     exportedHeaders {
-                        srcDirs 'src/main/native/include', 'src/main/native/cpp'
+                        srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/tcb_span/include'
                         include '**/*.h'
                     }
                 }
@@ -53,11 +99,11 @@ ext {
             it.sources {
                 wpiutilWindowsCpp(CppSourceSet) {
                     source {
-                        srcDirs 'src/main/native/windows'
+                        srcDirs 'src/main/native/windows', 'src/main/native/llvm/cpp/llvm', 'src/main/native/json/cpp'
                         include '**/*.cpp'
                     }
                     exportedHeaders {
-                        srcDirs 'src/main/native/include', 'src/main/native/cpp'
+                        srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include'
                         include '**/*.h'
                     }
                 }
@@ -66,11 +112,11 @@ ext {
             it.sources {
                 wpiutilmacOSCpp(CppSourceSet) {
                     source {
-                        srcDirs 'src/main/native/macOS'
+                        srcDirs 'src/main/native/macOS', 'src/main/native/llvm/cpp/llvm', 'src/main/native/json/cpp'
                         include '**/*.cpp'
                     }
                     exportedHeaders {
-                        srcDirs 'src/main/native/include', 'src/main/native/cpp'
+                        srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include'
                         include '**/*.h'
                     }
                 }
@@ -79,11 +125,11 @@ ext {
             it.sources {
                 wpiutilLinuxCpp(CppSourceSet) {
                     source {
-                        srcDirs 'src/main/native/linux'
+                        srcDirs 'src/main/native/linux', 'src/main/native/llvm/cpp/llvm', 'src/main/native/json/cpp'
                         include '**/*.cpp'
                     }
                     exportedHeaders {
-                        srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/fmtlib/include'
+                        srcDirs 'src/main/native/include', 'src/main/native/cpp', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include'
                         include '**/*.h'
                     }
                 }
@@ -123,7 +169,34 @@ nativeUtils.exportsConfigs {
 }
 
 cppHeadersZip {
-    from('src/main/native/fmtlib/include') {
+    from('src/main/native/thirdparty/fmtlib/include') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/ghc/include') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/json/include') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/llvm/include') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/mpack/include') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/sigslot/include') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/tcb_span/include') {
+        into '/'
+    }
+}
+
+cppSourcesZip {
+    from('src/main/native/thirdparty/llvm/cpp') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/json/cpp') {
         into '/'
     }
 }
@@ -133,7 +206,7 @@ model {
         all {
             it.sources.each {
                 it.exportedHeaders {
-                    srcDirs 'src/main/native/include', 'src/main/native/fmtlib/include'
+                    srcDirs 'src/main/native/include', 'src/main/native/thirdparty/fmtlib/include', 'src/main/native/thirdparty/llvm/include', 'src/main/native/thirdparty/sigslot/include', 'src/main/native/thirdparty/json/include', 'src/main/native/thirdparty/tcb_span/include', 'src/main/native/thirdparty/ghc/include'
                 }
             }
         }
diff --git a/wpiutil/src/main/native/include/wpi/ReverseIteration.h b/wpiutil/src/main/native/include/wpi/ReverseIteration.h
deleted file mode 100644
index b4fb3ff7b9..0000000000
--- a/wpiutil/src/main/native/include/wpi/ReverseIteration.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef WPI_REVERSEITERATION_H
-#define WPI_REVERSEITERATION_H
-
-#include "wpi/PointerLikeTypeTraits.h"
-
-namespace wpi {
-
-template<class T = void *>
-constexpr bool shouldReverseIterate() {
-  return false;
-}
-
-}
-
-#endif
diff --git a/wpiutil/src/main/native/include/wpi/fs.h b/wpiutil/src/main/native/include/wpi/fs.h
index fca8069d76..587a23c462 100644
--- a/wpiutil/src/main/native/include/wpi/fs.h
+++ b/wpiutil/src/main/native/include/wpi/fs.h
@@ -40,7 +40,7 @@ using fstream = std::fstream;
 #ifndef GHC_USE_STD_FS
 // #define GHC_WIN_DISABLE_WSTRING_STORAGE_TYPE
 #define GHC_FILESYSTEM_FWD
-#include "ghc/filesystem.hpp"
+#include "wpi/ghc/filesystem.hpp"
 namespace fs {
 using namespace ghc::filesystem;
 using ifstream = ghc::filesystem::ifstream;
diff --git a/wpiutil/src/main/native/include/wpi/spinlock.h b/wpiutil/src/main/native/include/wpi/spinlock.h
index 9e777fa829..7128a182ef 100644
--- a/wpiutil/src/main/native/include/wpi/spinlock.h
+++ b/wpiutil/src/main/native/include/wpi/spinlock.h
@@ -9,7 +9,7 @@
 #include <mutex>
 #include <thread>
 
-#include "Compiler.h"
+#include "wpi/Compiler.h"
 
 namespace wpi {
 
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/args.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/args.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/args.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/args.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/chrono.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/chrono.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/chrono.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/chrono.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/color.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/color.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/color.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/color.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/compile.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/compile.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/compile.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/compile.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/core.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/core.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/core.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/core.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/format-inl.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/format-inl.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/format-inl.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/format-inl.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/format.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/format.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/format.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/format.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/locale.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/locale.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/locale.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/locale.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/os.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/os.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/os.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/os.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/ostream.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/ostream.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/ostream.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/ostream.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/printf.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/printf.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/printf.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/printf.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/ranges.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/ranges.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/ranges.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/ranges.h
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/xchar.h b/wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/xchar.h
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/include/fmt/xchar.h
rename to wpiutil/src/main/native/thirdparty/fmtlib/include/fmt/xchar.h
diff --git a/wpiutil/src/main/native/fmtlib/src/format.cpp b/wpiutil/src/main/native/thirdparty/fmtlib/src/format.cpp
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/src/format.cpp
rename to wpiutil/src/main/native/thirdparty/fmtlib/src/format.cpp
diff --git a/wpiutil/src/main/native/fmtlib/src/os.cpp b/wpiutil/src/main/native/thirdparty/fmtlib/src/os.cpp
similarity index 100%
rename from wpiutil/src/main/native/fmtlib/src/os.cpp
rename to wpiutil/src/main/native/thirdparty/fmtlib/src/os.cpp
diff --git a/wpiutil/src/main/native/include/wpi/ghc/filesystem.hpp b/wpiutil/src/main/native/thirdparty/ghc/include/wpi/ghc/filesystem.hpp
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/ghc/filesystem.hpp
rename to wpiutil/src/main/native/thirdparty/ghc/include/wpi/ghc/filesystem.hpp
diff --git a/wpiutil/src/main/native/cpp/json.cpp b/wpiutil/src/main/native/thirdparty/json/cpp/json.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/json.cpp
rename to wpiutil/src/main/native/thirdparty/json/cpp/json.cpp
diff --git a/wpiutil/src/main/native/cpp/json_binary_reader.cpp b/wpiutil/src/main/native/thirdparty/json/cpp/json_binary_reader.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/json_binary_reader.cpp
rename to wpiutil/src/main/native/thirdparty/json/cpp/json_binary_reader.cpp
diff --git a/wpiutil/src/main/native/cpp/json_binary_writer.cpp b/wpiutil/src/main/native/thirdparty/json/cpp/json_binary_writer.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/json_binary_writer.cpp
rename to wpiutil/src/main/native/thirdparty/json/cpp/json_binary_writer.cpp
diff --git a/wpiutil/src/main/native/cpp/json_parser.cpp b/wpiutil/src/main/native/thirdparty/json/cpp/json_parser.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/json_parser.cpp
rename to wpiutil/src/main/native/thirdparty/json/cpp/json_parser.cpp
diff --git a/wpiutil/src/main/native/cpp/json_pointer.cpp b/wpiutil/src/main/native/thirdparty/json/cpp/json_pointer.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/json_pointer.cpp
rename to wpiutil/src/main/native/thirdparty/json/cpp/json_pointer.cpp
diff --git a/wpiutil/src/main/native/cpp/json_serializer.cpp b/wpiutil/src/main/native/thirdparty/json/cpp/json_serializer.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/json_serializer.cpp
rename to wpiutil/src/main/native/thirdparty/json/cpp/json_serializer.cpp
diff --git a/wpiutil/src/main/native/include/wpi/json.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/json.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/json.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/json.h
diff --git a/wpiutil/src/main/native/include/wpi/json_serializer.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/json_serializer.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/json_serializer.h
rename to wpiutil/src/main/native/thirdparty/json/include/wpi/json_serializer.h
diff --git a/wpiutil/src/main/native/cpp/llvm/ConvertUTF.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/ConvertUTF.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTF.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/ConvertUTFWrapper.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTFWrapper.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/ConvertUTFWrapper.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ConvertUTFWrapper.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/ErrorHandling.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ErrorHandling.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/Hashing.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Hashing.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/Hashing.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Hashing.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/ManagedStatic.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ManagedStatic.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/ManagedStatic.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/ManagedStatic.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/MemAlloc.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemAlloc.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/MemAlloc.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemAlloc.cpp
diff --git a/wpiutil/src/main/native/cpp/MemoryBuffer.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/MemoryBuffer.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/SmallPtrSet.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/SmallPtrSet.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/SmallPtrSet.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/SmallPtrSet.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/SmallVector.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/SmallVector.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/SmallVector.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/SmallVector.cpp
diff --git a/wpiutil/src/main/native/cpp/StringExtras.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/StringExtras.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/StringExtras.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/StringExtras.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/StringMap.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/StringMap.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/StringMap.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/StringMap.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/Windows/WindowsSupport.h b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/WindowsSupport.h
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/Windows/WindowsSupport.h
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/Windows/WindowsSupport.h
diff --git a/wpiutil/src/main/native/cpp/llvm/raw_os_ostream.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_os_ostream.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/raw_os_ostream.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_os_ostream.cpp
diff --git a/wpiutil/src/main/native/cpp/llvm/raw_ostream.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/llvm/raw_ostream.cpp
rename to wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/raw_ostream.cpp
diff --git a/wpiutil/src/main/native/include/wpi/AlignOf.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/AlignOf.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/AlignOf.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/AlignOf.h
diff --git a/wpiutil/src/main/native/include/wpi/AllocatorBase.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/AllocatorBase.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/AllocatorBase.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/AllocatorBase.h
diff --git a/wpiutil/src/main/native/include/wpi/Chrono.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Chrono.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Chrono.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/Chrono.h
diff --git a/wpiutil/src/main/native/include/wpi/Compiler.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Compiler.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Compiler.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/Compiler.h
diff --git a/wpiutil/src/main/native/include/wpi/ConvertUTF.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ConvertUTF.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/ConvertUTF.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/ConvertUTF.h
diff --git a/wpiutil/src/main/native/include/wpi/DJB.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DJB.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/DJB.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/DJB.h
diff --git a/wpiutil/src/main/native/include/wpi/DenseMap.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/DenseMap.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMap.h
diff --git a/wpiutil/src/main/native/include/wpi/DenseMapInfo.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMapInfo.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/DenseMapInfo.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/DenseMapInfo.h
diff --git a/wpiutil/src/main/native/include/wpi/Endian.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Endian.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Endian.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/Endian.h
diff --git a/wpiutil/src/main/native/include/wpi/EpochTracker.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/EpochTracker.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/EpochTracker.h
diff --git a/wpiutil/src/main/native/include/wpi/Errc.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errc.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Errc.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errc.h
diff --git a/wpiutil/src/main/native/include/wpi/Errno.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errno.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Errno.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/Errno.h
diff --git a/wpiutil/src/main/native/include/wpi/ErrorHandling.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ErrorHandling.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/ErrorHandling.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/ErrorHandling.h
diff --git a/wpiutil/src/main/native/include/wpi/FunctionExtras.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/FunctionExtras.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/FunctionExtras.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/FunctionExtras.h
diff --git a/wpiutil/src/main/native/include/wpi/Hashing.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/Hashing.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Hashing.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/Hashing.h
diff --git a/wpiutil/src/main/native/include/wpi/ManagedStatic.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ManagedStatic.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/ManagedStatic.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/ManagedStatic.h
diff --git a/wpiutil/src/main/native/include/wpi/MapVector.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MapVector.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/MapVector.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/MapVector.h
diff --git a/wpiutil/src/main/native/include/wpi/MathExtras.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MathExtras.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/MathExtras.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/MathExtras.h
diff --git a/wpiutil/src/main/native/include/wpi/MemAlloc.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemAlloc.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/MemAlloc.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemAlloc.h
diff --git a/wpiutil/src/main/native/include/wpi/MemoryBuffer.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemoryBuffer.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/MemoryBuffer.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/MemoryBuffer.h
diff --git a/wpiutil/src/main/native/include/wpi/PointerIntPair.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerIntPair.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/PointerIntPair.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerIntPair.h
diff --git a/wpiutil/src/main/native/include/wpi/PointerLikeTypeTraits.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerLikeTypeTraits.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/PointerLikeTypeTraits.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerLikeTypeTraits.h
diff --git a/wpiutil/src/main/native/include/wpi/PointerUnion.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerUnion.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/PointerUnion.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/PointerUnion.h
diff --git a/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ReverseIteration.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ReverseIteration.h
new file mode 100644
index 0000000000..f46d38dda4
--- /dev/null
+++ b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/ReverseIteration.h
@@ -0,0 +1,18 @@
+#ifndef WPIUTIL_WPI_REVERSEITERATION_H
+#define WPIUTIL_WPI_REVERSEITERATION_H
+
+#include "wpi/PointerLikeTypeTraits.h"
+
+namespace wpi {
+
+template<class T = void *>
+bool shouldReverseIterate() {
+#if LLVM_ENABLE_REVERSE_ITERATION
+  return detail::IsPointerLike<T>::value;
+#else
+  return false;
+#endif
+}
+
+}
+#endif
diff --git a/wpiutil/src/main/native/include/wpi/STLForwardCompat.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/STLForwardCompat.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/STLForwardCompat.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/STLForwardCompat.h
diff --git a/wpiutil/src/main/native/include/wpi/SmallPtrSet.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallPtrSet.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SmallPtrSet.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallPtrSet.h
diff --git a/wpiutil/src/main/native/include/wpi/SmallSet.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallSet.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SmallSet.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallSet.h
diff --git a/wpiutil/src/main/native/include/wpi/SmallString.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallString.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SmallString.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallString.h
diff --git a/wpiutil/src/main/native/include/wpi/SmallVector.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVector.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SmallVector.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVector.h
diff --git a/wpiutil/src/main/native/include/wpi/SmallVectorMemoryBuffer.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVectorMemoryBuffer.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SmallVectorMemoryBuffer.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/SmallVectorMemoryBuffer.h
diff --git a/wpiutil/src/main/native/include/wpi/StringExtras.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringExtras.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/StringExtras.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringExtras.h
diff --git a/wpiutil/src/main/native/include/wpi/StringMap.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringMap.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/StringMap.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringMap.h
diff --git a/wpiutil/src/main/native/include/wpi/StringMapEntry.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringMapEntry.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/StringMapEntry.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/StringMapEntry.h
diff --git a/wpiutil/src/main/native/include/wpi/SwapByteOrder.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/SwapByteOrder.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/SwapByteOrder.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/SwapByteOrder.h
diff --git a/wpiutil/src/main/native/include/wpi/VersionTuple.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/VersionTuple.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/VersionTuple.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/VersionTuple.h
diff --git a/wpiutil/src/main/native/include/wpi/WindowsError.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/WindowsError.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/WindowsError.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/WindowsError.h
diff --git a/wpiutil/src/main/native/include/wpi/function_ref.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/function_ref.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/function_ref.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/function_ref.h
diff --git a/wpiutil/src/main/native/include/wpi/iterator.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/iterator.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator.h
diff --git a/wpiutil/src/main/native/include/wpi/iterator_range.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator_range.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/iterator_range.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/iterator_range.h
diff --git a/wpiutil/src/main/native/include/wpi/raw_os_ostream.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_os_ostream.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/raw_os_ostream.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_os_ostream.h
diff --git a/wpiutil/src/main/native/include/wpi/raw_ostream.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_ostream.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/raw_ostream.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/raw_ostream.h
diff --git a/wpiutil/src/main/native/include/wpi/type_traits.h b/wpiutil/src/main/native/thirdparty/llvm/include/wpi/type_traits.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/type_traits.h
rename to wpiutil/src/main/native/thirdparty/llvm/include/wpi/type_traits.h
diff --git a/wpiutil/src/main/native/include/wpi/mpack.h b/wpiutil/src/main/native/thirdparty/mpack/include/wpi/mpack.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/mpack.h
rename to wpiutil/src/main/native/thirdparty/mpack/include/wpi/mpack.h
diff --git a/wpiutil/src/main/native/cpp/mpack.cpp b/wpiutil/src/main/native/thirdparty/mpack/src/mpack.cpp
similarity index 100%
rename from wpiutil/src/main/native/cpp/mpack.cpp
rename to wpiutil/src/main/native/thirdparty/mpack/src/mpack.cpp
diff --git a/wpiutil/src/main/native/include/wpi/Signal.h b/wpiutil/src/main/native/thirdparty/sigslot/include/wpi/Signal.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/Signal.h
rename to wpiutil/src/main/native/thirdparty/sigslot/include/wpi/Signal.h
diff --git a/wpiutil/src/main/native/include/wpi/span.h b/wpiutil/src/main/native/thirdparty/tcb_span/include/wpi/span.h
similarity index 100%
rename from wpiutil/src/main/native/include/wpi/span.h
rename to wpiutil/src/main/native/thirdparty/tcb_span/include/wpi/span.h