Include thirdparty libraries with angle brackets (#5578)

.styleguide

@@ -29,8 +29,8 @@ includeOtherLibs {
   ^Eigen/
   ^cameraserver/
   ^cscore
-  ^drake/
   ^fmt/
+  ^gtest/
   ^hal/
   ^imgui
   ^implot

apriltag/src/test/native/cpp/AprilTagDetectorTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "frc/apriltag/AprilTagDetector.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

apriltag/src/test/native/cpp/AprilTagJsonTest.cpp

@@ -4,12 +4,12 @@
 
 #include <vector>
 
+#include <gtest/gtest.h>
 #include <wpi/json.h>
 
 #include "frc/apriltag/AprilTag.h"
 #include "frc/apriltag/AprilTagFieldLayout.h"
 #include "frc/geometry/Pose3d.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

apriltag/src/test/native/cpp/AprilTagPoseSetOriginTest.cpp

@@ -4,12 +4,12 @@
 
 #include <vector>
 
+#include <gtest/gtest.h>
 #include <wpi/json.h>
 
 #include "frc/apriltag/AprilTag.h"
 #include "frc/apriltag/AprilTagFieldLayout.h"
 #include "frc/geometry/Pose3d.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

apriltag/src/test/native/cpp/LoadConfigTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "frc/apriltag/AprilTagFields.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 

apriltag/src/test/native/cpp/main.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);

cameraserver/.styleguide

@@ -13,6 +13,7 @@ repoRootNameOverride {
 
 includeOtherLibs {
   ^fmt/
+  ^gtest/
   ^hal/
   ^networktables/
   ^opencv2/

crossConnIntegrationTests/src/main/native/cpp/AnalogTest.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/AnalogInput.h>
 #include <hal/AnalogOutput.h>
 #include <wpi/SmallVector.h>
 
 #include "CrossConnects.h"
 #include "LifetimeWrappers.h"
-#include "gtest/gtest.h"
 
 using namespace hlt;
 

crossConnIntegrationTests/src/main/native/cpp/DIOTest.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/DIO.h>
 #include <wpi/SmallVector.h>
 
 #include "CrossConnects.h"
 #include "LifetimeWrappers.h"
-#include "gtest/gtest.h"
 
 using namespace hlt;
 

crossConnIntegrationTests/src/main/native/cpp/DutyCycleTest.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "CrossConnects.h"
 #include "LifetimeWrappers.h"
-#include "gtest/gtest.h"
 
 using namespace hlt;
 

crossConnIntegrationTests/src/main/native/cpp/Main.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);

crossConnIntegrationTests/src/main/native/cpp/PWMTest.cpp

@@ -5,6 +5,7 @@
 #include <atomic>
 #include <thread>
 
+#include <gtest/gtest.h>
 #include <hal/DMA.h>
 #include <hal/HAL.h>
 #include <wpi/SmallVector.h>
@@ -13,7 +14,6 @@
 
 #include "CrossConnects.h"
 #include "LifetimeWrappers.h"
-#include "gtest/gtest.h"
 
 using namespace hlt;
 

crossConnIntegrationTests/src/main/native/cpp/RelayAnalogTest.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/AnalogInput.h>
 #include <hal/Relay.h>
 #include <wpi/SmallVector.h>
 
 #include "CrossConnects.h"
 #include "LifetimeWrappers.h"
-#include "gtest/gtest.h"
 
 using namespace hlt;
 

crossConnIntegrationTests/src/main/native/cpp/RelayDigitalTest.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/Relay.h>
 #include <wpi/SmallVector.h>
 
 #include "CrossConnects.h"
 #include "LifetimeWrappers.h"
-#include "gtest/gtest.h"
 
 using namespace hlt;
 

crossConnIntegrationTests/src/main/native/cpp/TestEnvironment.cpp

@@ -6,9 +6,9 @@
 #include <thread>
 
 #include <fmt/core.h>
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
-#include "gtest/gtest.h"
 #include "mockds/MockDS.h"
 
 using namespace std::chrono_literals;

cscore/.styleguide

@@ -36,6 +36,7 @@ repoRootNameOverride {
 
 includeOtherLibs {
   ^fmt/
+  ^gtest/
   ^opencv2/
   ^support/
   ^tcpsockets/

cscore/src/test/native/cpp/CameraSourceTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "cscore.h"
-#include "gtest/gtest.h"
 
 namespace cs {
 

cscore/src/test/native/cpp/main.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);

hal/.styleguide

@@ -32,6 +32,7 @@ includeOtherLibs {
   ^FRC_FPGA_ChipObject/
   ^FRC_NetworkCommunication/
   ^fmt/
+  ^gtest/
   ^i2clib/
   ^llvm/
   ^opencv2/

hal/src/test/native/cpp/HALTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 
 namespace hal {

hal/src/test/native/cpp/can/CANTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/CANAPI.h"
 #include "hal/HAL.h"
 #include "hal/simulation/CanData.h"

hal/src/test/native/cpp/handles/HandleTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/handles/IndexedClassedHandleResource.h"
 

hal/src/test/native/cpp/main.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 
 int main(int argc, char** argv) {

hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/AnalogInput.h"
 #include "hal/HAL.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/AnalogOutDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/AnalogOutput.h"
 #include "hal/HAL.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/DIODataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/DIO.h"
 #include "hal/HAL.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp

@@ -4,7 +4,8 @@
 
 #include <cstring>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/simulation/DriverStationData.h"
 

hal/src/test/native/cpp/mockdata/I2CDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/I2C.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/PCMDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/CTREPCM.h"
 #include "hal/HAL.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/PDPDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/PowerDistribution.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/PWMDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/PWM.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/RelayDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/Relay.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/SPIDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/HAL.h"
 #include "hal/SPI.h"
 #include "hal/handles/HandlesInternal.h"

hal/src/test/native/cpp/mockdata/SimDeviceDataTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "hal/SimDevice.h"
 #include "hal/simulation/SimDeviceData.h"
 

imgui/.styleguide

@@ -6,15 +6,3 @@ cppHeaderFileInclude {
 cppSrcFileInclude {
   \.cpp$
 }
-
-modifiableFileExclude {
-}
-
-generatedFileExclude {
-}
-
-repoRootNameOverride {
-}
-
-includeOtherLibs {
-}

ntcore/.styleguide

@@ -28,6 +28,7 @@ includeGuardRoots {
 
 includeOtherLibs {
   ^fmt/
+  ^gtest/
   ^support/
   ^wpi/
   ^wpinet/

ntcore/src/test/native/cpp/ConnectionListenerTest.cpp

@@ -5,11 +5,11 @@
 #include <chrono>
 #include <thread>
 
+#include <gtest/gtest.h>
 #include <wpi/Synchronization.h>
 #include <wpi/mutex.h>
 
 #include "TestPrinters.h"
-#include "gtest/gtest.h"
 #include "ntcore_cpp.h"
 
 class ConnectionListenerTest : public ::testing::Test {

ntcore/src/test/native/cpp/LocalStorageTest.cpp

@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "LocalStorage.h"
 #include "MockListenerStorage.h"
 #include "MockLogger.h"
@@ -10,7 +12,6 @@
 #include "TestPrinters.h"
 #include "ValueMatcher.h"
 #include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "net/MockNetworkInterface.h"
 #include "ntcore_c.h"
 #include "ntcore_cpp.h"

ntcore/src/test/native/cpp/LoggerTest.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <wpi/Synchronization.h>
 
 #include "Handle.h"
 #include "TestPrinters.h"
-#include "gtest/gtest.h"
 #include "ntcore_cpp.h"
 
 class LoggerTest : public ::testing::Test {

ntcore/src/test/native/cpp/NetworkTableTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "TestPrinters.h"
-#include "gtest/gtest.h"
 #include "networktables/NetworkTable.h"
 #include "networktables/NetworkTableInstance.h"
 

ntcore/src/test/native/cpp/TableListenerTest.cpp

@@ -4,9 +4,10 @@
 
 #include <memory>
 
+#include <gtest/gtest.h>
+
 #include "TestPrinters.h"
 #include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "networktables/DoubleTopic.h"
 #include "networktables/NetworkTableInstance.h"
 #include "ntcore_cpp.h"

ntcore/src/test/native/cpp/TestPrinters.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <string_view>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 namespace wpi {
 

ntcore/src/test/native/cpp/TimeSyncTest.cpp

@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "networktables/NetworkTableInstance.h"
 #include "networktables/NetworkTableListener.h"
 

ntcore/src/test/native/cpp/TopicListenerTest.cpp

@@ -5,12 +5,12 @@
 #include <chrono>
 #include <thread>
 
+#include <gtest/gtest.h>
 #include <wpi/Synchronization.h>
 #include <wpi/json.h>
 
 #include "TestPrinters.h"
 #include "ValueMatcher.h"
-#include "gtest/gtest.h"
 #include "ntcore_c.h"
 #include "ntcore_cpp.h"
 

ntcore/src/test/native/cpp/ValueListenerTest.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <wpi/StringExtras.h>
 #include <wpi/Synchronization.h>
 
 #include "TestPrinters.h"
 #include "ValueMatcher.h"
-#include "gtest/gtest.h"
 #include "ntcore_c.h"
 #include "ntcore_cpp.h"
 

ntcore/src/test/native/cpp/ValueTest.cpp

@@ -5,9 +5,10 @@
 #include <algorithm>
 #include <string_view>
 
+#include <gtest/gtest.h>
+
 #include "TestPrinters.h"
 #include "Value_internal.h"
-#include "gtest/gtest.h"
 #include "networktables/NetworkTableValue.h"
 
 using namespace std::string_view_literals;

ntcore/src/test/native/cpp/net/ServerImplTest.cpp

@@ -9,6 +9,8 @@
 #include <string_view>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #include "../MockLogger.h"
 #include "../PubSubOptionsMatcher.h"
 #include "../SpanMatcher.h"
@@ -18,7 +20,6 @@
 #include "MockNetworkInterface.h"
 #include "MockWireConnection.h"
 #include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "net/Message.h"
 #include "net/ServerImpl.h"
 #include "net/WireEncoder.h"

ntcore/src/test/native/cpp/net/WireDecoderTest.cpp

@@ -2,6 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
@@ -9,7 +10,6 @@
 #include "../TestPrinters.h"
 #include "Handle.h"
 #include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "net/Message.h"
 #include "net/WireDecoder.h"
 #include "networktables/NetworkTableValue.h"

ntcore/src/test/native/cpp/net/WireEncoderTest.cpp

@@ -7,6 +7,7 @@
 #include <string_view>
 #include <vector>
 
+#include <gtest/gtest.h>
 #include <wpi/json.h>
 #include <wpi/raw_ostream.h>
 
@@ -15,7 +16,6 @@
 #include "Handle.h"
 #include "PubSubOptions.h"
 #include "gmock/gmock-matchers.h"
-#include "gtest/gtest.h"
 #include "net/Message.h"
 #include "net/WireEncoder.h"
 #include "networktables/NetworkTableValue.h"

ntcore/src/test/native/cpp/net3/WireDecoder3Test.cpp

@@ -9,11 +9,12 @@
 #include <string>
 #include <string_view>
 
+#include <gtest/gtest.h>
+
 #include "../SpanMatcher.h"
 #include "../TestPrinters.h"
 #include "../ValueMatcher.h"
 #include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "net3/WireDecoder3.h"
 #include "networktables/NetworkTableValue.h"
 

ntcore/src/test/native/cpp/net3/WireEncoder3Test.cpp

@@ -8,11 +8,11 @@
 #include <string_view>
 #include <vector>
 
+#include <gtest/gtest.h>
 #include <wpi/raw_ostream.h>
 
 #include "../SpanMatcher.h"
 #include "../TestPrinters.h"
-#include "gtest/gtest.h"
 #include "net3/Message3.h"
 #include "net3/WireEncoder3.h"
 #include "networktables/NetworkTableValue.h"

simulation/halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "DSCommPacket.h"
-#include "gtest/gtest.h"
 
 class DSCommPacketTest : public ::testing::Test {
  public:

simulation/halsim_ds_socket/src/test/native/cpp/main.cpp

@@ -2,10 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HALBase.h>
 
-#include "gtest/gtest.h"
-
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);
   ::testing::InitGoogleTest(&argc, argv);

simulation/halsim_gui/src/test/native/cpp/main.cpp

@@ -2,10 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HALBase.h>
 
-#include "gtest/gtest.h"
-
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);
   ::testing::InitGoogleTest(&argc, argv);

simulation/halsim_ws_server/src/test/native/cpp/main.cpp

@@ -5,6 +5,7 @@
 #include <thread>
 
 #include <fmt/format.h>
+#include <gtest/gtest.h>
 #include <hal/DriverStation.h>
 #include <hal/HALBase.h>
 #include <hal/Main.h>
@@ -13,7 +14,6 @@
 
 #include "HALSimWSServer.h"
 #include "WebServerClientTest.h"
-#include "gtest/gtest.h"
 
 namespace uv = wpi::uv;
 

wpilibNewCommands/.styleguide

@@ -17,6 +17,7 @@ includeOtherLibs {
   ^cscore
   ^fmt/
   ^frc/
+  ^gtest/
   ^hal/
   ^imgui
   ^mockdata/

wpilibNewCommands/src/test/native/cpp/frc2/command/CommandTestBase.h

@@ -9,13 +9,13 @@
 #include <utility>
 
 #include <frc/simulation/DriverStationSim.h>
+#include <gtest/gtest.h>
 
 #include "frc2/command/CommandHelper.h"
 #include "frc2/command/CommandScheduler.h"
 #include "frc2/command/SetUtilities.h"
 #include "frc2/command/Subsystem.h"
 #include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "make_vector.h"
 
 namespace frc2 {

wpilibNewCommands/src/test/native/cpp/frc2/command/CompositionTestBase.h

@@ -7,9 +7,10 @@
 #include <memory>
 #include <utility>
 
+#include <gtest/gtest.h>
+
 #include "CommandTestBase.h"
 #include "frc2/command/Commands.h"
-#include "gtest/gtest.h"
 #include "make_vector.h"
 
 namespace frc2 {

wpilibNewCommands/src/test/native/cpp/frc2/command/MecanumControllerCommandTest.cpp

@@ -16,9 +16,9 @@
 #include <frc/kinematics/MecanumDriveOdometry.h>
 #include <frc/simulation/SimHooks.h>
 #include <frc/trajectory/TrajectoryGenerator.h>
+#include <gtest/gtest.h>
 
 #include "CommandTestBase.h"
-#include "gtest/gtest.h"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
   EXPECT_LE(units::math::abs(val1 - val2), eps)

wpilibNewCommands/src/test/native/cpp/frc2/command/POVButtonTest.cpp

@@ -4,13 +4,13 @@
 
 #include <frc/Joystick.h>
 #include <frc/simulation/JoystickSim.h>
+#include <gtest/gtest.h>
 
 #include "CommandTestBase.h"
 #include "frc2/command/CommandScheduler.h"
 #include "frc2/command/RunCommand.h"
 #include "frc2/command/WaitUntilCommand.h"
 #include "frc2/command/button/POVButton.h"
-#include "gtest/gtest.h"
 
 using namespace frc2;
 class POVButtonTest : public CommandTestBase {};

wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp

@@ -2,11 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "CommandTestBase.h"
 #include "frc2/command/Command.h"
 #include "frc2/command/CommandHelper.h"
 #include "frc2/command/RunCommand.h"
-#include "gtest/gtest.h"
 
 using namespace frc2;
 

wpilibNewCommands/src/test/native/cpp/frc2/command/SwerveControllerCommandTest.cpp

@@ -17,9 +17,9 @@
 #include <frc/kinematics/SwerveModuleState.h>
 #include <frc/simulation/SimHooks.h>
 #include <frc/trajectory/TrajectoryGenerator.h>
+#include <gtest/gtest.h>
 
 #include "CommandTestBase.h"
-#include "gtest/gtest.h"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
   EXPECT_LE(units::math::abs(val1 - val2), eps)

wpilibNewCommands/src/test/native/cpp/frc2/command/button/NetworkButtonTest.cpp

@@ -2,6 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <networktables/NetworkTableInstance.h>
 
 #include "../CommandTestBase.h"
@@ -9,7 +10,6 @@
 #include "frc2/command/RunCommand.h"
 #include "frc2/command/WaitUntilCommand.h"
 #include "frc2/command/button/NetworkButton.h"
-#include "gtest/gtest.h"
 
 using namespace frc2;
 

wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp

@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <frc/simulation/SimHooks.h>
+#include <gtest/gtest.h>
 
 #include "../CommandTestBase.h"
 #include "frc2/command/CommandPtr.h"
@@ -11,7 +12,6 @@
 #include "frc2/command/RunCommand.h"
 #include "frc2/command/WaitUntilCommand.h"
 #include "frc2/command/button/Trigger.h"
-#include "gtest/gtest.h"
 
 using namespace frc2;
 class TriggerTest : public CommandTestBase {};

wpilibNewCommands/src/test/native/cpp/main.cpp

@@ -2,10 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HALBase.h>
 
-#include "gtest/gtest.h"
-
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);
   ::testing::InitGoogleTest(&argc, argv);

wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/AnalogPotentiometer.h"
 #include "frc/simulation/AnalogInputSim.h"
 #include "frc/simulation/RoboRioSim.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 using namespace frc::sim;

wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/DoubleSolenoid.h"
 #include "frc/PneumaticsControlModule.h"
 #include "frc/Solenoid.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 

wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/DoubleSolenoid.h"
 #include "frc/PneumaticsControlModule.h"
 #include "frc/Solenoid.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 

wpilibc/src/test/native/cpp/DriverStationTest.cpp

@@ -5,11 +5,12 @@
 #include <string>
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 #include "frc/DriverStation.h"
 #include "frc/Joystick.h"
 #include "frc/simulation/DriverStationSim.h"
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 class IsJoystickConnectedParametersTest
     : public ::testing::TestWithParam<std::tuple<int, int, int, bool>> {};

wpilibc/src/test/native/cpp/InterruptTest.cpp

@@ -4,13 +4,13 @@
 
 #include <atomic>
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/AsynchronousInterrupt.h"
 #include "frc/DigitalInput.h"
 #include "frc/Timer.h"
 #include "frc/simulation/DIOSim.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 using namespace frc::sim;

wpilibc/src/test/native/cpp/JoystickTest.cpp

@@ -4,9 +4,10 @@
 
 #include "frc/Joystick.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
+
 #include "JoystickTestMacros.h"
 #include "frc/simulation/JoystickSim.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/NotifierTest.cpp

@@ -4,9 +4,10 @@
 
 #include <atomic>
 
+#include <gtest/gtest.h>
+
 #include "frc/Notifier.h"
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/PS4ControllerTest.cpp

@@ -4,9 +4,10 @@
 
 #include "frc/PS4Controller.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
+
 #include "JoystickTestMacros.h"
 #include "frc/simulation/PS4ControllerSim.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/ScopedTracerTest.cpp

@@ -4,13 +4,13 @@
 
 #include <string_view>
 
+#include <gtest/gtest.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
 #include <wpi/raw_ostream.h>
 
 #include "frc/ScopedTracer.h"
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 TEST(ScopedTracerTest, Timing) {
   wpi::SmallString<128> buf;

wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/DoubleSolenoid.h"
 #include "frc/PneumaticsControlModule.h"
 #include "frc/Solenoid.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 TEST(SolenoidCTRETest, ValidInitialization) {

wpilibc/src/test/native/cpp/SolenoidTestREV.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/DoubleSolenoid.h"
 #include "frc/PneumaticsControlModule.h"
 #include "frc/Solenoid.h"
-#include "gtest/gtest.h"
 
 namespace frc {
 TEST(SolenoidREVTest, ValidInitialization) {

wpilibc/src/test/native/cpp/TimedRobotTest.cpp

@@ -9,10 +9,11 @@
 #include <atomic>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 #include "frc/livewindow/LiveWindow.h"
 #include "frc/simulation/DriverStationSim.h"
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/TimerTest.cpp

@@ -4,8 +4,9 @@
 
 #include "frc/Timer.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
+
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/TimesliceRobotTest.cpp

@@ -9,9 +9,10 @@
 #include <atomic>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 #include "frc/simulation/DriverStationSim.h"
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/UltrasonicTest.cpp

@@ -2,9 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "frc/Ultrasonic.h"
 #include "frc/simulation/UltrasonicSim.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/UnitNetworkTablesTest.cpp

@@ -2,13 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <networktables/DoubleTopic.h>
 #include <networktables/NetworkTableInstance.h>
 #include <networktables/UnitTopic.h>
 #include <units/length.h>
 
-#include "gtest/gtest.h"
-
 class UnitNetworkTablesTest : public ::testing::Test {
  public:
   UnitNetworkTablesTest() : inst{nt::NetworkTableInstance::Create()} {}

wpilibc/src/test/native/cpp/WatchdogTest.cpp

@@ -6,8 +6,9 @@
 
 #include <stdint.h>
 
+#include <gtest/gtest.h>
+
 #include "frc/simulation/SimHooks.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/XboxControllerTest.cpp

@@ -4,9 +4,10 @@
 
 #include "frc/XboxController.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
+
 #include "JoystickTestMacros.h"
 #include "frc/simulation/XboxControllerSim.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "frc/drive/DifferentialDrive.h"
-#include "gtest/gtest.h"
 #include "motorcontrol/MockMotorController.h"
 
 TEST(DifferentialDriveTest, ArcadeDriveIK) {

wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "frc/drive/MecanumDrive.h"
-#include "gtest/gtest.h"
 #include "motorcontrol/MockMotorController.h"
 
 TEST(MecanumDriveTest, CartesianIK) {

wpilibc/src/test/native/cpp/event/NetworkBooleanEventTest.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <networktables/BooleanTopic.h>
 #include <networktables/NetworkTableInstance.h>
 
 #include "frc/event/EventLoop.h"
 #include "frc/event/NetworkBooleanEvent.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/main.cpp

@@ -2,10 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <hal/HALBase.h>
 
-#include "gtest/gtest.h"
-
 #ifndef __FRC_ROBORIO__
 namespace frc::impl {
 void ResetMotorSafety();

wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp

@@ -7,7 +7,8 @@
 #include <memory>
 #include <vector>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "motorcontrol/MockMotorController.h"
 
 using namespace frc;

wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp

@@ -6,12 +6,12 @@
 
 #include <string_view>
 
+#include <gtest/gtest.h>
 #include <networktables/NetworkTableInstance.h>
 #include <networktables/NetworkTableListener.h>
 #include <networktables/StringTopic.h>
 
 #include "frc/shuffleboard/ShuffleboardInstance.h"
-#include "gtest/gtest.h"
 #include "shuffleboard/MockActuatorSendable.h"
 
 class NTWrapper {

wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardTest.cpp

@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
+
 #include "frc/shuffleboard/Shuffleboard.h"
-#include "gtest/gtest.h"
 
 TEST(ShuffleboardTest, TabObjectsCached) {
   auto& tab1 = frc::Shuffleboard::GetTab("testTabObjectsCached");

wpilibc/src/test/native/cpp/shuffleboard/SuppliedValueWidgetTest.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <gtest/gtest.h>
 #include <networktables/NetworkTableEntry.h>
 #include <networktables/NetworkTableInstance.h>
 
 #include "frc/shuffleboard/ShuffleboardInstance.h"
 #include "frc/shuffleboard/ShuffleboardTab.h"
-#include "gtest/gtest.h"
 
 using namespace frc;
 

wpilibc/src/test/native/cpp/simulation/ADXL345SimTest.cpp

@@ -4,11 +4,11 @@
 
 #include "frc/simulation/ADXL345Sim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/ADXL345_I2C.h"
 #include "frc/ADXL345_SPI.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/ADXL362SimTest.cpp

@@ -4,10 +4,10 @@
 
 #include "frc/simulation/ADXL362Sim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/ADXL362.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/ADXRS450_GyroSimTest.cpp

@@ -4,10 +4,10 @@
 
 #include "frc/simulation/ADXRS450_GyroSim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "frc/ADXRS450_Gyro.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/AccelerometerSimTest.cpp

@@ -4,12 +4,12 @@
 
 #include "frc/simulation/BuiltInAccelerometerSim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/Accelerometer.h>
 #include <hal/HAL.h>
 
 #include "callback_helpers/TestCallbackHelpers.h"
 #include "frc/BuiltInAccelerometer.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp

@@ -6,11 +6,11 @@
 
 #include <array>
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "callback_helpers/TestCallbackHelpers.h"
 #include "frc/AddressableLED.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp

@@ -4,13 +4,13 @@
 
 #include <numbers>
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 #include <units/math.h>
 
 #include "frc/AnalogEncoder.h"
 #include "frc/AnalogInput.h"
 #include "frc/simulation/AnalogEncoderSim.h"
-#include "gtest/gtest.h"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
   EXPECT_LE(units::math::abs(val1 - val2), eps)

wpilibc/src/test/native/cpp/simulation/AnalogGyroSimTest.cpp

@@ -4,12 +4,12 @@
 
 #include "frc/simulation/AnalogGyroSim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "callback_helpers/TestCallbackHelpers.h"
 #include "frc/AnalogGyro.h"
 #include "frc/AnalogInput.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp

@@ -4,11 +4,11 @@
 
 #include "frc/simulation/AnalogInputSim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "callback_helpers/TestCallbackHelpers.h"
 #include "frc/AnalogInput.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {
 

wpilibc/src/test/native/cpp/simulation/AnalogOutputSimTest.cpp

@@ -4,11 +4,11 @@
 
 #include "frc/simulation/AnalogOutputSim.h"  // NOLINT(build/include_order)
 
+#include <gtest/gtest.h>
 #include <hal/HAL.h>
 
 #include "callback_helpers/TestCallbackHelpers.h"
 #include "frc/AnalogOutput.h"
-#include "gtest/gtest.h"
 
 namespace frc::sim {