Classify other libraries' headers properly and fix committed formatting issues (#620)

wpilibc/src/main/native/cpp/ADXL345_I2C.cpp

@@ -7,7 +7,8 @@
 
 #include "ADXL345_I2C.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "I2C.h"
 #include "LiveWindow/LiveWindow.h"
 

wpilibc/src/main/native/cpp/ADXL345_SPI.cpp

@@ -7,9 +7,10 @@
 
 #include "ADXL345_SPI.h"
 
+#include <HAL/HAL.h>
+
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/ADXL362.cpp

@@ -7,10 +7,11 @@
 
 #include "ADXL362.h"
 
+#include <HAL/HAL.h>
+
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/ADXRS450_Gyro.cpp

@@ -7,8 +7,9 @@
 
 #include "ADXRS450_Gyro.h"
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
 

wpilibc/src/main/native/cpp/AnalogAccelerometer.cpp

@@ -7,7 +7,8 @@
 
 #include "AnalogAccelerometer.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/src/main/native/cpp/AnalogGyro.cpp

@@ -6,13 +6,14 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogGyro.h"
-#include "HAL/AnalogGyro.h"
 
 #include <climits>
 
+#include <HAL/AnalogGyro.h>
+#include <HAL/Errors.h>
+#include <HAL/HAL.h>
+
 #include "AnalogInput.h"
-#include "HAL/Errors.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
 #include "WPIErrors.h"

wpilibc/src/main/native/cpp/AnalogInput.cpp

@@ -6,16 +6,17 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogInput.h"
-#include "HAL/AnalogInput.h"
 
-#include "HAL/AnalogAccumulator.h"
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/AnalogAccumulator.h>
+#include <HAL/AnalogInput.h>
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/AnalogOutput.cpp

@@ -9,12 +9,13 @@
 
 #include <limits>
 
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/AnalogTrigger.cpp

@@ -9,8 +9,9 @@
 
 #include <memory>
 
+#include <HAL/HAL.h>
+
 #include "AnalogInput.h"
-#include "HAL/HAL.h"
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/AnalogTriggerOutput.cpp

@@ -7,8 +7,9 @@
 
 #include "AnalogTriggerOutput.h"
 
+#include <HAL/HAL.h>
+
 #include "AnalogTrigger.h"
-#include "HAL/HAL.h"
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/BuiltInAccelerometer.cpp

@@ -7,8 +7,9 @@
 
 #include "BuiltInAccelerometer.h"
 
-#include "HAL/Accelerometer.h"
-#include "HAL/HAL.h"
+#include <HAL/Accelerometer.h>
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/src/main/native/cpp/CameraServer.cpp

@@ -7,10 +7,11 @@
 
 #include "CameraServer.h"
 
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "Utility.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 #include "ntcore_cpp.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/Commands/PrintCommand.cpp

@@ -7,7 +7,7 @@
 
 #include "Commands/PrintCommand.h"
 
-#include "llvm/raw_ostream.h"
+#include <llvm/raw_ostream.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Compressor.cpp

@@ -6,11 +6,12 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Compressor.h"
-#include "HAL/Compressor.h"
 
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
-#include "HAL/Solenoid.h"
+#include <HAL/Compressor.h>
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <HAL/Solenoid.h>
+
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/ControllerPower.cpp

@@ -9,9 +9,10 @@
 
 #include <stdint.h>
 
+#include <HAL/HAL.h>
+#include <HAL/Power.h>
+
 #include "ErrorBase.h"
-#include "HAL/HAL.h"
-#include "HAL/Power.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Counter.cpp

@@ -7,9 +7,10 @@
 
 #include "Counter.h"
 
+#include <HAL/HAL.h>
+
 #include "AnalogTrigger.h"
 #include "DigitalInput.h"
-#include "HAL/HAL.h"
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp

@@ -10,11 +10,12 @@
 #include <algorithm>
 #include <array>
 
+#include <HAL/Constants.h>
+#include <HAL/DIO.h>
+#include <HAL/HAL.h>
+
 #include "Counter.h"
 #include "Encoder.h"
-#include "HAL/Constants.h"
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
 #include "Utility.h"
 #include "WPIErrors.h"
 

wpilibc/src/main/native/cpp/DigitalInput.cpp

@@ -9,13 +9,14 @@
 
 #include <limits>
 
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/DIO.h>
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/DigitalOutput.cpp

@@ -9,12 +9,13 @@
 
 #include <limits>
 
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/DIO.h>
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/DoubleSolenoid.cpp

