Move CameraServer and WPILib headers into their own folder

The old headers were moved into folders because doing so avoids polluting
the system include directories.

Folder names were also normalized to lowercase.

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

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXL345_I2C.h"
+#include "frc/ADXL345_I2C.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXL345_SPI.h"
+#include "frc/ADXL345_SPI.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXL362.h"
+#include "frc/ADXL362.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/DriverStation.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ADXRS450_Gyro.h"
+#include "frc/ADXRS450_Gyro.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
 
 using namespace frc;
 

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

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogAccelerometer.h"
+#include "frc/AnalogAccelerometer.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogGyro.h"
+#include "frc/AnalogGyro.h"
 
 #include <climits>
 
-#include <HAL/AnalogGyro.h>
-#include <HAL/Errors.h>
-#include <HAL/HAL.h>
+#include <hal/AnalogGyro.h>
+#include <hal/Errors.h>
+#include <hal/HAL.h>
 
-#include "AnalogInput.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/AnalogInput.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogInput.h"
+#include "frc/AnalogInput.h"
 
-#include <HAL/AnalogAccumulator.h>
-#include <HAL/AnalogInput.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 "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogOutput.h"
+#include "frc/AnalogOutput.h"
 
 #include <limits>
 
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogPotentiometer.h"
+#include "frc/AnalogPotentiometer.h"
 
-#include "RobotController.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/RobotController.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogTrigger.h"
+#include "frc/AnalogTrigger.h"
 
 #include <memory>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "AnalogInput.h"
-#include "WPIErrors.h"
+#include "frc/AnalogInput.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "AnalogTriggerOutput.h"
+#include "frc/AnalogTriggerOutput.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "AnalogTrigger.h"
-#include "WPIErrors.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "BuiltInAccelerometer.h"
+#include "frc/BuiltInAccelerometer.h"
 
-#include <HAL/Accelerometer.h>
-#include <HAL/HAL.h>
+#include <hal/Accelerometer.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/CAN.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "CAN.h"
+#include "frc/CAN.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Compressor.h"
+#include "frc/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 "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ControllerPower.h"
+#include "frc/ControllerPower.h"
 
 #include <stdint.h>
 
-#include <HAL/HAL.h>
-#include <HAL/Power.h>
+#include <hal/HAL.h>
+#include <hal/Power.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 

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

@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Counter.h"
+#include "frc/Counter.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "AnalogTrigger.h"
-#include "DigitalInput.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/DigitalInput.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/DMC60.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DMC60.h"
+#include "frc/DMC60.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

@@ -5,20 +5,20 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalGlitchFilter.h"
+#include "frc/DigitalGlitchFilter.h"
 
 #include <algorithm>
 #include <array>
 
-#include <HAL/Constants.h>
-#include <HAL/DIO.h>
-#include <HAL/HAL.h>
+#include <hal/Constants.h>
+#include <hal/DIO.h>
+#include <hal/HAL.h>
 
-#include "Counter.h"
-#include "Encoder.h"
-#include "SensorUtil.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Counter.h"
+#include "frc/Encoder.h"
+#include "frc/SensorUtil.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalInput.h"
+#include "frc/DigitalInput.h"
 
 #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 "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DigitalOutput.h"
+#include "frc/DigitalOutput.h"
 
 #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 "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DoubleSolenoid.h"
+#include "frc/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 "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,24 +5,24 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "DriverStation.h"
+#include "frc/DriverStation.h"
 
 #include <chrono>
 
-#include <HAL/HAL.h>
-#include <HAL/Power.h>
-#include <HAL/cpp/Log.h>
+#include <hal/HAL.h>
+#include <hal/Power.h>
+#include <hal/cpp/Log.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableEntry.h>
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringRef.h>
 
