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/include/WPILib.h

@@ -1,99 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/* Copyright (c) 2008-2018 FIRST. All Rights Reserved.                        */
-/* Open Source Software - may be modified and shared by FRC teams. The code   */
-/* must be accompanied by the FIRST BSD license file in the root directory of */
-/* the project.                                                               */
-/*----------------------------------------------------------------------------*/
-
-#pragma once
-
-#include "ADXL345_I2C.h"
-#include "ADXL345_SPI.h"
-#include "ADXL362.h"
-#include "ADXRS450_Gyro.h"
-#include "AnalogAccelerometer.h"
-#include "AnalogGyro.h"
-#include "AnalogInput.h"
-#include "AnalogOutput.h"
-#include "AnalogPotentiometer.h"
-#include "AnalogTrigger.h"
-#include "AnalogTriggerOutput.h"
-#include "BuiltInAccelerometer.h"
-#include "Buttons/InternalButton.h"
-#include "Buttons/JoystickButton.h"
-#include "Buttons/NetworkButton.h"
-#include "CameraServer.h"
-#include "Commands/Command.h"
-#include "Commands/CommandGroup.h"
-#include "Commands/PIDCommand.h"
-#include "Commands/PIDSubsystem.h"
-#include "Commands/PrintCommand.h"
-#include "Commands/Scheduler.h"
-#include "Commands/StartCommand.h"
-#include "Commands/Subsystem.h"
-#include "Commands/WaitCommand.h"
-#include "Commands/WaitForChildren.h"
-#include "Commands/WaitUntilCommand.h"
-#include "Compressor.h"
-#include "ControllerPower.h"
-#include "Counter.h"
-#include "DMC60.h"
-#include "DigitalInput.h"
-#include "DigitalOutput.h"
-#include "DigitalSource.h"
-#include "DoubleSolenoid.h"
-#include "Drive/DifferentialDrive.h"
-#include "Drive/KilloughDrive.h"
-#include "Drive/MecanumDrive.h"
-#include "DriverStation.h"
-#include "Encoder.h"
-#include "ErrorBase.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "GearTooth.h"
-#include "GenericHID.h"
-#include "I2C.h"
-#include "InterruptableSensorBase.h"
-#include "IterativeRobot.h"
-#include "Jaguar.h"
-#include "Joystick.h"
-#include "NidecBrushless.h"
-#include "Notifier.h"
-#include "PIDController.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
-#include "PWM.h"
-#include "PWMSpeedController.h"
-#include "PWMTalonSRX.h"
-#include "PWMVictorSPX.h"
-#include "PowerDistributionPanel.h"
-#include "Preferences.h"
-#include "Relay.h"
-#include "RobotBase.h"
-#include "RobotController.h"
-#include "RobotDrive.h"
-#include "SD540.h"
-#include "SPI.h"
-#include "SampleRobot.h"
-#include "SensorUtil.h"
-#include "SerialPort.h"
-#include "Servo.h"
-#include "SmartDashboard/SendableChooser.h"
-#include "SmartDashboard/SmartDashboard.h"
-#include "Solenoid.h"
-#include "Spark.h"
-#include "SpeedController.h"
-#include "SpeedControllerGroup.h"
-#include "Talon.h"
-#include "Threads.h"
-#include "TimedRobot.h"
-#include "Timer.h"
-#include "Ultrasonic.h"
-#include "Utility.h"
-#include "Victor.h"
-#include "VictorSP.h"
-#include "WPIErrors.h"
-#include "XboxController.h"
-#include "interfaces/Accelerometer.h"
-#include "interfaces/Gyro.h"
-#include "interfaces/Potentiometer.h"
-#include "vision/VisionRunner.h"

wpilibc/src/main/native/include/frc/ADXL345_I2C.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "I2C.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/I2C.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/ADXL345_SPI.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SPI.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/SPI.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/ADXL362.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SPI.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/SPI.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/ADXRS450_Gyro.h

@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 
-#include "GyroBase.h"
-#include "SPI.h"
+#include "frc/GyroBase.h"
+#include "frc/SPI.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/AnalogAccelerometer.h

@@ -9,10 +9,10 @@
 
 #include <memory>
 
-#include "AnalogInput.h"
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogInput.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

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

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

@@ -9,11 +9,11 @@
 
 #include <stdint.h>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <HAL/AnalogOutput.h>
+#include <hal/AnalogOutput.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/AnalogPotentiometer.h

@@ -9,10 +9,10 @@
 
 #include <memory>
 
-#include "AnalogInput.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Potentiometer.h"
+#include "frc/AnalogInput.h"
+#include "frc/ErrorBase.h"
+#include "frc/interfaces/Potentiometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -9,11 +9,11 @@
 
 #include <memory>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "AnalogTriggerOutput.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogTriggerOutput.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

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