@@ -7,13 +7,14 @@
 
 #include "DoubleSolenoid.h"
 
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
-#include "HAL/Solenoid.h"
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <HAL/Solenoid.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/DriverStation.cpp

@@ -9,15 +9,16 @@
 
 #include <chrono>
 
+#include <HAL/HAL.h>
+#include <HAL/Power.h>
+#include <HAL/cpp/Log.h>
+#include <llvm/SmallString.h>
+
 #include "AnalogInput.h"
-#include "HAL/HAL.h"
-#include "HAL/Power.h"
-#include "HAL/cpp/Log.h"
 #include "MotorSafetyHelper.h"
 #include "Timer.h"
 #include "Utility.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Encoder.cpp

@@ -7,8 +7,9 @@
 
 #include "Encoder.h"
 
+#include <HAL/HAL.h>
+
 #include "DigitalInput.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/src/main/native/cpp/Error.cpp

@@ -7,12 +7,13 @@
 
 #include "Error.h"
 
+#include <llvm/Path.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "DriverStation.h"
 #include "Timer.h"
 #include "Utility.h"
-#include "llvm/Path.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/GenericHID.cpp

@@ -7,8 +7,9 @@
 
 #include "GenericHID.h"
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/I2C.cpp

@@ -5,10 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/I2C.h"
 #include "I2C.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+#include <HAL/I2C.h>
+
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/Internal/HardwareHLReporting.cpp

@@ -7,7 +7,7 @@
 
 #include "Internal/HardwareHLReporting.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/InterruptableSensorBase.cpp

@@ -7,7 +7,8 @@
 
 #include "InterruptableSensorBase.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "Utility.h"
 #include "WPIErrors.h"
 

wpilibc/src/main/native/cpp/IterativeRobot.cpp

@@ -7,8 +7,9 @@
 
 #include "IterativeRobot.h"
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/IterativeRobotBase.cpp

@@ -9,9 +9,10 @@
 
 #include <cstdio>
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Jaguar.cpp

@@ -7,7 +7,8 @@
 
 #include "Jaguar.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/Joystick.cpp

@@ -9,8 +9,9 @@
 
 #include <cmath>
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/LiveWindow/LiveWindow.cpp

@@ -9,8 +9,9 @@
 
 #include <algorithm>
 
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "networktables/NetworkTable.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/MotorSafetyHelper.cpp

@@ -7,12 +7,13 @@
 
 #include "MotorSafetyHelper.h"
 
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "DriverStation.h"
 #include "MotorSafety.h"
 #include "Timer.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Notifier.cpp

@@ -7,7 +7,8 @@
 
 #include "Notifier.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "Timer.h"
 #include "Utility.h"
 #include "WPIErrors.h"

wpilibc/src/main/native/cpp/PIDController.cpp

@@ -10,7 +10,8 @@
 #include <cmath>
 #include <vector>
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "Notifier.h"
 #include "PIDOutput.h"
 #include "PIDSource.h"

wpilibc/src/main/native/cpp/PWM.cpp

@@ -5,15 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/PWM.h"
 #include "PWM.h"
 
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/HAL.h>
+#include <HAL/PWM.h>
+#include <HAL/Ports.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "Utility.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp

@@ -7,13 +7,14 @@
 
 #include "PowerDistributionPanel.h"
 
-#include "HAL/HAL.h"
-#include "HAL/PDP.h"
-#include "HAL/Ports.h"
+#include <HAL/HAL.h>
+#include <HAL/PDP.h>
+#include <HAL/Ports.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Preferences.cpp

@@ -9,9 +9,10 @@
 
 #include <algorithm>
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+#include <llvm/StringRef.h>
+
 #include "WPIErrors.h"
-#include "llvm/StringRef.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Relay.cpp

@@ -5,15 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Relay.h"
 #include "Relay.h"
 
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <HAL/Relay.h>
+#include <llvm/SmallString.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "MotorSafetyHelper.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/RobotBase.cpp

@@ -9,8 +9,9 @@
 
 #include <cstdio>
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 #include "HLUsageReporting.h"
 #include "Internal/HardwareHLReporting.h"
 #include "LiveWindow/LiveWindow.h"

wpilibc/src/main/native/cpp/RobotDrive.cpp

@@ -10,8 +10,9 @@
 #include <algorithm>
 #include <cmath>
 
+#include <HAL/HAL.h>
+
 #include "GenericHID.h"
