Run wpiformat on merged repo (#1021)

2026-06-19 00:41:43 +00:00 · 2018-05-13 17:09:56 -07:00
parent 0babbf317c
commit 6729a7d6b1
481 changed files with 9581 additions and 6828 deletions
--- a/wpiutil/.styleguide
+++ b/wpiutil/.styleguide
@@ -8,8 +8,8 @@ cppSrcFileInclude {
 }

 generatedFileExclude {
-  gmock/
  src/main/native/cpp/llvm/
+  src/main/native/include/llvm/
  src/main/native/include/wpi/AlignOf\.h$
  src/main/native/include/wpi/ArrayRef\.h$
  src/main/native/include/wpi/Compiler\.h$
@@ -24,7 +24,7 @@ generatedFileExclude {
  src/main/native/include/wpi/MathExtras\.h$
  src/main/native/include/wpi/None\.h$
  src/main/native/include/wpi/Optional\.h$
-  src/main/native/include/wpi/Path\.h $
+  src/main/native/include/wpi/Path\.h$
  src/main/native/include/wpi/PointerLikeTypeTraits\.h$
  src/main/native/include/wpi/STLExtras\.h$
  src/main/native/include/wpi/SmallPtrSet\.h$
@@ -52,12 +52,17 @@ licenseUpdateExclude {
  src/main/native/cpp/TCPConnector\.cpp$
  src/main/native/cpp/TCPStream\.cpp$
  src/main/native/include/wpi/ConcurrentQueue\.h$
+  src/main/native/include/wpi/Path\.h$
  src/main/native/include/wpi/sha1\.h$
  src/main/native/include/wpi/TCPAcceptor\.h$
  src/main/native/include/wpi/TCPConnector\.h$
  src/main/native/include/wpi/TCPStream\.h$
 }

+repoRootNameOverride {
+  wpiutil
+}
+
 includeGuardRoots {
  wpiutil/src/main/native/cpp/
  wpiutil/src/main/native/include/
--- a/wpiutil/src/main/native/include/llvm/AlignOf.h
+++ b/wpiutil/src/main/native/include/llvm/AlignOf.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/AlignOf.h is deprecated; include wpi/AlignOf.h instead"
 #else
 #warning "llvm/AlignOf.h is deprecated; include wpi/AlignOf.h instead"
 #endif
+// clang-format on

 #include "wpi/AlignOf.h"

--- a/wpiutil/src/main/native/include/llvm/ArrayRef.h
+++ b/wpiutil/src/main/native/include/llvm/ArrayRef.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/ArrayRef.h is deprecated; include wpi/ArrayRef.h instead"
 #else
 #warning "llvm/ArrayRef.h is deprecated; include wpi/ArrayRef.h instead"
 #endif
+// clang-format on

 #include "wpi/ArrayRef.h"

--- a/wpiutil/src/main/native/include/llvm/Compiler.h
+++ b/wpiutil/src/main/native/include/llvm/Compiler.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/Compiler.h is deprecated; include wpi/Compiler.h instead"
 #else
 #warning "llvm/Compiler.h is deprecated; include wpi/Compiler.h instead"
 #endif
+// clang-format on

 #include "wpi/Compiler.h"

--- a/wpiutil/src/main/native/include/llvm/ConvertUTF.h
+++ b/wpiutil/src/main/native/include/llvm/ConvertUTF.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/ConvertUTF.h is deprecated; include wpi/ConvertUTF.h instead"
 #else
 #warning "llvm/ConvertUTF.h is deprecated; include wpi/ConvertUTF.h instead"
 #endif
+// clang-format on

 #include "wpi/ConvertUTF.h"

--- a/wpiutil/src/main/native/include/llvm/DenseMap.h
+++ b/wpiutil/src/main/native/include/llvm/DenseMap.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/DenseMap.h is deprecated; include wpi/DenseMap.h instead"
 #else
 #warning "llvm/DenseMap.h is deprecated; include wpi/DenseMap.h instead"
 #endif
+// clang-format on

 #include "wpi/DenseMap.h"

--- a/wpiutil/src/main/native/include/llvm/DenseMapInfo.h
+++ b/wpiutil/src/main/native/include/llvm/DenseMapInfo.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/DenseMapInfo.h is deprecated; include wpi/DenseMapInfo.h instead"
 #else
 #warning "llvm/DenseMapInfo.h is deprecated; include wpi/DenseMapInfo.h instead"
 #endif
+// clang-format on

 #include "wpi/DenseMapInfo.h"

--- a/wpiutil/src/main/native/include/llvm/EpochTracker.h
+++ b/wpiutil/src/main/native/include/llvm/EpochTracker.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/EpochTracker.h is deprecated; include wpi/EpochTracker.h instead"
 #else
 #warning "llvm/EpochTracker.h is deprecated; include wpi/EpochTracker.h instead"
 #endif
+// clang-format on

 #include "wpi/EpochTracker.h"

--- a/wpiutil/src/main/native/include/llvm/FileSystem.h
+++ b/wpiutil/src/main/native/include/llvm/FileSystem.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/FileSystem.h is deprecated; include wpi/FileSystem.h instead"
 #else
 #warning "llvm/FileSystem.h is deprecated; include wpi/FileSystem.h instead"
 #endif
+// clang-format on

 #include "wpi/FileSystem.h"

--- a/wpiutil/src/main/native/include/llvm/Format.h
+++ b/wpiutil/src/main/native/include/llvm/Format.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/Format.h is deprecated; include wpi/Format.h instead"
 #else
 #warning "llvm/Format.h is deprecated; include wpi/Format.h instead"
 #endif
+// clang-format on

 #include "wpi/Format.h"

--- a/wpiutil/src/main/native/include/llvm/Hashing.h
+++ b/wpiutil/src/main/native/include/llvm/Hashing.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/Hashing.h is deprecated; include wpi/Hashing.h instead"
 #else
 #warning "llvm/Hashing.h is deprecated; include wpi/Hashing.h instead"
 #endif
+// clang-format on

 #include "wpi/Hashing.h"

--- a/wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h
+++ b/wpiutil/src/main/native/include/llvm/IntrusiveRefCntPtr.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/IntrusiveRefCntPtr.h is deprecated; include wpi/IntrusiveRefCntPtr.h instead"
 #else
 #warning "llvm/IntrusiveRefCntPtr.h is deprecated; include wpi/IntrusiveRefCntPtr.h instead"
 #endif
+// clang-format on

 #include "wpi/IntrusiveRefCntPtr.h"

--- a/wpiutil/src/main/native/include/llvm/MathExtras.h
+++ b/wpiutil/src/main/native/include/llvm/MathExtras.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/MathExtras.h is deprecated; include wpi/MathExtras.h instead"
 #else
 #warning "llvm/MathExtras.h is deprecated; include wpi/MathExtras.h instead"
 #endif
+// clang-format on

 #include "wpi/MathExtras.h"

--- a/wpiutil/src/main/native/include/llvm/None.h
+++ b/wpiutil/src/main/native/include/llvm/None.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/None.h is deprecated; include wpi/None.h instead"
 #else
 #warning "llvm/None.h is deprecated; include wpi/None.h instead"
 #endif
+// clang-format on

 #include "wpi/None.h"

--- a/wpiutil/src/main/native/include/llvm/Optional.h
+++ b/wpiutil/src/main/native/include/llvm/Optional.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/Optional.h is deprecated; include wpi/Optional.h instead"
 #else
 #warning "llvm/Optional.h is deprecated; include wpi/Optional.h instead"
 #endif
+// clang-format on

 #include "wpi/Optional.h"

--- a/wpiutil/src/main/native/include/llvm/Path.h
+++ b/wpiutil/src/main/native/include/llvm/Path.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/Path.h is deprecated; include wpi/Path.h instead"
 #else
 #warning "llvm/Path.h is deprecated; include wpi/Path.h instead"
 #endif
+// clang-format on

 #include "wpi/Path.h"

--- a/wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h
+++ b/wpiutil/src/main/native/include/llvm/PointerLikeTypeTraits.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/PointerLikeTypeTraits.h is deprecated; include wpi/PointerLikeTypeTraits.h instead"
 #else
 #warning "llvm/PointerLikeTypeTraits.h is deprecated; include wpi/PointerLikeTypeTraits.h instead"
 #endif
+// clang-format on

 #include "wpi/PointerLikeTypeTraits.h"

--- a/wpiutil/src/main/native/include/llvm/STLExtras.h
+++ b/wpiutil/src/main/native/include/llvm/STLExtras.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/STLExtras.h is deprecated; include wpi/STLExtras.h instead"
 #else
 #warning "llvm/STLExtras.h is deprecated; include wpi/STLExtras.h instead"
 #endif
+// clang-format on

 #include "wpi/STLExtras.h"

--- a/wpiutil/src/main/native/include/llvm/SmallPtrSet.h
+++ b/wpiutil/src/main/native/include/llvm/SmallPtrSet.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/SmallPtrSet.h is deprecated; include wpi/SmallPtrSet.h instead"
 #else
 #warning "llvm/SmallPtrSet.h is deprecated; include wpi/SmallPtrSet.h instead"
 #endif
+// clang-format on

 #include "wpi/SmallPtrSet.h"

--- a/wpiutil/src/main/native/include/llvm/SmallSet.h
+++ b/wpiutil/src/main/native/include/llvm/SmallSet.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/SmallSet.h is deprecated; include wpi/SmallSet.h instead"
 #else
 #warning "llvm/SmallSet.h is deprecated; include wpi/SmallSet.h instead"
 #endif
+// clang-format on

 #include "wpi/SmallSet.h"

--- a/wpiutil/src/main/native/include/llvm/SmallString.h
+++ b/wpiutil/src/main/native/include/llvm/SmallString.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/SmallString.h is deprecated; include wpi/SmallString.h instead"
 #else
 #warning "llvm/SmallString.h is deprecated; include wpi/SmallString.h instead"
 #endif
+// clang-format on

 #include "wpi/SmallString.h"

--- a/wpiutil/src/main/native/include/llvm/SmallVector.h
+++ b/wpiutil/src/main/native/include/llvm/SmallVector.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/SmallVector.h is deprecated; include wpi/SmallVector.h instead"
 #else
 #warning "llvm/SmallVector.h is deprecated; include wpi/SmallVector.h instead"
 #endif
+// clang-format on

 #include "wpi/SmallVector.h"

--- a/wpiutil/src/main/native/include/llvm/StringExtras.h
+++ b/wpiutil/src/main/native/include/llvm/StringExtras.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/StringExtras.h is deprecated; include wpi/StringExtras.h instead"
 #else
 #warning "llvm/StringExtras.h is deprecated; include wpi/StringExtras.h instead"
 #endif
+// clang-format on

 #include "wpi/StringExtras.h"

--- a/wpiutil/src/main/native/include/llvm/StringMap.h
+++ b/wpiutil/src/main/native/include/llvm/StringMap.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/StringMap.h is deprecated; include wpi/StringMap.h instead"
 #else
 #warning "llvm/StringMap.h is deprecated; include wpi/StringMap.h instead"
 #endif
+// clang-format on

 #include "wpi/StringMap.h"

--- a/wpiutil/src/main/native/include/llvm/StringRef.h
+++ b/wpiutil/src/main/native/include/llvm/StringRef.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/StringRef.h is deprecated; include wpi/StringRef.h instead"
 #else
 #warning "llvm/StringRef.h is deprecated; include wpi/StringRef.h instead"
 #endif
+// clang-format on

 #include "wpi/StringRef.h"

--- a/wpiutil/src/main/native/include/llvm/Twine.h
+++ b/wpiutil/src/main/native/include/llvm/Twine.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/Twine.h is deprecated; include wpi/Twine.h instead"
 #else
 #warning "llvm/Twine.h is deprecated; include wpi/Twine.h instead"
 #endif
+// clang-format on

 #include "wpi/Twine.h"

--- a/wpiutil/src/main/native/include/llvm/WindowsError.h
+++ b/wpiutil/src/main/native/include/llvm/WindowsError.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/WindowsError.h is deprecated; include wpi/WindowsError.h instead"
 #else
 #warning "llvm/WindowsError.h is deprecated; include wpi/WindowsError.h instead"
 #endif
+// clang-format on

 #include "wpi/WindowsError.h"

--- a/wpiutil/src/main/native/include/llvm/iterator_range.h
+++ b/wpiutil/src/main/native/include/llvm/iterator_range.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/iterator_range.h is deprecated; include wpi/iterator_range.h instead"
 #else
 #warning "llvm/iterator_range.h is deprecated; include wpi/iterator_range.h instead"
 #endif
+// clang-format on

 #include "wpi/iterator_range.h"

--- a/wpiutil/src/main/native/include/llvm/raw_os_ostream.h
+++ b/wpiutil/src/main/native/include/llvm/raw_os_ostream.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/raw_os_ostream.h is deprecated; include wpi/raw_os_ostream.h instead"
 #else
 #warning "llvm/raw_os_ostream.h is deprecated; include wpi/raw_os_ostream.h instead"
 #endif
+// clang-format on

 #include "wpi/raw_os_ostream.h"

--- a/wpiutil/src/main/native/include/llvm/raw_ostream.h
+++ b/wpiutil/src/main/native/include/llvm/raw_ostream.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/raw_ostream.h is deprecated; include wpi/raw_ostream.h instead"
 #else
 #warning "llvm/raw_ostream.h is deprecated; include wpi/raw_ostream.h instead"
 #endif
+// clang-format on

 #include "wpi/raw_ostream.h"

--- a/wpiutil/src/main/native/include/llvm/type_traits.h
+++ b/wpiutil/src/main/native/include/llvm/type_traits.h
@@ -7,11 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: llvm/type_traits.h is deprecated; include wpi/type_traits.h instead"
 #else
 #warning "llvm/type_traits.h is deprecated; include wpi/type_traits.h instead"
 #endif
+// clang-format on

 #include "wpi/type_traits.h"

--- a/wpiutil/src/main/native/include/support/Base64.h
+++ b/wpiutil/src/main/native/include/support/Base64.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/Base64.h is deprecated; include wpi/Base64.h instead"
 #else
 #warning "support/Base64.h is deprecated; include wpi/Base64.h instead"
 #endif

+// clang-format on
+
 #include "wpi/Base64.h"
--- a/wpiutil/src/main/native/include/support/ConcurrentQueue.h
+++ b/wpiutil/src/main/native/include/support/ConcurrentQueue.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/ConcurrentQueue.h is deprecated; include wpi/ConcurrentQueue.h instead"
 #else
 #warning "support/ConcurrentQueue.h is deprecated; include wpi/ConcurrentQueue.h instead"
 #endif

+// clang-format on
+
 #include "wpi/ConcurrentQueue.h"
--- a/wpiutil/src/main/native/include/support/HttpUtil.h
+++ b/wpiutil/src/main/native/include/support/HttpUtil.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/HttpUtil.h is deprecated; include wpi/HttpUtil.h instead"
 #else
 #warning "support/HttpUtil.h is deprecated; include wpi/HttpUtil.h instead"
 #endif

+// clang-format on
+
 #include "wpi/HttpUtil.h"
--- a/wpiutil/src/main/native/include/support/HttpUtil.inl
+++ b/wpiutil/src/main/native/include/support/HttpUtil.inl
@@ -7,10 +7,12 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/HttpUtil.inl is deprecated; include wpi/HttpUtil.inl instead"
 #else
 #warning "support/HttpUtil.inl is deprecated; include wpi/HttpUtil.inl instead"
 #endif
+// clang-format on

 #include "wpi/HttpUtil.inl"
--- a/wpiutil/src/main/native/include/support/Logger.h
+++ b/wpiutil/src/main/native/include/support/Logger.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/Logger.h is deprecated; include wpi/Logger.h instead"
 #else
 #warning "support/Logger.h is deprecated; include wpi/Logger.h instead"
 #endif

+// clang-format on
+
 #include "wpi/Logger.h"
--- a/wpiutil/src/main/native/include/support/SafeThread.h
+++ b/wpiutil/src/main/native/include/support/SafeThread.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/SafeThread.h is deprecated; include wpi/SafeThread.h instead"
 #else
 #warning "support/SafeThread.h is deprecated; include wpi/SafeThread.h instead"
 #endif

+// clang-format on
+
 #include "wpi/SafeThread.h"
--- a/wpiutil/src/main/native/include/support/UidVector.h
+++ b/wpiutil/src/main/native/include/support/UidVector.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/UidVector.h is deprecated; include wpi/UidVector.h instead"
 #else
 #warning "support/UidVector.h is deprecated; include wpi/UidVector.h instead"
 #endif

+// clang-format on
+
 #include "wpi/UidVector.h"
--- a/wpiutil/src/main/native/include/support/atomic_static.h
+++ b/wpiutil/src/main/native/include/support/atomic_static.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/atomic_static.h is deprecated; include wpi/atomic_static.h instead"
 #else
 #warning "support/atomic_static.h is deprecated; include wpi/atomic_static.h instead"
 #endif

+// clang-format on
+
 #include "wpi/atomic_static.h"
--- a/wpiutil/src/main/native/include/support/condition_variable.h
+++ b/wpiutil/src/main/native/include/support/condition_variable.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/condition_variable.h is deprecated; include wpi/condition_variable.h instead"
 #else
 #warning "support/condition_variable.h is deprecated; include wpi/condition_variable.h instead"
 #endif

+// clang-format on
+
 #include "wpi/condition_variable.h"
--- a/wpiutil/src/main/native/include/support/deprecated.h
+++ b/wpiutil/src/main/native/include/support/deprecated.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/deprecated.h is deprecated; include wpi/deprecated.h instead"
 #else
 #warning "support/deprecated.h is deprecated; include wpi/deprecated.h instead"
 #endif

+// clang-format on
+
 #include "wpi/deprecated.h"
--- a/wpiutil/src/main/native/include/support/hostname.h
+++ b/wpiutil/src/main/native/include/support/hostname.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/hostname.h is deprecated; include wpi/hostname.h instead"
 #else
 #warning "support/hostname.h is deprecated; include wpi/hostname.h instead"
 #endif

+// clang-format on
+
 #include "wpi/hostname.h"
--- a/wpiutil/src/main/native/include/support/jni_util.h
+++ b/wpiutil/src/main/native/include/support/jni_util.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/jni_util.h is deprecated; include wpi/jni_util.h instead"
 #else
 #warning "support/jni_util.h is deprecated; include wpi/jni_util.h instead"
 #endif

+// clang-format on
+
 #include "wpi/jni_util.h"
--- a/wpiutil/src/main/native/include/support/json.h
+++ b/wpiutil/src/main/native/include/support/json.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/json.h is deprecated; include wpi/json.h instead"
 #else
 #warning "support/json.h is deprecated; include wpi/json.h instead"
 #endif

+// clang-format on
+
 #include "wpi/json.h"
--- a/wpiutil/src/main/native/include/support/leb128.h
+++ b/wpiutil/src/main/native/include/support/leb128.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/leb128.h is deprecated; include wpi/leb128.h instead"
 #else
 #warning "support/leb128.h is deprecated; include wpi/leb128.h instead"
 #endif

+// clang-format on
+
 #include "wpi/leb128.h"
--- a/wpiutil/src/main/native/include/support/mutex.h
+++ b/wpiutil/src/main/native/include/support/mutex.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/mutex.h is deprecated; include wpi/mutex.h instead"
 #else
 #warning "support/mutex.h is deprecated; include wpi/mutex.h instead"
 #endif

+// clang-format on
+
 #include "wpi/mutex.h"
--- a/wpiutil/src/main/native/include/support/priority_condition_variable.h
+++ b/wpiutil/src/main/native/include/support/priority_condition_variable.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/priority_condition_variable.h is deprecated; include wpi/priority_condition_variable.h instead"
 #else
 #warning "support/priority_condition_variable.h is deprecated; include wpi/priority_condition_variable.h instead"
 #endif

+// clang-format on
+
 #include "wpi/priority_condition_variable.h"
--- a/wpiutil/src/main/native/include/support/priority_mutex.h
+++ b/wpiutil/src/main/native/include/support/priority_mutex.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/priority_mutex.h is deprecated; include wpi/priority_mutex.h instead"
 #else
 #warning "support/priority_mutex.h is deprecated; include wpi/priority_mutex.h instead"
 #endif

+// clang-format on
+
 #include "wpi/priority_mutex.h"
--- a/wpiutil/src/main/native/include/support/raw_istream.h
+++ b/wpiutil/src/main/native/include/support/raw_istream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/raw_istream.h is deprecated; include wpi/raw_istream.h instead"
 #else
 #warning "support/raw_istream.h is deprecated; include wpi/raw_istream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/raw_istream.h"
--- a/wpiutil/src/main/native/include/support/raw_socket_istream.h
+++ b/wpiutil/src/main/native/include/support/raw_socket_istream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/raw_socket_istream.h is deprecated; include wpi/raw_socket_istream.h instead"
 #else
 #warning "support/raw_socket_istream.h is deprecated; include wpi/raw_socket_istream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/raw_socket_istream.h"
--- a/wpiutil/src/main/native/include/support/raw_socket_ostream.h
+++ b/wpiutil/src/main/native/include/support/raw_socket_ostream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/raw_socket_ostream.h is deprecated; include wpi/raw_socket_ostream.h instead"
 #else
 #warning "support/raw_socket_ostream.h is deprecated; include wpi/raw_socket_ostream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/raw_socket_ostream.h"
--- a/wpiutil/src/main/native/include/support/sha1.h
+++ b/wpiutil/src/main/native/include/support/sha1.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/sha1.h is deprecated; include wpi/sha1.h instead"
 #else
 #warning "support/sha1.h is deprecated; include wpi/sha1.h instead"
 #endif

+// clang-format on
+
 #include "wpi/sha1.h"
--- a/wpiutil/src/main/native/include/support/timestamp.h
+++ b/wpiutil/src/main/native/include/support/timestamp.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: support/timestamp.h is deprecated; include wpi/timestamp.h instead"
 #else
 #warning "support/timestamp.h is deprecated; include wpi/timestamp.h instead"
 #endif

+// clang-format on
+
 #include "wpi/timestamp.h"
--- a/wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h
+++ b/wpiutil/src/main/native/include/tcpsockets/NetworkAcceptor.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: tcpsockets/NetworkAcceptor.h is deprecated; include wpi/NetworkAcceptor.h instead"
 #else
 #warning "tcpsockets/NetworkAcceptor.h is deprecated; include wpi/NetworkAcceptor.h instead"
 #endif

+// clang-format on
+
 #include "wpi/NetworkAcceptor.h"
--- a/wpiutil/src/main/native/include/tcpsockets/NetworkStream.h
+++ b/wpiutil/src/main/native/include/tcpsockets/NetworkStream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: tcpsockets/NetworkStream.h is deprecated; include wpi/NetworkStream.h instead"
 #else
 #warning "tcpsockets/NetworkStream.h is deprecated; include wpi/NetworkStream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/NetworkStream.h"
--- a/wpiutil/src/main/native/include/tcpsockets/SocketError.h
+++ b/wpiutil/src/main/native/include/tcpsockets/SocketError.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: tcpsockets/SocketError.h is deprecated; include wpi/SocketError.h instead"
 #else
 #warning "tcpsockets/SocketError.h is deprecated; include wpi/SocketError.h instead"
 #endif

+// clang-format on
+
 #include "wpi/SocketError.h"
--- a/wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h
+++ b/wpiutil/src/main/native/include/tcpsockets/TCPAcceptor.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: tcpsockets/TCPAcceptor.h is deprecated; include wpi/TCPAcceptor.h instead"
 #else
 #warning "tcpsockets/TCPAcceptor.h is deprecated; include wpi/TCPAcceptor.h instead"
 #endif

+// clang-format on
+
 #include "wpi/TCPAcceptor.h"
--- a/wpiutil/src/main/native/include/tcpsockets/TCPConnector.h
+++ b/wpiutil/src/main/native/include/tcpsockets/TCPConnector.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: tcpsockets/TCPConnector.h is deprecated; include wpi/TCPConnector.h instead"
 #else
 #warning "tcpsockets/TCPConnector.h is deprecated; include wpi/TCPConnector.h instead"
 #endif

+// clang-format on
+
 #include "wpi/TCPConnector.h"
--- a/wpiutil/src/main/native/include/tcpsockets/TCPStream.h
+++ b/wpiutil/src/main/native/include/tcpsockets/TCPStream.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: tcpsockets/TCPStream.h is deprecated; include wpi/TCPStream.h instead"
 #else
 #warning "tcpsockets/TCPStream.h is deprecated; include wpi/TCPStream.h instead"
 #endif

+// clang-format on
+
 #include "wpi/TCPStream.h"
--- a/wpiutil/src/main/native/include/udpsockets/UDPClient.h
+++ b/wpiutil/src/main/native/include/udpsockets/UDPClient.h
@@ -7,10 +7,13 @@

 #pragma once

+// clang-format off
 #ifdef _MSC_VER
 #pragma message "warning: udpsockets/UDPClient.h is deprecated; include wpi/UDPClient.h instead"
 #else
 #warning "udpsockets/UDPClient.h is deprecated; include wpi/UDPClient.h instead"
 #endif

+// clang-format on
+
 #include "wpi/UDPClient.h"
--- a/wpiutil/src/main/native/include/wpi/Base64.h
+++ b/wpiutil/src/main/native/include/wpi/Base64.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_BASE64_H_
-#define WPIUTIL_SUPPORT_BASE64_H_
+#ifndef WPIUTIL_WPI_BASE64_H_
+#define WPIUTIL_WPI_BASE64_H_

 #include <cstddef>
 #include <string>
@@ -33,4 +33,4 @@ StringRef Base64Encode(StringRef plain, SmallVectorImpl<char>& buf);

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_BASE64_H_
+#endif  // WPIUTIL_WPI_BASE64_H_
--- a/wpiutil/src/main/native/include/wpi/ConcurrentQueue.h
+++ b/wpiutil/src/main/native/include/wpi/ConcurrentQueue.h
@@ -4,8 +4,8 @@
 // - see < http://opensource.org/licenses/BSD-2-Clause>
 //

-#ifndef WPIUTIL_SUPPORT_CONCURRENTQUEUE_H_
-#define WPIUTIL_SUPPORT_CONCURRENTQUEUE_H_
+#ifndef WPIUTIL_WPI_CONCURRENTQUEUE_H_
+#define WPIUTIL_WPI_CONCURRENTQUEUE_H_

 #include <queue>
 #include <thread>
@@ -82,4 +82,4 @@ class ConcurrentQueue {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_CONCURRENTQUEUE_H_
+#endif  // WPIUTIL_WPI_CONCURRENTQUEUE_H_
--- a/wpiutil/src/main/native/include/wpi/HttpUtil.h
+++ b/wpiutil/src/main/native/include/wpi/HttpUtil.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_HTTPUTIL_H_
-#define WPIUTIL_SUPPORT_HTTPUTIL_H_
+#ifndef WPIUTIL_WPI_HTTPUTIL_H_
+#define WPIUTIL_WPI_HTTPUTIL_H_

 #include <memory>
 #include <string>
@@ -145,4 +145,4 @@ class HttpConnection {

 #include "HttpUtil.inl"

-#endif  // WPIUTIL_SUPPORT_HTTPUTIL_H_
+#endif  // WPIUTIL_WPI_HTTPUTIL_H_
--- a/wpiutil/src/main/native/include/wpi/Logger.h
+++ b/wpiutil/src/main/native/include/wpi/Logger.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_LOGGER_H_
-#define WPIUTIL_SUPPORT_LOGGER_H_
+#ifndef WPIUTIL_WPI_LOGGER_H_
+#define WPIUTIL_WPI_LOGGER_H_

 #include <functional>

@@ -97,4 +97,4 @@ class Logger {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_LOGGER_H_
+#endif  // WPIUTIL_WPI_LOGGER_H_
--- a/wpiutil/src/main/native/include/wpi/NetworkAcceptor.h
+++ b/wpiutil/src/main/native/include/wpi/NetworkAcceptor.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_TCPSOCKETS_NETWORKACCEPTOR_H_
-#define WPIUTIL_TCPSOCKETS_NETWORKACCEPTOR_H_
+#ifndef WPIUTIL_WPI_NETWORKACCEPTOR_H_
+#define WPIUTIL_WPI_NETWORKACCEPTOR_H_

 #include <memory>

@@ -29,4 +29,4 @@ class NetworkAcceptor {

 }  // namespace wpi

-#endif  // WPIUTIL_TCPSOCKETS_NETWORKACCEPTOR_H_
+#endif  // WPIUTIL_WPI_NETWORKACCEPTOR_H_
--- a/wpiutil/src/main/native/include/wpi/NetworkStream.h
+++ b/wpiutil/src/main/native/include/wpi/NetworkStream.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_TCPSOCKETS_NETWORKSTREAM_H_
-#define WPIUTIL_TCPSOCKETS_NETWORKSTREAM_H_
+#ifndef WPIUTIL_WPI_NETWORKSTREAM_H_
+#define WPIUTIL_WPI_NETWORKSTREAM_H_

 #include <cstddef>

@@ -45,4 +45,4 @@ class NetworkStream {

 }  // namespace wpi

-#endif  // WPIUTIL_TCPSOCKETS_NETWORKSTREAM_H_
+#endif  // WPIUTIL_WPI_NETWORKSTREAM_H_
--- a/wpiutil/src/main/native/include/wpi/Path.h
+++ b/wpiutil/src/main/native/include/wpi/Path.h
@@ -13,14 +13,15 @@
 //
 //===----------------------------------------------------------------------===//

-#ifndef LLVM_SUPPORT_PATH_H
-#define LLVM_SUPPORT_PATH_H
-
-#include "wpi/Twine.h"
-#include <iterator>
+#ifndef WPIUTIL_WPI_PATH_H_
+#define WPIUTIL_WPI_PATH_H_

 #include <stdint.h>

+#include <iterator>
+
+#include "wpi/Twine.h"
+
 namespace wpi {
 namespace sys {
 namespace path {
@@ -51,7 +52,7 @@ class const_iterator
    : public std::iterator<std::input_iterator_tag, const StringRef> {
  StringRef Path;      ///< The entire path.
  StringRef Component; ///< The current component. Not necessarily in Path.
-  size_t    Position;  ///< The iterators current position within Path.
+  size_t Position;     ///< The iterators current position within Path.

  // An end iterator has Position = Path.size() + 1.
  friend const_iterator begin(StringRef path);
@@ -60,7 +61,7 @@ class const_iterator
 public:
  reference operator*() const { return Component; }
  pointer   operator->() const { return &Component; }
-  const_iterator &operator++();    // preincrement
+  const_iterator& operator++();    // preincrement
  bool operator==(const const_iterator &RHS) const;
  bool operator!=(const const_iterator &RHS) const { return !(*this == RHS); }

@@ -77,7 +78,7 @@ class reverse_iterator
    : public std::iterator<std::input_iterator_tag, const StringRef> {
  StringRef Path;      ///< The entire path.
  StringRef Component; ///< The current component. Not necessarily in Path.
-  size_t    Position;  ///< The iterators current position within Path.
+  size_t Position;     ///< The iterators current position within Path.

  friend reverse_iterator rbegin(StringRef path);
  friend reverse_iterator rend(StringRef path);
@@ -85,7 +86,7 @@ class reverse_iterator
 public:
  reference operator*() const { return Component; }
  pointer   operator->() const { return &Component; }
-  reverse_iterator &operator++();    // preincrement
+  reverse_iterator& operator++();    // preincrement
  bool operator==(const reverse_iterator &RHS) const;
  bool operator!=(const reverse_iterator &RHS) const { return !(*this == RHS); }

@@ -450,8 +451,8 @@ StringRef remove_leading_dotslash(StringRef path);
 /// @result True if path was changed
 bool remove_dots(SmallVectorImpl<char> &path, bool remove_dot_dot = false);

-} // end namespace path
-} // end namespace sys
-} // end namespace wpi
+}  // namespace path
+}  // namespace sys
+}  // namespace wpi

-#endif
+#endif  // WPIUTIL_WPI_PATH_H_
--- a/wpiutil/src/main/native/include/wpi/SafeThread.h
+++ b/wpiutil/src/main/native/include/wpi/SafeThread.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_SAFETHREAD_H_
-#define WPIUTIL_SUPPORT_SAFETHREAD_H_
+#ifndef WPIUTIL_WPI_SAFETHREAD_H_
+#define WPIUTIL_WPI_SAFETHREAD_H_

 #include <atomic>
 #include <thread>
@@ -130,4 +130,4 @@ class SafeThreadOwner : public detail::SafeThreadOwnerBase {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_SAFETHREAD_H_
+#endif  // WPIUTIL_WPI_SAFETHREAD_H_
--- a/wpiutil/src/main/native/include/wpi/SocketError.h
+++ b/wpiutil/src/main/native/include/wpi/SocketError.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_TCPSOCKETS_SOCKETERROR_H_
-#define WPIUTIL_TCPSOCKETS_SOCKETERROR_H_
+#ifndef WPIUTIL_WPI_SOCKETERROR_H_
+#define WPIUTIL_WPI_SOCKETERROR_H_

 #include <string>

@@ -22,4 +22,4 @@ static inline std::string SocketStrerror() {

 }  // namespace wpi

-#endif  // WPIUTIL_TCPSOCKETS_SOCKETERROR_H_
+#endif  // WPIUTIL_WPI_SOCKETERROR_H_
--- a/wpiutil/src/main/native/include/wpi/TCPAcceptor.h
+++ b/wpiutil/src/main/native/include/wpi/TCPAcceptor.h
@@ -21,8 +21,8 @@
   limitations under the License.
 */

-#ifndef WPIUTIL_TCPSOCKETS_TCPACCEPTOR_H_
-#define WPIUTIL_TCPSOCKETS_TCPACCEPTOR_H_
+#ifndef WPIUTIL_WPI_TCPACCEPTOR_H_
+#define WPIUTIL_WPI_TCPACCEPTOR_H_

 #include <atomic>
 #include <memory>
@@ -54,4 +54,4 @@ class TCPAcceptor : public NetworkAcceptor {

 }  // namespace wpi

-#endif  // WPIUTIL_TCPSOCKETS_TCPACCEPTOR_H_
+#endif  // WPIUTIL_WPI_TCPACCEPTOR_H_
--- a/wpiutil/src/main/native/include/wpi/TCPConnector.h
+++ b/wpiutil/src/main/native/include/wpi/TCPConnector.h
@@ -21,8 +21,8 @@
   limitations under the License
 */

-#ifndef WPIUTIL_TCPSOCKETS_TCPCONNECTOR_H_
-#define WPIUTIL_TCPSOCKETS_TCPCONNECTOR_H_
+#ifndef WPIUTIL_WPI_TCPCONNECTOR_H_
+#define WPIUTIL_WPI_TCPCONNECTOR_H_

 #include <memory>
 #include <utility>
@@ -46,4 +46,4 @@ class TCPConnector {

 }  // namespace wpi

-#endif  // WPIUTIL_TCPSOCKETS_TCPCONNECTOR_H_
+#endif  // WPIUTIL_WPI_TCPCONNECTOR_H_
--- a/wpiutil/src/main/native/include/wpi/TCPStream.h
+++ b/wpiutil/src/main/native/include/wpi/TCPStream.h
@@ -21,8 +21,8 @@
   limitations under the License.
 */

-#ifndef WPIUTIL_TCPSOCKETS_TCPSTREAM_H_
-#define WPIUTIL_TCPSOCKETS_TCPSTREAM_H_
+#ifndef WPIUTIL_WPI_TCPSTREAM_H_
+#define WPIUTIL_WPI_TCPSTREAM_H_

 #include <cstddef>
 #include <string>
@@ -68,4 +68,4 @@ class TCPStream : public NetworkStream {

 }  // namespace wpi

-#endif  // WPIUTIL_TCPSOCKETS_TCPSTREAM_H_
+#endif  // WPIUTIL_WPI_TCPSTREAM_H_
--- a/wpiutil/src/main/native/include/wpi/UDPClient.h
+++ b/wpiutil/src/main/native/include/wpi/UDPClient.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_UDPSOCKETS_UDPCLIENT_H_
-#define WPIUTIL_UDPSOCKETS_UDPCLIENT_H_
+#ifndef WPIUTIL_WPI_UDPCLIENT_H_
+#define WPIUTIL_WPI_UDPCLIENT_H_

 #include <string>

@@ -42,4 +42,4 @@ class UDPClient {

 }  // namespace wpi

-#endif  // WPIUTIL_UDPSOCKETS_UDPCLIENT_H_
+#endif  // WPIUTIL_WPI_UDPCLIENT_H_
--- a/wpiutil/src/main/native/include/wpi/UidVector.h
+++ b/wpiutil/src/main/native/include/wpi/UidVector.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_UIDVECTOR_H_
-#define WPIUTIL_SUPPORT_UIDVECTOR_H_
+#ifndef WPIUTIL_WPI_UIDVECTOR_H_
+#define WPIUTIL_WPI_UIDVECTOR_H_

 #include <utility>
 #include <vector>
@@ -64,4 +64,4 @@ class UidVector {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_UIDVECTOR_H_
+#endif  // WPIUTIL_WPI_UIDVECTOR_H_
--- a/wpiutil/src/main/native/include/wpi/deprecated.h
+++ b/wpiutil/src/main/native/include/wpi/deprecated.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_DEPRECATED_H_
-#define WPIUTIL_SUPPORT_DEPRECATED_H_
+#ifndef WPIUTIL_WPI_DEPRECATED_H_
+#define WPIUTIL_WPI_DEPRECATED_H_

 // [[deprecated(msg)]] is a C++14 feature not supported by MSVC or GCC < 4.9.
 // We provide an equivalent warning implementation for those compilers here.
@@ -30,4 +30,4 @@
 #endif
 #endif

-#endif  // WPIUTIL_SUPPORT_DEPRECATED_H_
+#endif  // WPIUTIL_WPI_DEPRECATED_H_
--- a/wpiutil/src/main/native/include/wpi/hostname.h
+++ b/wpiutil/src/main/native/include/wpi/hostname.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_HOSTNAME_H_
-#define WPIUTIL_SUPPORT_HOSTNAME_H_
+#ifndef WPIUTIL_WPI_HOSTNAME_H_
+#define WPIUTIL_WPI_HOSTNAME_H_

 #include <string>

@@ -20,4 +20,4 @@ std::string GetHostname();
 StringRef GetHostname(SmallVectorImpl<char>& name);
 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_HOSTNAME_H_
+#endif  // WPIUTIL_WPI_HOSTNAME_H_
--- a/wpiutil/src/main/native/include/wpi/jni_util.h
+++ b/wpiutil/src/main/native/include/wpi/jni_util.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_JNI_UTIL_H_
-#define WPIUTIL_SUPPORT_JNI_UTIL_H_
+#ifndef WPIUTIL_WPI_JNI_UTIL_H_
+#define WPIUTIL_WPI_JNI_UTIL_H_

 #include <jni.h>

@@ -44,8 +44,6 @@ std::string GetJavaStackTrace(JNIEnv* env, std::string* func) {
      excludeFuncPrefix == nullptr ? StringRef() : excludeFuncPrefix);
 }

-
-
 // Finds a class and keep it as a global reference.
 // Use with caution, as the destructor does NOT call DeleteGlobalRef due
 // to potential shutdown issues with doing so.
@@ -73,7 +71,7 @@ class JClass {
  jclass m_cls = nullptr;
 };

-template<typename T>
+template <typename T>
 class JGlobal {
 public:
  JGlobal() = default;
@@ -393,7 +391,7 @@ inline jbooleanArray MakeJBooleanArray(JNIEnv* env, ArrayRef<bool> arr) {
  return jarr;
 }

-// Other MakeJ*Array conversions.
+  // Other MakeJ*Array conversions.

 #define WPI_JNI_MAKEJARRAY(T, F)                                  \
  inline T##Array MakeJ##F##Array(JNIEnv* env, ArrayRef<T> arr) { \
@@ -623,4 +621,4 @@ class JException : public JClass {
 }  // namespace java
 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_JNI_UTIL_H_
+#endif  // WPIUTIL_WPI_JNI_UTIL_H_
--- a/wpiutil/src/main/native/include/wpi/leb128.h
+++ b/wpiutil/src/main/native/include/wpi/leb128.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_LEB128_H_
-#define WPIUTIL_SUPPORT_LEB128_H_
+#ifndef WPIUTIL_WPI_LEB128_H_
+#define WPIUTIL_WPI_LEB128_H_

 #include <cstddef>

@@ -23,4 +23,4 @@ bool ReadUleb128(raw_istream& is, uint64_t* ret);

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_LEB128_H_
+#endif  // WPIUTIL_WPI_LEB128_H_
--- a/wpiutil/src/main/native/include/wpi/memory.h
+++ b/wpiutil/src/main/native/include/wpi/memory.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_MEMORY_H_
-#define WPIUTIL_SUPPORT_MEMORY_H_
+#ifndef WPIUTIL_WPI_MEMORY_H_
+#define WPIUTIL_WPI_MEMORY_H_

 #include <cstdlib>
 #include <exception>
@@ -61,4 +61,4 @@ inline void* CheckedRealloc(void* ptr, size_t size) {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_MEMORY_H_
+#endif  // WPIUTIL_WPI_MEMORY_H_
--- a/wpiutil/src/main/native/include/wpi/raw_istream.h
+++ b/wpiutil/src/main/native/include/wpi/raw_istream.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_RAW_ISTREAM_H_
-#define WPIUTIL_SUPPORT_RAW_ISTREAM_H_
+#ifndef WPIUTIL_WPI_RAW_ISTREAM_H_
+#define WPIUTIL_WPI_RAW_ISTREAM_H_

 #include <algorithm>
 #include <cstddef>
@@ -112,4 +112,4 @@ class raw_fd_istream : public raw_istream {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_RAW_ISTREAM_H_
+#endif  // WPIUTIL_WPI_RAW_ISTREAM_H_
--- a/wpiutil/src/main/native/include/wpi/raw_socket_istream.h
+++ b/wpiutil/src/main/native/include/wpi/raw_socket_istream.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_RAW_SOCKET_ISTREAM_H_
-#define WPIUTIL_SUPPORT_RAW_SOCKET_ISTREAM_H_
+#ifndef WPIUTIL_WPI_RAW_SOCKET_ISTREAM_H_
+#define WPIUTIL_WPI_RAW_SOCKET_ISTREAM_H_

 #include "wpi/raw_istream.h"

@@ -31,4 +31,4 @@ class raw_socket_istream : public raw_istream {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_RAW_SOCKET_ISTREAM_H_
+#endif  // WPIUTIL_WPI_RAW_SOCKET_ISTREAM_H_
--- a/wpiutil/src/main/native/include/wpi/raw_socket_ostream.h
+++ b/wpiutil/src/main/native/include/wpi/raw_socket_ostream.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_RAW_SOCKET_OSTREAM_H_
-#define WPIUTIL_SUPPORT_RAW_SOCKET_OSTREAM_H_
+#ifndef WPIUTIL_WPI_RAW_SOCKET_OSTREAM_H_
+#define WPIUTIL_WPI_RAW_SOCKET_OSTREAM_H_

 #include "wpi/raw_ostream.h"

@@ -39,4 +39,4 @@ class raw_socket_ostream : public raw_ostream {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_RAW_SOCKET_OSTREAM_H_
+#endif  // WPIUTIL_WPI_RAW_SOCKET_OSTREAM_H_
--- a/wpiutil/src/main/native/include/wpi/sha1.h
+++ b/wpiutil/src/main/native/include/wpi/sha1.h
@@ -17,8 +17,8 @@
        -- Eugene Hopkinson <slowriot at voxelstorm dot com>
 */

-#ifndef WPIUTIL_SUPPORT_SHA1_H_
-#define WPIUTIL_SUPPORT_SHA1_H_
+#ifndef WPIUTIL_WPI_SHA1_H_
+#define WPIUTIL_WPI_SHA1_H_

 #include <stdint.h>

@@ -49,4 +49,4 @@ class SHA1 {

 }  // namespace wpi

-#endif  // WPIUTIL_SUPPORT_SHA1_H_
+#endif  // WPIUTIL_WPI_SHA1_H_
--- a/wpiutil/src/main/native/include/wpi/timestamp.h
+++ b/wpiutil/src/main/native/include/wpi/timestamp.h
@@ -5,8 +5,8 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

-#ifndef WPIUTIL_SUPPORT_TIMESTAMP_H_
-#define WPIUTIL_SUPPORT_TIMESTAMP_H_
+#ifndef WPIUTIL_WPI_TIMESTAMP_H_
+#define WPIUTIL_WPI_TIMESTAMP_H_

 #include <stdint.h>

@@ -68,4 +68,4 @@ uint64_t Now(void);
 }  // namespace wpi
 #endif

-#endif  // WPIUTIL_SUPPORT_TIMESTAMP_H_
+#endif  // WPIUTIL_WPI_TIMESTAMP_H_