Fixed include order (#245)

See wpilibsuite/styleguide (#11).

.styleguide

@@ -53,3 +53,19 @@ modifiableFileExclude {
   \.py$
   \.so$
 }
+
+includeRelated {
+}
+
+includeCSys {
+}
+
+includeCppSys {
+}
+
+includeOtherLibs {
+}
+
+includeProject {
+  ^ctre/
+}

hal/include/HAL/AnalogAccumulator.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_Bool HAL_IsAccumulatorChannel(HAL_AnalogInputHandle analogPortHandle,
                                   int32_t* status);
 void HAL_InitAccumulator(HAL_AnalogInputHandle analogPortHandle,

hal/include/HAL/AnalogGyro.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_GyroHandle HAL_InitializeAnalogGyro(HAL_AnalogInputHandle handle,
                                         int32_t* status);
 void HAL_SetupAnalogGyro(HAL_GyroHandle handle, int32_t* status);

hal/include/HAL/AnalogInput.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_AnalogInputHandle HAL_InitializeAnalogInputPort(HAL_PortHandle portHandle,
                                                     int32_t* status);
 void HAL_FreeAnalogInputPort(HAL_AnalogInputHandle analogPortHandle);

hal/include/HAL/AnalogOutput.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_AnalogOutputHandle HAL_InitializeAnalogOutputPort(HAL_PortHandle portHandle,
                                                       int32_t* status);
 void HAL_FreeAnalogOutputPort(HAL_AnalogOutputHandle analogOutputHandle);

hal/include/HAL/Compressor.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_CompressorHandle HAL_InitializeCompressor(int32_t module, int32_t* status);
 HAL_Bool HAL_CheckCompressorModule(int32_t module);
 

hal/include/HAL/Constants.h

@@ -12,6 +12,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 int32_t HAL_GetSystemClockTicksPerMicrosecond(void);
 #ifdef __cplusplus
 }

hal/include/HAL/DIO.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_DigitalHandle HAL_InitializeDIOPort(HAL_PortHandle portHandle,
                                         HAL_Bool input, int32_t* status);
 HAL_Bool HAL_CheckDIOChannel(int32_t channel);

hal/include/HAL/I2C.h

@@ -12,6 +12,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 void HAL_InitializeI2C(int32_t port, int32_t* status);
 int32_t HAL_TransactionI2C(int32_t port, int32_t deviceAddress,
                            uint8_t* dataToSend, int32_t sendSize,

hal/include/HAL/Interrupts.h

@@ -15,6 +15,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 typedef void (*HAL_InterruptHandlerFunction)(uint32_t interruptAssertedMask,
                                              void* param);
 

hal/include/HAL/Notifier.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 typedef void (*HAL_NotifierProcessFunction)(uint64_t currentTime,
                                             HAL_NotifierHandle handle);
 

hal/include/HAL/PDP.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 void HAL_InitializePDP(int32_t module, int32_t* status);
 HAL_Bool HAL_CheckPDPChannel(int32_t channel);
 HAL_Bool HAL_CheckPDPModule(int32_t module);

hal/include/HAL/PWM.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_DigitalHandle HAL_InitializePWMPort(HAL_PortHandle portHandle,
                                         int32_t* status);
 void HAL_FreePWMPort(HAL_DigitalHandle pwmPortHandle, int32_t* status);

hal/include/HAL/Ports.h

@@ -12,6 +12,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 int32_t HAL_GetNumAccumulators(void);
 int32_t HAL_GetNumAnalogTriggers(void);
 int32_t HAL_GetNumAnalogInputs(void);

hal/include/HAL/Power.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 double HAL_GetVinVoltage(int32_t* status);
 double HAL_GetVinCurrent(int32_t* status);
 double HAL_GetUserVoltage6V(int32_t* status);

hal/include/HAL/Relay.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_RelayHandle HAL_InitializeRelayPort(HAL_PortHandle portHandle, HAL_Bool fwd,
                                         int32_t* status);
 void HAL_FreeRelayPort(HAL_RelayHandle relayPortHandle);

hal/include/HAL/SPI.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 void HAL_InitializeSPI(int32_t port, int32_t* status);
 int32_t HAL_TransactionSPI(int32_t port, uint8_t* dataToSend,
                            uint8_t* dataReceived, int32_t size);

hal/include/HAL/SerialPort.h

@@ -12,6 +12,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 void HAL_InitializeSerialPort(int32_t port, int32_t* status);
 void HAL_SetSerialBaudRate(int32_t port, int32_t baud, int32_t* status);
 void HAL_SetSerialDataBits(int32_t port, int32_t bits, int32_t* status);

hal/include/HAL/Solenoid.h

@@ -14,6 +14,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 HAL_SolenoidHandle HAL_InitializeSolenoidPort(HAL_PortHandle portHandle,
                                               int32_t* status);
 void HAL_FreeSolenoidPort(HAL_SolenoidHandle solenoidPortHandle);

hal/include/HAL/cpp/make_unique.h

@@ -13,6 +13,7 @@
 #include <memory>
 #include <type_traits>
 #include <utility>
+
 namespace std {
 template <class T>
 struct _Unique_if {

hal/lib/athena/ChipObject.h

@@ -10,15 +10,15 @@
 #pragma GCC diagnostic ignored "-Wpedantic"
 #pragma GCC diagnostic ignored "-Wignored-qualifiers"
 
+#include "FRC_FPGA_ChipObject/tDMAChannelDescriptor.h"  // NOLINT
+#include "FRC_FPGA_ChipObject/tDMAManager.h"            // NOLINT
+#include "FRC_FPGA_ChipObject/tInterruptManager.h"      // NOLINT
+#include "FRC_FPGA_ChipObject/tSystem.h"                // NOLINT
+#include "FRC_FPGA_ChipObject/tSystemInterface.h"       // NOLINT
+
 #include <stdint.h>
 
 #include "FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h"
-#include "FRC_FPGA_ChipObject/tDMAChannelDescriptor.h"
-#include "FRC_FPGA_ChipObject/tDMAManager.h"
-#include "FRC_FPGA_ChipObject/tInterruptManager.h"
-#include "FRC_FPGA_ChipObject/tSystem.h"
-#include "FRC_FPGA_ChipObject/tSystemInterface.h"
-
 #include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h"
 #include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h"
 #include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h"

hal/lib/athena/Interrupts.cpp

@@ -10,7 +10,6 @@
 #include <memory>
 
 #include "ChipObject.h"
-
 #include "DigitalInternal.h"
 #include "HAL/Errors.h"
 #include "HAL/cpp/make_unique.h"

hal/lib/athena/PCMInternal.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <memory>
 
 #include "HAL/Errors.h"

simulation/frc_gazebo_plugins/limit_switch/src/external_limit_switch.h

@@ -7,16 +7,16 @@
 
 #pragma once
 
-#ifdef _WIN32
-#include <Winsock2.h>
-#endif
-
 #include <boost/pointer_cast.hpp>
 #include <gazebo/gazebo.hh>
 #include <gazebo/sensors/sensors.hh>
 
 #include "switch.h"
 
+#ifdef _WIN32
+#include <Winsock2.h>
+#endif
+
 using namespace gazebo;
 
 class ExternalLimitSwitch : public Switch {

simulation/frc_gazebo_plugins/limit_switch/src/internal_limit_switch.h

@@ -7,15 +7,15 @@
 
 #pragma once
 
-#ifdef _WIN32
-#include <Winsock2.h>
-#endif
-
 #include <gazebo/gazebo.hh>
 #include <gazebo/physics/physics.hh>
 
 #include "switch.h"
 
+#ifdef _WIN32
+#include <Winsock2.h>
+#endif
+
 using namespace gazebo;
 
 class InternalLimitSwitch : public Switch {

simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp

@@ -7,16 +7,16 @@
 
 #include "pneumatic_piston.h"
 
+#include <boost/algorithm/string/replace.hpp>
+#include <gazebo/physics/physics.hh>
+#include <gazebo/transport/transport.hh>
+
 #ifdef _WIN32
 // Ensure that Winsock2.h is included before Windows.h, which can get
 // pulled in by anybody (e.g., Boost).
 #include <Winsock2.h>
 #endif
 
-#include <boost/algorithm/string/replace.hpp>
-#include <gazebo/physics/physics.hh>
-#include <gazebo/transport/transport.hh>
-
 GZ_REGISTER_MODEL_PLUGIN(PneumaticPiston)
 
 void PneumaticPiston::Load(physics::ModelPtr model, sdf::ElementPtr sdf) {

simulation/frc_gazebo_plugins/potentiometer/src/potentiometer.cpp

@@ -7,16 +7,16 @@
 
 #include "potentiometer.h"
 
+#include <boost/algorithm/string/replace.hpp>
+#include <gazebo/physics/physics.hh>
+#include <gazebo/transport/transport.hh>
+
 #ifdef _WIN32
 // Ensure that Winsock2.h is included before Windows.h, which can get
 // pulled in by anybody (e.g., Boost).
 #include <Winsock2.h>
 #endif
 
-#include <boost/algorithm/string/replace.hpp>
-#include <gazebo/physics/physics.hh>
-#include <gazebo/transport/transport.hh>
-
 GZ_REGISTER_MODEL_PLUGIN(Potentiometer)
 
 void Potentiometer::Load(physics::ModelPtr model, sdf::ElementPtr sdf) {

simulation/frc_gazebo_plugins/rangefinder/src/rangefinder.cpp

@@ -7,17 +7,17 @@
 
 #include "rangefinder.h"
 
+#include <boost/algorithm/string/replace.hpp>
+#include <gazebo/physics/physics.hh>
+#include <gazebo/sensors/sensors.hh>
+#include <gazebo/transport/transport.hh>
+
 #ifdef _WIN32
 // Ensure that Winsock2.h is included before Windows.h, which can get
 // pulled in by anybody (e.g., Boost).
 #include <Winsock2.h>
 #endif
 
-#include <boost/algorithm/string/replace.hpp>
-#include <gazebo/physics/physics.hh>
-#include <gazebo/sensors/sensors.hh>
-#include <gazebo/transport/transport.hh>
-
 GZ_REGISTER_MODEL_PLUGIN(Rangefinder)
 
 void Rangefinder::Load(physics::ModelPtr model, sdf::ElementPtr sdf) {

simulation/frc_gazebo_plugins/servo/src/servo.cpp

@@ -7,16 +7,16 @@
 
 #include "servo.h"
 
+#include <boost/algorithm/string/replace.hpp>
+#include <gazebo/physics/physics.hh>
+#include <gazebo/transport/transport.hh>
+
 #ifdef _WIN32
 // Ensure that Winsock2.h is included before Windows.h, which can get
 // pulled in by anybody (e.g., Boost).
 #include <Winsock2.h>
 #endif
 
-#include <boost/algorithm/string/replace.hpp>
-#include <gazebo/physics/physics.hh>
-#include <gazebo/transport/transport.hh>
-
 GZ_REGISTER_MODEL_PLUGIN(Servo)
 
 void Servo::Load(physics::ModelPtr model, sdf::ElementPtr sdf) {

wpilibc/athena/include/Vision/BinaryImage.h

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "MonoImage.h"
+
 /**
  * Included for ParticleAnalysisReport definition
  * TODO: Eliminate this dependency!

wpilibc/athena/include/WPILib.h

@@ -94,8 +94,7 @@
 #include "Vision/MonoImage.h"
 #include "Vision/RGBImage.h"
 #include "Vision/Threshold.h"
+#include "WPIErrors.h"
 #include "interfaces/Accelerometer.h"
 #include "interfaces/Gyro.h"
 #include "interfaces/Potentiometer.h"
-// XXX: #include "Vision/AxisCamera.h"
-#include "WPIErrors.h"

wpilibc/athena/src/ADXL345_I2C.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "ADXL345_I2C.h"
+
 #include "HAL/HAL.h"
 #include "I2C.h"
 #include "LiveWindow/LiveWindow.h"

wpilibc/athena/src/ADXL345_SPI.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "ADXL345_SPI.h"
+
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
 #include "HAL/HAL.h"

wpilibc/athena/src/ADXL362.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "ADXL362.h"
+
 #include "DigitalInput.h"
 #include "DigitalOutput.h"
 #include "DriverStation.h"

wpilibc/athena/src/ADXRS450_Gyro.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "ADXRS450_Gyro.h"
+
 #include "DriverStation.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"

wpilibc/athena/src/AnalogAccelerometer.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogAccelerometer.h"
+
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"

wpilibc/athena/src/AnalogPotentiometer.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogPotentiometer.h"
+
 #include "ControllerPower.h"
 
 /**

wpilibc/athena/src/AnalogTriggerOutput.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogTriggerOutput.h"
+
 #include "AnalogTrigger.h"
 #include "HAL/HAL.h"
 #include "WPIErrors.h"

wpilibc/athena/src/BuiltInAccelerometer.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "BuiltInAccelerometer.h"
+
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"

wpilibc/athena/src/Encoder.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Encoder.h"
+
 #include "DigitalInput.h"
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"

wpilibc/athena/src/GearTooth.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "GearTooth.h"
+
 #include "LiveWindow/LiveWindow.h"
 
 constexpr double GearTooth::kGearToothThreshold;

wpilibc/athena/src/I2C.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "I2C.h"
+
 #include "HAL/HAL.h"
 #include "WPIErrors.h"
 

wpilibc/athena/src/Internal/HardwareHLReporting.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Internal/HardwareHLReporting.h"
+
 #include "HAL/HAL.h"
 
 void HardwareHLReporting::ReportScheduler() {

wpilibc/athena/src/Jaguar.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Jaguar.h"
+
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 

wpilibc/athena/src/Notifier.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Notifier.h"
+
 #include "HAL/HAL.h"
 #include "Timer.h"
 #include "Utility.h"

wpilibc/athena/src/Timer.cpp

@@ -10,6 +10,7 @@
 #include <chrono>
 #include <iostream>
 #include <thread>
+
 #include "HAL/HAL.h"
 #include "Utility.h"
 

wpilibc/athena/src/USBCamera.cpp

@@ -7,8 +7,6 @@
 
 #include "USBCamera.h"
 
-#include "Utility.h"
-
 #include <chrono>
 #include <cstdlib>
 #include <iomanip>
@@ -17,6 +15,8 @@
 #include <regex>
 #include <thread>
 
+#include "Utility.h"
+
 // This macro expands the given imaq function to ensure that it is called and
 // properly checked for an error, calling the wpi_setImaqErrorWithContext
 // macro

wpilibc/athena/src/Vision/FrcError.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Vision/FrcError.h"
+
 #include "nivision.h"
 
 /**

wpilibc/athena/src/Vision/ImageBase.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Vision/ImageBase.h"
+
 #include "nivision.h"
 
 /**

wpilibc/athena/src/Vision/MonoImage.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Vision/MonoImage.h"
+
 #include "nivision.h"
 
 MonoImage::MonoImage() : ImageBase(IMAQ_IMAGE_U8) {}

wpilibc/athena/src/Vision/VisionAPI.cpp

@@ -5,11 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "Vision/VisionAPI.h"
+
 #include <cstdarg>
 
 #include "Vision/BaeUtilities.h"
 #include "Vision/FrcError.h"
-#include "Vision/VisionAPI.h"
 
 int VisionAPI_debugFlag = 1;
 #define DPRINTF \

wpilibc/shared/include/Buttons/NetworkButton.h

@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <string>
+
 #include "Buttons/Button.h"
 
 class NetworkButton : public Button {

wpilibc/shared/include/Commands/Command.h

@@ -10,6 +10,7 @@
 #include <memory>
 #include <set>
 #include <string>
+
 #include "ErrorBase.h"
 #include "SmartDashboard/NamedSendable.h"
 #include "tables/ITableListener.h"

wpilibc/shared/include/Commands/PrintCommand.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <string>
+
 #include "Commands/Command.h"
 
 class PrintCommand : public Command {

wpilibc/shared/include/Commands/Scheduler.h

@@ -13,6 +13,7 @@
 #include <set>
 #include <string>
 #include <vector>
+
 #include "Commands/Command.h"
 #include "ErrorBase.h"
 #include "HAL/cpp/priority_mutex.h"

wpilibc/shared/include/Commands/Subsystem.h

@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <string>
+
 #include "ErrorBase.h"
 #include "SmartDashboard/NamedSendable.h"
 

wpilibc/shared/include/Error.h

@@ -7,7 +7,12 @@
 
 #pragma once
 
+#include <stdint.h>
+
+#include <string>
+
 #include "Base.h"
+#include "llvm/StringRef.h"
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -15,10 +20,6 @@
 #undef GetMessage
 #endif
 
-#include <stdint.h>
-#include <string>
-#include "llvm/StringRef.h"
-
 //  Forward declarations
 class ErrorBase;
 

wpilibc/shared/include/ErrorBase.h

@@ -9,7 +9,6 @@
 
 #include "Base.h"
 #include "Error.h"
-
 #include "HAL/cpp/priority_mutex.h"
 #include "llvm/StringRef.h"
 

wpilibc/shared/include/Filters/Filter.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "PIDSource.h"
 
 /**

wpilibc/shared/include/Filters/LinearDigitalFilter.h

@@ -10,6 +10,7 @@
 #include <initializer_list>
 #include <memory>
 #include <vector>
+
 #include "CircularBuffer.h"
 #include "Filter.h"
 

wpilibc/shared/include/SmartDashboard/NamedSendable.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <string>
+
 #include "SmartDashboard/Sendable.h"
 
 /**

wpilibc/shared/include/SmartDashboard/Sendable.h

@@ -9,6 +9,7 @@
 
 #include <memory>
 #include <string>
+
 #include "tables/ITable.h"
 
 class Sendable {

wpilibc/shared/include/SmartDashboard/SendableChooser.h

@@ -10,6 +10,7 @@
 #include <map>
 #include <memory>
 #include <string>
+
 #include "SmartDashboard/Sendable.h"
 #include "tables/ITable.h"
 

wpilibc/shared/include/Task.h

@@ -10,6 +10,7 @@
 #include <iostream>
 #include <string>
 #include <thread>
+
 #include "ErrorBase.h"
 #include "HAL/Task.h"
 

wpilibc/shared/include/Utility.h

@@ -12,6 +12,7 @@
  */
 
 #include <stdint.h>
+
 #include <string>
 
 #define wpi_assert(condition) \

wpilibc/shared/src/Buttons/NetworkButton.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Buttons/NetworkButton.h"
+
 #include "networktables/NetworkTable.h"
 
 NetworkButton::NetworkButton(const std::string& tableName,

wpilibc/shared/src/Buttons/Trigger.cpp

@@ -6,7 +6,6 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Buttons/Button.h"
-
 #include "Buttons/CancelButtonScheduler.h"
 #include "Buttons/HeldButtonScheduler.h"
 #include "Buttons/PressedButtonScheduler.h"

wpilibc/shared/src/Commands/Command.cpp

@@ -6,7 +6,9 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Commands/Command.h"
+
 #include <typeinfo>
+
 #include "Commands/CommandGroup.h"
 #include "Commands/Scheduler.h"
 #include "RobotState.h"

wpilibc/shared/src/Commands/CommandGroup.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Commands/CommandGroup.h"
+
 #include "WPIErrors.h"
 
 /**

wpilibc/shared/src/Commands/PIDCommand.cpp

@@ -7,7 +7,7 @@
 
 #include "Commands/PIDCommand.h"
 
-#include "float.h"
+#include <cfloat>
 
 PIDCommand::PIDCommand(const std::string& name, double p, double i, double d,
                        double f, double period)

wpilibc/shared/src/Commands/PIDSubsystem.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Commands/PIDSubsystem.h"
+
 #include "PIDController.h"
 
 /**

wpilibc/shared/src/Commands/Scheduler.cpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <iostream>
 #include <set>
+
 #include "Buttons/ButtonScheduler.h"
 #include "Commands/Subsystem.h"
 #include "HLUsageReporting.h"

wpilibc/shared/src/Commands/WaitCommand.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Commands/WaitCommand.h"
+
 #include <sstream>
 
 WaitCommand::WaitCommand(double timeout)

wpilibc/shared/src/Commands/WaitForChildren.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Commands/WaitForChildren.h"
+
 #include "Commands/CommandGroup.h"
 
 WaitForChildren::WaitForChildren(double timeout)

wpilibc/shared/src/Commands/WaitUntilCommand.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Commands/WaitUntilCommand.h"
+
 #include "Timer.h"
 
 /**

wpilibc/shared/src/GyroBase.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "GyroBase.h"
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 

wpilibc/shared/src/LiveWindow/LiveWindow.cpp

@@ -6,8 +6,10 @@
 /*----------------------------------------------------------------------------*/
 
 #include "LiveWindow/LiveWindow.h"
+
 #include <algorithm>
 #include <sstream>
+
 #include "networktables/NetworkTable.h"
 
 /**

wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "LiveWindow/LiveWindowStatusListener.h"
+
 #include "Commands/Scheduler.h"
 
 void LiveWindowStatusListener::ValueChanged(ITable* source, llvm::StringRef key,

wpilibc/shared/src/Resource.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Resource.h"
+
 #include "ErrorBase.h"
 #include "WPIErrors.h"
 

wpilibc/shared/src/interfaces/Potentiometer.cpp

@@ -5,8 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "interfaces/Potentiometer.h"
+
 #include <Utility.h>
-#include <interfaces/Potentiometer.h>
 
 void Potentiometer::SetPIDSourceType(PIDSourceType pidSource) {
   if (wpi_assert(pidSource == PIDSourceType::kDisplacement)) {

wpilibc/sim/include/DriverStation.h

@@ -7,12 +7,6 @@
 
 #pragma once
 
-#ifdef _WIN32
-// Ensure that Winsock2.h is included before Windows.h, which can get
-// pulled in by anybody (e.g., Boost).
-#include <Winsock2.h>
-#endif
-
 #include <condition_variable>
 #include <mutex>
 #include <string>
@@ -23,6 +17,12 @@
 #include "SensorBase.h"
 #include "simulation/gz_msgs/msgs.h"
 
+#ifdef _WIN32
+// Ensure that Winsock2.h is included before Windows.h, which can get
+// pulled in by anybody (e.g., Boost).
+#include <Winsock2.h>
+#endif
+
 struct HALCommonControlData;
 class AnalogInput;
 

wpilibc/sim/include/Joystick.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "ErrorBase.h"
 #include "GenericHID.h"
 

wpilibc/sim/include/RobotDrive.h

@@ -10,6 +10,7 @@
 #include <stdint.h>
 
 #include <memory>
+
 #include "ErrorBase.h"
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"

wpilibc/sim/include/SafePWM.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
 #include "PWM.h"

wpilibc/sim/include/WPILib.h

@@ -9,15 +9,17 @@
 
 #define SIMULATION "gazebo"
 
+#include <cstring>
 #include <iostream>
-#include "string.h"
 
+#include "AnalogGyro.h"
+#include "AnalogInput.h"
+#include "AnalogPotentiometer.h"
 #include "Buttons/Button.h"
 #include "Buttons/InternalButton.h"
 #include "Buttons/JoystickButton.h"
 #include "Buttons/NetworkButton.h"
 #include "Buttons/Trigger.h"
-
 #include "Commands/Command.h"
 #include "Commands/CommandGroup.h"
 #include "Commands/PIDCommand.h"
@@ -29,13 +31,6 @@
 #include "Commands/WaitCommand.h"
 #include "Commands/WaitForChildren.h"
 #include "Commands/WaitUntilCommand.h"
-
-#include "SmartDashboard/SendableChooser.h"
-#include "SmartDashboard/SmartDashboard.h"
-
-#include "AnalogGyro.h"
-#include "AnalogInput.h"
-#include "AnalogPotentiometer.h"
 #include "Counter.h"
 #include "DigitalInput.h"
 #include "DoubleSolenoid.h"
@@ -49,6 +44,8 @@
 #include "RobotBase.h"
 #include "RobotDrive.h"
 #include "SampleRobot.h"
+#include "SmartDashboard/SendableChooser.h"
+#include "SmartDashboard/SmartDashboard.h"
 #include "Solenoid.h"
 #include "SpeedController.h"
 #include "Talon.h"

wpilibc/sim/include/simulation/SimContinuousOutput.h

@@ -7,18 +7,18 @@
 
 #pragma once
 
-#ifdef _WIN32
-// Ensure that Winsock2.h is included before Windows.h, which can get
-// pulled in by anybody (e.g., Boost).
-#include <Winsock2.h>
-#endif
-
 #include <string>
 
 #include <gazebo/transport/transport.hh>
 
 #include "SpeedController.h"
 
+#ifdef _WIN32
+// Ensure that Winsock2.h is included before Windows.h, which can get
+// pulled in by anybody (e.g., Boost).
+#include <Winsock2.h>
+#endif
+
 using namespace gazebo;
 
 class SimContinuousOutput {

wpilibc/sim/include/simulation/simTime.h

@@ -7,17 +7,17 @@
 
 #pragma once
 
+#include <condition_variable>
+#include <mutex>
+
+#include "simulation/SimFloatInput.h"
+
 #ifdef _WIN32
 // Ensure that Winsock2.h is included before Windows.h, which can get
 // pulled in by anybody (e.g., Boost).
 #include <Winsock2.h>
 #endif
 
-#include <condition_variable>
-#include <mutex>
-
-#include "simulation/SimFloatInput.h"
-
 namespace wpilib {
 namespace internal {
 extern double simTime;

wpilibc/sim/src/Jaguar.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Jaguar.h"
+
 #include "LiveWindow/LiveWindow.h"
 
 /**

wpilibc/sim/src/MotorSafetyHelper.cpp

@@ -7,13 +7,13 @@
 
 #include "MotorSafetyHelper.h"
 
+#include <sstream>
+
 #include "DriverStation.h"
 #include "MotorSafety.h"
 #include "Timer.h"
 #include "WPIErrors.h"
 
-#include <sstream>
-
 std::set<MotorSafetyHelper*> MotorSafetyHelper::m_helperList;
 priority_recursive_mutex MotorSafetyHelper::m_listMutex;
 

wpilibc/sim/src/Notifier.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Notifier.h"
+
 #include "Timer.h"
 #include "Utility.h"
 #include "WPIErrors.h"

wpilibc/sim/src/SafePWM.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "SafePWM.h"
+
 #include <memory>
 #include <sstream>
 

wpilibc/sim/src/simulation/SimContinuousOutput.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "simulation/SimContinuousOutput.h"
+
 #include "simulation/MainNode.h"
 
 SimContinuousOutput::SimContinuousOutput(std::string topic) {

wpilibc/sim/src/simulation/SimDigitalInput.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "simulation/SimDigitalInput.h"
+
 #include "simulation/MainNode.h"
 
 SimDigitalInput::SimDigitalInput(std::string topic) {

wpilibc/sim/src/simulation/SimEncoder.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "simulation/SimEncoder.h"
+
 #include "simulation/MainNode.h"
 
 SimEncoder::SimEncoder(std::string topic) {

wpilibc/sim/src/simulation/SimFloatInput.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "simulation/SimFloatInput.h"
+
 #include "simulation/MainNode.h"
 
 SimFloatInput::SimFloatInput(std::string topic) {

wpilibc/sim/src/simulation/SimGyro.cpp

@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include "simulation/SimGyro.h"
+
 #include "simulation/MainNode.h"
 
 SimGyro::SimGyro(std::string topic) {

wpilibcIntegrationTests/src/AnalogPotentiometerTest.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogPotentiometer.h"
+#include "AnalogPotentiometer.h"  // NOLINT(build/include_order)
 
 #include "AnalogOutput.h"
 #include "ControllerPower.h"

wpilibcIntegrationTests/src/BuiltInAccelerometerTest.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "BuiltInAccelerometer.h"
+#include "BuiltInAccelerometer.h"  // NOLINT(build/include_order)
 
 #include "Timer.h"
 #include "gtest/gtest.h"

wpilibcIntegrationTests/src/CANJaguarTest.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "CANJaguar.h"
+#include "CANJaguar.h"  // NOLINT(build/include_order)
 
 #include <cmath>
 

wpilibcIntegrationTests/src/CANTalonTest.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "CANTalon.h"
+#include "CANTalon.h"  // NOLINT(build/include_order)
 
 #include "TestBench.h"
 #include "Timer.h"