-#include "HAL/HAL.h"
 #include "Joystick.h"
 #include "Talon.h"
 #include "Utility.h"

wpilibc/src/main/native/cpp/SD540.cpp

@@ -7,7 +7,8 @@
 
 #include "SD540.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/SPI.cpp

@@ -5,14 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/SPI.h"
 #include "SPI.h"
 
 #include <cstring>
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+#include <HAL/SPI.h>
+#include <llvm/SmallVector.h>
+
 #include "WPIErrors.h"
-#include "llvm/SmallVector.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/SampleRobot.cpp

@@ -7,10 +7,11 @@
 
 #include "SampleRobot.h"
 
+#include <llvm/raw_ostream.h>
+
 #include "DriverStation.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
-#include "llvm/raw_ostream.h"
 #include "networktables/NetworkTable.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/SensorBase.cpp

@@ -7,15 +7,16 @@
 
 #include "SensorBase.h"
 
-#include "HAL/AnalogInput.h"
-#include "HAL/AnalogOutput.h"
-#include "HAL/DIO.h"
-#include "HAL/HAL.h"
-#include "HAL/PDP.h"
-#include "HAL/PWM.h"
-#include "HAL/Ports.h"
-#include "HAL/Relay.h"
-#include "HAL/Solenoid.h"
+#include <HAL/AnalogInput.h>
+#include <HAL/AnalogOutput.h>
+#include <HAL/DIO.h>
+#include <HAL/HAL.h>
+#include <HAL/PDP.h>
+#include <HAL/PWM.h>
+#include <HAL/Ports.h>
+#include <HAL/Relay.h>
+#include <HAL/Solenoid.h>
+
 #include "WPIErrors.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/SerialPort.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/SerialPort.h"
 #include "SerialPort.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+#include <HAL/SerialPort.h>
 
 // static ViStatus _VI_FUNCH ioCompleteHandler (ViSession vi, ViEventType
 // eventType, ViEvent event, ViAddr userHandle);

wpilibc/src/main/native/cpp/Solenoid.cpp

@@ -5,15 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Solenoid.h"
 #include "Solenoid.h"
 
-#include "HAL/HAL.h"
-#include "HAL/Ports.h"
+#include <HAL/HAL.h>
+#include <HAL/Ports.h>
+#include <HAL/Solenoid.h>
+#include <llvm/SmallString.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/SolenoidBase.cpp

@@ -7,8 +7,8 @@
 
 #include "SolenoidBase.h"
 
-#include "HAL/HAL.h"
-#include "HAL/Solenoid.h"
+#include <HAL/HAL.h>
+#include <HAL/Solenoid.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Spark.cpp

@@ -7,7 +7,8 @@
 
 #include "Spark.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/Talon.cpp

@@ -7,7 +7,8 @@
 
 #include "Talon.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/TalonSRX.cpp

@@ -7,7 +7,8 @@
 
 #include "TalonSRX.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/Threads.cpp

@@ -5,11 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/Threads.h"
 #include "Threads.h"
 
+#include <HAL/HAL.h>
+#include <HAL/Threads.h>
+
 #include "ErrorBase.h"