wpilibc/src/main/native/include/frc/BuiltInAccelerometer.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Accelerometer.h"
+#include "frc/ErrorBase.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/CAN.h

@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include <HAL/CANAPI.h>
+#include <hal/CANAPI.h>
 #include <wpi/ArrayRef.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 struct CANData {

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

@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "SensorUtil.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/SensorUtil.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -9,13 +9,13 @@
 
 #include <memory>
 
-#include <HAL/Counter.h>
-#include <HAL/Types.h>
+#include <hal/Counter.h>
+#include <hal/Types.h>
 
-#include "AnalogTrigger.h"
-#include "CounterBase.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/CounterBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/DMC60.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

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

@@ -13,9 +13,9 @@
 
 #include <wpi/mutex.h>
 
-#include "DigitalSource.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/DigitalSource.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/DigitalInput.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "DigitalSource.h"
+#include "frc/DigitalSource.h"
 
 namespace frc {
 

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

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

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

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

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

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

@@ -13,14 +13,14 @@
 #include <string>
 #include <thread>
 
-#include <HAL/DriverStation.h>
+#include <hal/DriverStation.h>
 #include <wpi/Twine.h>
 #include <wpi/condition_variable.h>
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
-#include "RobotState.h"
+#include "frc/ErrorBase.h"
+#include "frc/RobotState.h"
 
 namespace frc {
 

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

@@ -9,13 +9,13 @@
 
 #include <memory>
 
-#include <HAL/Encoder.h>
+#include <hal/Encoder.h>
 
-#include "Counter.h"
-#include "CounterBase.h"
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/Counter.h"
+#include "frc/CounterBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -20,7 +20,7 @@
 #undef GetMessage
 #endif
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 

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

@@ -11,8 +11,8 @@
 #include <wpi/Twine.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
-#include "Error.h"
+#include "frc/Base.h"
+#include "frc/Error.h"
 
 #define wpi_setErrnoErrorWithContext(context) \
   this->SetErrnoError((context), __FILE__, __FUNCTION__, __LINE__)

wpilibc/src/main/native/include/frc/GamepadBase.h

@@ -9,7 +9,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/GearTooth.h

@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include "Counter.h"
+#include "frc/Counter.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/GenericHID.h

@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/GyroBase.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
-#include "interfaces/Gyro.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/interfaces/Gyro.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/I2C.h

@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 enum HAL_I2CPort : int32_t;
 

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

@@ -7,11 +7,11 @@
 
 #pragma once
 
-#include <HAL/Interrupts.h>
+#include <hal/Interrupts.h>
 
-#include "AnalogTriggerType.h"
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/AnalogTriggerType.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/IterativeRobot.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "IterativeRobotBase.h"
+#include "frc/IterativeRobotBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/IterativeRobotBase.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "RobotBase.h"
-#include "Watchdog.h"
+#include "frc/RobotBase.h"
+#include "frc/Watchdog.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Jaguar.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Joystick.h

@@ -11,7 +11,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/JoystickBase.h

@@ -9,7 +9,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 

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

@@ -11,7 +11,7 @@
 
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/NidecBrushless.h

@@ -9,13 +9,13 @@
 
 #include <atomic>
 
-#include "DigitalOutput.h"
-#include "ErrorBase.h"
-#include "MotorSafety.h"
-#include "MotorSafetyHelper.h"
-#include "PWM.h"
-#include "SmartDashboard/SendableBase.h"
-#include "SpeedController.h"
+#include "frc/DigitalOutput.h"
+#include "frc/ErrorBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/MotorSafetyHelper.h"
+#include "frc/PWM.h"
+#include "frc/SpeedController.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -14,10 +14,10 @@
 #include <thread>
 #include <utility>
 
-#include <HAL/Notifier.h>
+#include <hal/Notifier.h>
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/PIDBase.h

@@ -13,13 +13,13 @@
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "PIDInterface.h"
-#include "PIDOutput.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
-#include "Timer.h"
+#include "frc/Base.h"
+#include "frc/PIDInterface.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/Timer.h"
+#include "frc/filters/LinearDigitalFilter.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -13,13 +13,13 @@
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
-#include "Controller.h"
-#include "Filters/LinearDigitalFilter.h"
-#include "Notifier.h"
-#include "PIDBase.h"
-#include "PIDSource.h"
-#include "Timer.h"
+#include "frc/Base.h"
+#include "frc/Controller.h"
+#include "frc/Notifier.h"
+#include "frc/PIDBase.h"
+#include "frc/PIDSource.h"
+#include "frc/Timer.h"
+#include "frc/filters/LinearDigitalFilter.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/PIDOutput.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 

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

@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/PWMSpeedController.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "SafePWM.h"
-#include "SpeedController.h"
+#include "frc/SafePWM.h"
+#include "frc/SpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/PWMTalonSRX.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/PWMVictorSPX.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/PowerDistributionPanel.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Preferences.h

@@ -15,7 +15,7 @@
 
 #include <networktables/NetworkTable.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 

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

@@ -9,12 +9,12 @@
 
 #include <memory>
 
-#include <HAL/Types.h>
+#include <hal/Types.h>
 #include <wpi/raw_ostream.h>
 
-#include "ErrorBase.h"
-#include "MotorSafety.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

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

@@ -15,7 +15,7 @@
 
 #include <wpi/mutex.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 

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

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

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

@@ -12,9 +12,9 @@
 #include <wpi/deprecated.h>
 #include <wpi/raw_ostream.h>
 
-#include "ErrorBase.h"
-#include "MotorSafety.h"
-#include "MotorSafetyHelper.h"
+#include "frc/ErrorBase.h"
+#include "frc/MotorSafety.h"
+#include "frc/MotorSafetyHelper.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/SD540.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/SPI.h

@@ -14,7 +14,7 @@
 #include <wpi/ArrayRef.h>
 #include <wpi/deprecated.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 enum HAL_SPIPort : int32_t;
 

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

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

wpilibc/src/main/native/include/frc/SampleRobot.h

@@ -9,7 +9,7 @@
 
 #include <wpi/deprecated.h>
 
-#include "RobotBase.h"
+#include "frc/RobotBase.h"
 
 namespace frc {
 

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

@@ -13,7 +13,7 @@
 #include <wpi/Twine.h>
 #include <wpi/deprecated.h>
 
-#include "ErrorBase.h"
+#include "frc/ErrorBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Servo.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "SafePWM.h"
-#include "SpeedController.h"
+#include "frc/SafePWM.h"
+#include "frc/SpeedController.h"
 
 namespace frc {
 

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

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

wpilibc/src/main/native/include/frc/SolenoidBase.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "ErrorBase.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Spark.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/SpeedController.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PIDOutput.h"
+#include "frc/PIDOutput.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/SpeedControllerGroup.h

@@ -10,8 +10,8 @@
 #include <functional>
 #include <vector>
 
-#include "SmartDashboard/SendableBase.h"
-#include "SpeedController.h"
+#include "frc/SpeedController.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 
@@ -39,4 +39,4 @@ class SpeedControllerGroup : public SendableBase, public SpeedController {
 
 }  // namespace frc
 
-#include "SpeedControllerGroup.inc"
+#include "frc/SpeedControllerGroup.inc"

wpilibc/src/main/native/include/frc/SynchronousPID.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PIDBase.h"
+#include "frc/PIDBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Talon.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/TimedRobot.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <HAL/Notifier.h>
+#include <hal/Notifier.h>
 
-#include "ErrorBase.h"
-#include "IterativeRobotBase.h"
+#include "frc/ErrorBase.h"
+#include "frc/IterativeRobotBase.h"
 
 namespace frc {
 

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

@@ -10,7 +10,7 @@
 #include <wpi/deprecated.h>
 #include <wpi/mutex.h>
 
-#include "Base.h"
+#include "frc/Base.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Ultrasonic.h

@@ -12,10 +12,10 @@
 #include <thread>
 #include <vector>
 
-#include "Counter.h"
-#include "ErrorBase.h"
-#include "PIDSource.h"
-#include "SmartDashboard/SendableBase.h"
+#include "frc/Counter.h"
+#include "frc/ErrorBase.h"
+#include "frc/PIDSource.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/Victor.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/VictorSP.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "PWMSpeedController.h"
+#include "frc/PWMSpeedController.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/WPILib.h

@@ -0,0 +1,100 @@
+/*----------------------------------------------------------------------------*/
+/* Copyright (c) 2008-2018 FIRST. All Rights Reserved.                        */
+/* Open Source Software - may be modified and shared by FRC teams. The code   */
+/* must be accompanied by the FIRST BSD license file in the root directory of */
+/* the project.                                                               */
+/*----------------------------------------------------------------------------*/
+
+#pragma once
+
+#include <cameraserver/CameraServer.h>
+#include <vision/VisionRunner.h>
+
+#include "frc/ADXL345_I2C.h"
+#include "frc/ADXL345_SPI.h"
+#include "frc/ADXL362.h"
+#include "frc/ADXRS450_Gyro.h"
+#include "frc/AnalogAccelerometer.h"
+#include "frc/AnalogGyro.h"
+#include "frc/AnalogInput.h"
+#include "frc/AnalogOutput.h"
+#include "frc/AnalogPotentiometer.h"
+#include "frc/AnalogTrigger.h"
+#include "frc/AnalogTriggerOutput.h"
+#include "frc/BuiltInAccelerometer.h"
+#include "frc/Compressor.h"
+#include "frc/ControllerPower.h"
+#include "frc/Counter.h"
+#include "frc/DMC60.h"
+#include "frc/DigitalInput.h"
+#include "frc/DigitalOutput.h"
+#include "frc/DigitalSource.h"
+#include "frc/DoubleSolenoid.h"
+#include "frc/DriverStation.h"
+#include "frc/Encoder.h"
+#include "frc/ErrorBase.h"
+#include "frc/GearTooth.h"
+#include "frc/GenericHID.h"
+#include "frc/I2C.h"
+#include "frc/InterruptableSensorBase.h"
+#include "frc/IterativeRobot.h"
+#include "frc/Jaguar.h"
+#include "frc/Joystick.h"
+#include "frc/NidecBrushless.h"
+#include "frc/Notifier.h"
+#include "frc/PIDController.h"
+#include "frc/PIDOutput.h"
+#include "frc/PIDSource.h"
+#include "frc/PWM.h"
+#include "frc/PWMSpeedController.h"
+#include "frc/PWMTalonSRX.h"
+#include "frc/PWMVictorSPX.h"
+#include "frc/PowerDistributionPanel.h"
+#include "frc/Preferences.h"
+#include "frc/Relay.h"
+#include "frc/RobotBase.h"
+#include "frc/RobotController.h"
+#include "frc/RobotDrive.h"
+#include "frc/SD540.h"
+#include "frc/SPI.h"
+#include "frc/SampleRobot.h"
+#include "frc/SensorUtil.h"
+#include "frc/SerialPort.h"
+#include "frc/Servo.h"
+#include "frc/Solenoid.h"
+#include "frc/Spark.h"
+#include "frc/SpeedController.h"
+#include "frc/SpeedControllerGroup.h"
+#include "frc/Talon.h"
+#include "frc/Threads.h"
+#include "frc/TimedRobot.h"
+#include "frc/Timer.h"
+#include "frc/Ultrasonic.h"
+#include "frc/Utility.h"
+#include "frc/Victor.h"
+#include "frc/VictorSP.h"
+#include "frc/WPIErrors.h"
+#include "frc/XboxController.h"
+#include "frc/buttons/InternalButton.h"
+#include "frc/buttons/JoystickButton.h"
+#include "frc/buttons/NetworkButton.h"
+#include "frc/commands/Command.h"
+#include "frc/commands/CommandGroup.h"
+#include "frc/commands/PIDCommand.h"
+#include "frc/commands/PIDSubsystem.h"
+#include "frc/commands/PrintCommand.h"
+#include "frc/commands/Scheduler.h"
+#include "frc/commands/StartCommand.h"
+#include "frc/commands/Subsystem.h"
+#include "frc/commands/WaitCommand.h"
+#include "frc/commands/WaitForChildren.h"
+#include "frc/commands/WaitUntilCommand.h"
+#include "frc/drive/DifferentialDrive.h"
+#include "frc/drive/KilloughDrive.h"
+#include "frc/drive/MecanumDrive.h"
+#include "frc/filters/LinearDigitalFilter.h"
+#include "frc/interfaces/Accelerometer.h"
+#include "frc/interfaces/Gyro.h"
+#include "frc/interfaces/Potentiometer.h"
+#include "frc/smartdashboard/SendableChooser.h"
+#include "frc/smartdashboard/SmartDashboard.h"

wpilibc/src/main/native/include/frc/Watchdog.h

@@ -12,7 +12,7 @@
 #include <wpi/StringMap.h>
 #include <wpi/StringRef.h>
 
-#include "Notifier.h"
+#include "frc/Notifier.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/XboxController.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/Button.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Buttons/Trigger.h"
-#include "Commands/Command.h"
+#include "frc/buttons/Trigger.h"
+#include "frc/commands/Command.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/CancelButtonScheduler.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/HeldButtonScheduler.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/InternalButton.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/Button.h"
+#include "frc/buttons/Button.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/JoystickButton.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "Buttons/Button.h"
-#include "GenericHID.h"
+#include "frc/GenericHID.h"
+#include "frc/buttons/Button.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/NetworkButton.h

@@ -13,7 +13,7 @@
 #include <networktables/NetworkTableEntry.h>
 #include <wpi/Twine.h>
 
-#include "Buttons/Button.h"
+#include "frc/buttons/Button.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/PressedButtonScheduler.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/ReleasedButtonScheduler.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/ToggleButtonScheduler.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "Buttons/ButtonScheduler.h"
+#include "frc/buttons/ButtonScheduler.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/frc/buttons/Trigger.h

@@ -9,7 +9,7 @@
 
 #include <atomic>
 
-#include "SmartDashboard/SendableBase.h"
+#include "frc/smartdashboard/SendableBase.h"
 
 namespace frc {