-#include "AnalogInput.h"
-#include "MotorSafetyHelper.h"
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/AnalogInput.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 namespace frc {
 

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

@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Encoder.h"
+#include "frc/Encoder.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DigitalInput.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/DigitalInput.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Error.h"
+#include "frc/Error.h"
 
 #include <wpi/Path.h>
 
-#include "DriverStation.h"
-#include "Timer.h"
-#include "Utility.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/ErrorBase.cpp

@@ -5,20 +5,20 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
 #include <set>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <wpi/Format.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
 #define WPI_ERRORS_DEFINE_STRINGS
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/GamepadBase.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GamepadBase.h"
+#include "frc/GamepadBase.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/GearTooth.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GearTooth.h"
+#include "frc/GearTooth.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "WPIErrors.h"
+#include "frc/DriverStation.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/GyroBase.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "GyroBase.h"
+#include "frc/GyroBase.h"
 
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

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

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

@@ -5,12 +5,12 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "InterruptableSensorBase.h"
+#include "frc/InterruptableSensorBase.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "IterativeRobot.h"
+#include "frc/IterativeRobot.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
+#include "frc/DriverStation.h"
 
 using namespace frc;
 

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

@@ -5,19 +5,19 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "IterativeRobotBase.h"
+#include "frc/IterativeRobotBase.h"
 
 #include <cstdio>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "Commands/Scheduler.h"
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SmartDashboard.h"
 
 using namespace frc;
 

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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Jaguar.h"
+#include "frc/Jaguar.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Joystick.h"
+#include "frc/Joystick.h"
 
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "WPIErrors.h"
+#include "frc/DriverStation.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/JoystickBase.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "JoystickBase.h"
+#include "frc/JoystickBase.h"
 
 using namespace frc;
 

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "MotorSafetyHelper.h"
+#include "frc/MotorSafetyHelper.h"
 
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "DriverStation.h"
-#include "MotorSafety.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/DriverStation.h"
+#include "frc/MotorSafety.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/NidecBrushless.cpp

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "NidecBrushless.h"
+#include "frc/NidecBrushless.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Notifier.h"
+#include "frc/Notifier.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/PIDBase.cpp

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDBase.h"
+#include "frc/PIDBase.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "PIDOutput.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/PIDOutput.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDController.h"
+#include "frc/PIDController.h"
 
-#include "Notifier.h"
-#include "PIDOutput.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/Notifier.h"
+#include "frc/PIDOutput.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/PIDSource.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PIDSource.h"
+#include "frc/PIDSource.h"
 
 using namespace frc;
 

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

@@ -5,16 +5,16 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWM.h"
+#include "frc/PWM.h"
 
-#include <HAL/HAL.h>
-#include <HAL/PWM.h>
-#include <HAL/Ports.h>
+#include <hal/HAL.h>
+#include <hal/PWM.h>
+#include <hal/Ports.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/PWMSpeedController.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/PWMTalonSRX.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWMTalonSRX.h"
+#include "frc/PWMTalonSRX.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/PWMVictorSPX.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PWMVictorSPX.h"
+#include "frc/PWMVictorSPX.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "PowerDistributionPanel.h"
+#include "frc/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 <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Preferences.h"
+#include "frc/Preferences.h"
 
 #include <algorithm>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 #include <networktables/NetworkTableInstance.h>
 #include <wpi/StringRef.h>
 
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Relay.h"
+#include "frc/Relay.h"
 
-#include <HAL/HAL.h>
-#include <HAL/Ports.h>
-#include <HAL/Relay.h>
+#include <hal/HAL.h>
+#include <hal/Ports.h>
+#include <hal/Relay.h>
 #include <wpi/raw_ostream.h>
 
-#include "MotorSafetyHelper.h"
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Resource.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Resource.h"
+#include "frc/Resource.h"
 
-#include "ErrorBase.h"
-#include "WPIErrors.h"
+#include "frc/ErrorBase.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,21 +5,21 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotBase.h"
+#include "frc/RobotBase.h"
 
 #include <cstdio>
 
-#include <HAL/HAL.h>
+#include <cameraserver/CameraServerShared.h>
+#include <hal/HAL.h>
 #include <networktables/NetworkTableInstance.h>
 
-#include "CameraServerShared.h"
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "RobotState.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Utility.h"
-#include "WPIErrors.h"
 #include "WPILibVersion.h"
+#include "frc/DriverStation.h"
+#include "frc/RobotState.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SmartDashboard.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/RobotController.cpp

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotController.h"
+#include "frc/RobotController.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 

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

@@ -5,18 +5,18 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotDrive.h"
+#include "frc/RobotDrive.h"
 
 #include <algorithm>
 #include <cmath>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "GenericHID.h"
-#include "Joystick.h"
-#include "Talon.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/GenericHID.h"
+#include "frc/Joystick.h"
+#include "frc/Talon.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/RobotState.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "RobotState.h"
+#include "frc/RobotState.h"
 
-#include "DriverStation.h"
+#include "frc/DriverStation.h"
 
 using namespace frc;
 

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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SD540.h"
+#include "frc/SD540.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

@@ -5,18 +5,18 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SPI.h"
+#include "frc/SPI.h"
 
 #include <cstring>
 
-#include <HAL/HAL.h>
-#include <HAL/SPI.h>
+#include <hal/HAL.h>
+#include <hal/SPI.h>
 #include <wpi/SmallVector.h>
 #include <wpi/mutex.h>
 
-#include "DigitalSource.h"
-#include "Notifier.h"
-#include "WPIErrors.h"
+#include "frc/DigitalSource.h"
+#include "frc/Notifier.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/SafePWM.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SafePWM.h"
+#include "frc/SafePWM.h"
 
 using namespace frc;
 

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

@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SampleRobot.h"
+#include "frc/SampleRobot.h"
 
 #include <networktables/NetworkTable.h>
 #include <wpi/raw_ostream.h>
 
-#include "DriverStation.h"
-#include "LiveWindow/LiveWindow.h"
-#include "Timer.h"
+#include "frc/DriverStation.h"
+#include "frc/Timer.h"
+#include "frc/livewindow/LiveWindow.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/SensorUtil.cpp

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SensorUtil.h"
+#include "frc/SensorUtil.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>
 
 using namespace frc;
 

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

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SerialPort.h"
+#include "frc/SerialPort.h"
 
-#include <HAL/HAL.h>
-#include <HAL/SerialPort.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/Servo.cpp

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Servo.h"
+#include "frc/Servo.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Solenoid.h"
+#include "frc/Solenoid.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 "SensorUtil.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/SensorUtil.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

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

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SolenoidBase.h"
+#include "frc/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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Spark.h"
+#include "frc/Spark.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/SpeedControllerGroup.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SpeedControllerGroup.h"
+#include "frc/SpeedControllerGroup.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/SynchronousPID.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "SynchronousPID.h"
+#include "frc/SynchronousPID.h"
 
 using namespace frc;
 

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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Talon.h"
+#include "frc/Talon.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

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

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "TimedRobot.h"
+#include "frc/TimedRobot.h"
 
 #include <stdint.h>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

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

@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Timer.h"
+#include "frc/Timer.h"
 
 #include <chrono>
 #include <thread>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "DriverStation.h"
-#include "RobotController.h"
+#include "frc/DriverStation.h"
+#include "frc/RobotController.h"
 
 namespace frc {
 

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

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Ultrasonic.h"
+#include "frc/Ultrasonic.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Counter.h"
-#include "DigitalInput.h"
-#include "DigitalOutput.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Timer.h"
-#include "Utility.h"
-#include "WPIErrors.h"
+#include "frc/Counter.h"
+#include "frc/DigitalInput.h"
+#include "frc/DigitalOutput.h"
+#include "frc/Timer.h"
+#include "frc/Utility.h"
+#include "frc/WPIErrors.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Utility.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Utility.h"
+#include "frc/Utility.h"
 
 #ifndef _WIN32
 #include <cxxabi.h>
@@ -16,13 +16,13 @@
 #include <cstdlib>
 #include <cstring>
 
+#include <hal/DriverStation.h>
+#include <hal/HAL.h>
 #include <wpi/Path.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
 
-#include "ErrorBase.h"
-#include "HAL/DriverStation.h"
-#include "HAL/HAL.h"
+#include "frc/ErrorBase.h"
 
 using namespace frc;
 

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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Victor.h"
+#include "frc/Victor.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "VictorSP.h"
+#include "frc/VictorSP.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/Watchdog.cpp

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Watchdog.h"
+#include "frc/Watchdog.h"
 
 #include <wpi/raw_ostream.h>
 
-#include "Timer.h"
+#include "frc/Timer.h"
 
 using namespace frc;
 

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

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "XboxController.h"
+#include "frc/XboxController.h"
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/Button.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/Button.h"
+#include "frc/buttons/Button.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/ButtonScheduler.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
-#include "Commands/Scheduler.h"
+#include "frc/commands/Scheduler.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/CancelButtonScheduler.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/CancelButtonScheduler.h"
+#include "frc/buttons/CancelButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/HeldButtonScheduler.h"
+#include "frc/buttons/HeldButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/InternalButton.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/InternalButton.h"
+#include "frc/buttons/InternalButton.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/JoystickButton.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/JoystickButton.h"
+#include "frc/buttons/JoystickButton.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/NetworkButton.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/NetworkButton.h"
+#include "frc/buttons/NetworkButton.h"
 
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>

wpilibc/src/main/native/cpp/buttons/PressedButtonScheduler.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/PressedButtonScheduler.h"
+#include "frc/buttons/PressedButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/ReleasedButtonScheduler.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/ReleasedButtonScheduler.h"
+#include "frc/buttons/ReleasedButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/ToggleButtonScheduler.cpp

@@ -5,10 +5,10 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/ToggleButtonScheduler.h"
+#include "frc/buttons/ToggleButtonScheduler.h"
 
-#include "Buttons/Button.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Button.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/buttons/Trigger.cpp

@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Buttons/Button.h"
-#include "Buttons/CancelButtonScheduler.h"
-#include "Buttons/HeldButtonScheduler.h"
-#include "Buttons/PressedButtonScheduler.h"
-#include "Buttons/ReleasedButtonScheduler.h"
-#include "Buttons/ToggleButtonScheduler.h"
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/buttons/Button.h"
+#include "frc/buttons/CancelButtonScheduler.h"
+#include "frc/buttons/HeldButtonScheduler.h"
+#include "frc/buttons/PressedButtonScheduler.h"
+#include "frc/buttons/ReleasedButtonScheduler.h"
+#include "frc/buttons/ToggleButtonScheduler.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/Command.cpp

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 #include <typeinfo>
 
-#include "Commands/CommandGroup.h"
-#include "Commands/Scheduler.h"
-#include "LiveWindow/LiveWindow.h"
-#include "RobotState.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "Timer.h"
-#include "WPIErrors.h"
+#include "frc/RobotState.h"
+#include "frc/Timer.h"
+#include "frc/WPIErrors.h"
+#include "frc/commands/CommandGroup.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/CommandGroup.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CommandGroup.h"
+#include "frc/commands/CommandGroup.h"
 
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/CommandGroupEntry.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/CommandGroupEntry.h"
+#include "frc/commands/CommandGroupEntry.h"
 
-#include "Commands/Command.h"
+#include "frc/commands/Command.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/ConditionalCommand.cpp

@@ -5,11 +5,11 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/ConditionalCommand.h"
+#include "frc/commands/ConditionalCommand.h"
 
 #include <iostream>
 
-#include "Commands/Scheduler.h"
+#include "frc/commands/Scheduler.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/InstantCommand.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/InstantCommand.h"
+#include "frc/commands/InstantCommand.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/PIDCommand.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PIDCommand.h"
+#include "frc/commands/PIDCommand.h"
 
-#include "SmartDashboard/SendableBuilder.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/PIDSubsystem.cpp

@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PIDSubsystem.h"
+#include "frc/commands/PIDSubsystem.h"
 
-#include "PIDController.h"
+#include "frc/PIDController.h"
 
 using namespace frc;
 

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

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/PrintCommand.h"
+#include "frc/commands/PrintCommand.h"
 
 #include <wpi/raw_ostream.h>
 

wpilibc/src/main/native/cpp/commands/Scheduler.cpp

@@ -5,17 +5,17 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Scheduler.h"
+#include "frc/commands/Scheduler.h"
 
 #include <algorithm>
 #include <set>
 
-#include <HAL/HAL.h>
+#include <hal/HAL.h>
 
-#include "Buttons/ButtonScheduler.h"
-#include "Commands/Subsystem.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/buttons/ButtonScheduler.h"
+#include "frc/commands/Subsystem.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/StartCommand.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/StartCommand.h"
+#include "frc/commands/StartCommand.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/Subsystem.cpp

@@ -5,13 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/Subsystem.h"
+#include "frc/commands/Subsystem.h"
 
-#include "Commands/Command.h"
-#include "Commands/Scheduler.h"
-#include "LiveWindow/LiveWindow.h"
-#include "SmartDashboard/SendableBuilder.h"
-#include "WPIErrors.h"
+#include "frc/WPIErrors.h"
+#include "frc/commands/Command.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/livewindow/LiveWindow.h"
+#include "frc/smartdashboard/SendableBuilder.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/TimedCommand.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/TimedCommand.h"
+#include "frc/commands/TimedCommand.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/commands/WaitCommand.cpp

@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "Commands/WaitCommand.h"
+#include "frc/commands/WaitCommand.h"
 
 using namespace frc;