-#include "HAL/HAL.h"
 
 namespace frc {
 /**

wpilibc/src/main/native/cpp/TimedRobot.cpp

@@ -9,7 +9,7 @@
 
 #include <chrono>
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Timer.cpp

@@ -10,8 +10,9 @@
 #include <chrono>
 #include <thread>
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 #include "Utility.h"
 
 namespace frc {

wpilibc/src/main/native/cpp/Ultrasonic.cpp

@@ -7,10 +7,11 @@
 
 #include "Ultrasonic.h"
 
+#include <HAL/HAL.h>
+
 #include "Counter.h"
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
-#include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
 #include "Utility.h"

wpilibc/src/main/native/cpp/Victor.cpp

@@ -7,7 +7,8 @@
 
 #include "Victor.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/VictorSP.cpp

@@ -7,7 +7,8 @@
 
 #include "VictorSP.h"
 
-#include "HAL/HAL.h"
+#include <HAL/HAL.h>
+
 #include "LiveWindow/LiveWindow.h"
 
 using namespace frc;

wpilibc/src/main/native/cpp/XboxController.cpp

@@ -7,8 +7,9 @@
 
 #include "XboxController.h"
 
+#include <HAL/HAL.h>
+
 #include "DriverStation.h"
-#include "HAL/HAL.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/vision/VisionRunner.cpp

@@ -7,9 +7,10 @@
 
 #include "vision/VisionRunner.h"
 
+#include <opencv2/core/mat.hpp>
+
 #include "DriverStation.h"
 #include "RobotBase.h"
-#include "opencv2/core/mat.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/include/AnalogGyro.h

@@ -9,8 +9,9 @@
 
 #include <memory>
 
+#include <HAL/Types.h>
+
 #include "GyroBase.h"
-#include "HAL/Types.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/AnalogInput.h

@@ -12,7 +12,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"

wpilibc/src/main/native/include/AnalogOutput.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/AnalogOutput.h"
+#include <HAL/AnalogOutput.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 

wpilibc/src/main/native/include/AnalogTrigger.h

@@ -9,8 +9,9 @@
 
 #include <memory>
 
+#include <HAL/Types.h>
+
 #include "AnalogTriggerOutput.h"
-#include "HAL/Types.h"
 #include "SensorBase.h"
 
 namespace frc {

wpilibc/src/main/native/include/AnalogTriggerOutput.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
+#include <HAL/AnalogTrigger.h>
+
 #include "DigitalSource.h"
-#include "HAL/AnalogTrigger.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Base.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "HAL/cpp/make_unique.h"
+#include <HAL/cpp/make_unique.h>
 
 // MSVC 2013 doesn't allow "= default" on move constructors, but since we are
 // (currently) only actually using the move constructors in non-MSVC situations

wpilibc/src/main/native/include/CameraServer.h

@@ -15,11 +15,12 @@
 #include <string>
 #include <vector>
 
+#include <llvm/DenseMap.h>
+#include <llvm/StringMap.h>
+#include <llvm/StringRef.h>
+
 #include "ErrorBase.h"
 #include "cscore.h"
-#include "llvm/DenseMap.h"
-#include "llvm/StringMap.h"
-#include "llvm/StringRef.h"
 #include "networktables/NetworkTable.h"
 
 namespace frc {

wpilibc/src/main/native/include/Commands/Scheduler.h

@@ -14,9 +14,10 @@
 #include <string>
 #include <vector>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "Commands/Command.h"
 #include "ErrorBase.h"
-#include "HAL/cpp/priority_mutex.h"
 #include "SmartDashboard/NamedSendable.h"
 #include "SmartDashboard/SmartDashboard.h"
 #include "networktables/NetworkTable.h"

wpilibc/src/main/native/include/Compressor.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/Counter.h

@@ -10,10 +10,11 @@
 #include <memory>
 #include <string>
 
+#include <HAL/Counter.h>
+#include <HAL/Types.h>
+
 #include "AnalogTrigger.h"
 #include "CounterBase.h"
-#include "HAL/Counter.h"
-#include "HAL/Types.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 

wpilibc/src/main/native/include/DigitalGlitchFilter.h

@@ -11,8 +11,9 @@
 
 #include <array>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "DigitalSource.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/DigitalOutput.h

@@ -10,8 +10,9 @@
 #include <memory>
 #include <string>
 
+#include <HAL/Types.h>
+
 #include "DigitalSource.h"
-#include "HAL/Types.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "tables/ITableListener.h"
 

wpilibc/src/main/native/include/DigitalSource.h

@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "InterruptableSensorBase.h"
 
 namespace frc {

wpilibc/src/main/native/include/DoubleSolenoid.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SolenoidBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/DriverStation.h

@@ -12,11 +12,12 @@
 #include <string>
 #include <thread>
 
-#include "HAL/DriverStation.h"
-#include "HAL/cpp/priority_mutex.h"
+#include <HAL/DriverStation.h>
+#include <HAL/cpp/priority_mutex.h>
+#include <llvm/StringRef.h>
+
 #include "RobotState.h"
 #include "SensorBase.h"
-#include "llvm/StringRef.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Encoder.h

@@ -10,9 +10,10 @@
 #include <memory>
 #include <string>
 
+#include <HAL/Encoder.h>
+
 #include "Counter.h"
 #include "CounterBase.h"
-#include "HAL/Encoder.h"
 #include "LiveWindow/LiveWindowSendable.h"
 #include "PIDSource.h"
 #include "SensorBase.h"

wpilibc/src/main/native/include/Error.h

@@ -11,8 +11,7 @@
 
 #include <string>
 
-#include "Base.h"
-#include "llvm/StringRef.h"
+#include <llvm/StringRef.h>
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -20,6 +19,8 @@
 #undef GetMessage
 #endif
 
+#include "Base.h"
+
 namespace frc {
 
 //  Forward declarations

wpilibc/src/main/native/include/ErrorBase.h

@@ -7,10 +7,11 @@
 
 #pragma once
 
+#include <HAL/cpp/priority_mutex.h>
+#include <llvm/StringRef.h>
+
 #include "Base.h"
 #include "Error.h"
-#include "HAL/cpp/priority_mutex.h"
-#include "llvm/StringRef.h"
 
 #define wpi_setErrnoErrorWithContext(context) \
   this->SetErrnoError((context), __FILE__, __FUNCTION__, __LINE__)

wpilibc/src/main/native/include/InterruptableSensorBase.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
+#include <HAL/Interrupts.h>
+
 #include "AnalogTriggerType.h"
-#include "HAL/Interrupts.h"
 #include "SensorBase.h"
 
 namespace frc {

wpilibc/src/main/native/include/MotorSafety.h

@@ -9,7 +9,7 @@
 
 #define DEFAULT_SAFETY_EXPIRATION 0.1
 
-#include "llvm/raw_ostream.h"
+#include <llvm/raw_ostream.h>
 
 namespace frc {
 

wpilibc/src/main/native/include/MotorSafetyHelper.h

@@ -9,8 +9,9 @@
 
 #include <set>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "ErrorBase.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Notifier.h

@@ -13,9 +13,10 @@
 #include <functional>
 #include <utility>
 
+#include <HAL/Notifier.h>
+#include <HAL/cpp/priority_mutex.h>
+
 #include "ErrorBase.h"
-#include "HAL/Notifier.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/PIDController.h

@@ -12,9 +12,10 @@
 #include <queue>
 #include <string>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "Base.h"
 #include "Controller.h"
-#include "HAL/cpp/priority_mutex.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Notifier.h"
 #include "PIDInterface.h"

wpilibc/src/main/native/include/PWM.h

@@ -12,7 +12,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SensorBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/Relay.h

@@ -10,11 +10,12 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+#include <llvm/raw_ostream.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "MotorSafety.h"
 #include "SensorBase.h"
-#include "llvm/raw_ostream.h"
 #include "tables/ITable.h"
 #include "tables/ITableListener.h"
 

wpilibc/src/main/native/include/Resource.h

@@ -13,8 +13,9 @@
 #include <string>
 #include <vector>
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "ErrorBase.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/RobotBase.h

@@ -9,9 +9,10 @@
 
 #include <thread>
 
+#include <HAL/HAL.h>
+#include <llvm/raw_ostream.h>
+
 #include "Base.h"
-#include "HAL/HAL.h"
-#include "llvm/raw_ostream.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/RobotDrive.h

@@ -9,10 +9,11 @@
 
 #include <memory>
 
+#include <llvm/raw_ostream.h>
+
 #include "ErrorBase.h"
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
-#include "llvm/raw_ostream.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/SafePWM.h

@@ -9,10 +9,11 @@
 
 #include <memory>
 
+#include <llvm/raw_ostream.h>
+
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
 #include "PWM.h"
-#include "llvm/raw_ostream.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/SerialPort.h

@@ -9,8 +9,9 @@
 
 #include <string>
 
+#include <llvm/StringRef.h>
+
 #include "ErrorBase.h"
-#include "llvm/StringRef.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/SmartDashboard/SendableChooser.h

@@ -10,9 +10,10 @@
 #include <memory>
 #include <string>
 
+#include <llvm/StringMap.h>
+#include <llvm/StringRef.h>
+
 #include "SmartDashboard/SendableChooserBase.h"
-#include "llvm/StringMap.h"
-#include "llvm/StringRef.h"
 #include "tables/ITable.h"
 
 namespace frc {

wpilibc/src/main/native/include/Solenoid.h

@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "HAL/Types.h"
+#include <HAL/Types.h>
+
 #include "LiveWindow/LiveWindowSendable.h"
 #include "SolenoidBase.h"
 #include "tables/ITableListener.h"

wpilibc/src/main/native/include/Timer.h

@@ -7,8 +7,9 @@
 
 #pragma once
 
+#include <HAL/cpp/priority_mutex.h>
+
 #include "Base.h"
-#include "HAL/cpp/priority_mutex.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/Utility.h

@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "llvm/StringRef.h"
+#include <llvm/StringRef.h>
 
 #define wpi_assert(condition) \
   wpi_assert_impl(condition, #condition, "", __FILE__, __LINE__, __FUNCTION__)