From 98a587a347e923d767c5c65d48dea38fc3ec9166 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Sun, 25 Jun 2017 09:05:49 -0700
Subject: [PATCH] Removed unused includes and added missing stdint.h includes
 (#549)

---
 wpilibc/athena/include/ADXRS450_Gyro.h           | 4 +---
 wpilibc/athena/include/AnalogInput.h             | 2 ++
 wpilibc/athena/include/AnalogOutput.h            | 2 --
 wpilibc/athena/include/CANSpeedController.h      | 2 ++
 wpilibc/athena/include/CameraServer.h            | 2 ++
 wpilibc/athena/include/CounterBase.h             | 2 --
 wpilibc/athena/include/DigitalGlitchFilter.h     | 4 +++-
 wpilibc/athena/include/DigitalInput.h            | 2 --
 wpilibc/athena/include/DriverStation.h           | 2 --
 wpilibc/athena/include/I2C.h                     | 2 ++
 wpilibc/athena/include/InterruptableSensorBase.h | 2 --
 wpilibc/athena/include/Notifier.h                | 2 ++
 wpilibc/athena/include/PWM.h                     | 2 ++
 wpilibc/athena/include/Preferences.h             | 3 ++-
 wpilibc/athena/include/SPI.h                     | 2 ++
 wpilibc/athena/include/SensorBase.h              | 2 --
 wpilibc/athena/include/SolenoidBase.h            | 2 --
 wpilibc/athena/include/Task.h                    | 2 ++
 18 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/wpilibc/athena/include/ADXRS450_Gyro.h b/wpilibc/athena/include/ADXRS450_Gyro.h
index 5c52f7ee8c..6b2a9f9643 100644
--- a/wpilibc/athena/include/ADXRS450_Gyro.h
+++ b/wpilibc/athena/include/ADXRS450_Gyro.h
@@ -7,11 +7,9 @@
 
 #pragma once
 
-#include <memory>
+#include <stdint.h>
 
 #include "GyroBase.h"
-#include "HAL/cpp/priority_mutex.h"
-#include "Notifier.h"
 #include "SPI.h"
 
 namespace frc {
diff --git a/wpilibc/athena/include/AnalogInput.h b/wpilibc/athena/include/AnalogInput.h
index 9353a9b2f5..4d82c4eb0f 100644
--- a/wpilibc/athena/include/AnalogInput.h
+++ b/wpilibc/athena/include/AnalogInput.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 
diff --git a/wpilibc/athena/include/AnalogOutput.h b/wpilibc/athena/include/AnalogOutput.h
index ea0c81924a..ff42019713 100644
--- a/wpilibc/athena/include/AnalogOutput.h
+++ b/wpilibc/athena/include/AnalogOutput.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include <memory>
 #include <string>
 
diff --git a/wpilibc/athena/include/CANSpeedController.h b/wpilibc/athena/include/CANSpeedController.h
index a0f31add78..9fe02477a5 100644
--- a/wpilibc/athena/include/CANSpeedController.h
+++ b/wpilibc/athena/include/CANSpeedController.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include "SpeedController.h"
 
 namespace frc {
diff --git a/wpilibc/athena/include/CameraServer.h b/wpilibc/athena/include/CameraServer.h
index 5dde767ebe..580a41a95b 100644
--- a/wpilibc/athena/include/CameraServer.h
+++ b/wpilibc/athena/include/CameraServer.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <atomic>
 #include <memory>
 #include <mutex>
diff --git a/wpilibc/athena/include/CounterBase.h b/wpilibc/athena/include/CounterBase.h
index 868dbe6c26..5bbdbe9d73 100644
--- a/wpilibc/athena/include/CounterBase.h
+++ b/wpilibc/athena/include/CounterBase.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 namespace frc {
 
 /**
diff --git a/wpilibc/athena/include/DigitalGlitchFilter.h b/wpilibc/athena/include/DigitalGlitchFilter.h
index 0d94451f95..751c41af9d 100644
--- a/wpilibc/athena/include/DigitalGlitchFilter.h
+++ b/wpilibc/athena/include/DigitalGlitchFilter.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <array>
 
 #include "DigitalSource.h"
@@ -50,7 +52,7 @@ class DigitalGlitchFilter : public SensorBase {
 
   int m_channelIndex = -1;
   static hal::priority_mutex m_mutex;
-  static ::std::array<bool, 3> m_filterAllocated;
+  static std::array<bool, 3> m_filterAllocated;
 };
 
 }  // namespace frc
diff --git a/wpilibc/athena/include/DigitalInput.h b/wpilibc/athena/include/DigitalInput.h
index 92a762f0ec..896f5da142 100644
--- a/wpilibc/athena/include/DigitalInput.h
+++ b/wpilibc/athena/include/DigitalInput.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include <memory>
 #include <string>
 
diff --git a/wpilibc/athena/include/DriverStation.h b/wpilibc/athena/include/DriverStation.h
index 2d078177ed..c23899474d 100644
--- a/wpilibc/athena/include/DriverStation.h
+++ b/wpilibc/athena/include/DriverStation.h
@@ -8,13 +8,11 @@
 #pragma once
 
 #include <atomic>
-#include <condition_variable>
 #include <memory>
 #include <string>
 #include <thread>
 
 #include "HAL/DriverStation.h"
-#include "HAL/cpp/priority_condition_variable.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "RobotState.h"
 #include "SensorBase.h"
diff --git a/wpilibc/athena/include/I2C.h b/wpilibc/athena/include/I2C.h
index 022afb1fba..60999df5c0 100644
--- a/wpilibc/athena/include/I2C.h
+++ b/wpilibc/athena/include/I2C.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include "SensorBase.h"
 
 enum HAL_I2CPort : int32_t;
diff --git a/wpilibc/athena/include/InterruptableSensorBase.h b/wpilibc/athena/include/InterruptableSensorBase.h
index 49d877fea1..d3df64f685 100644
--- a/wpilibc/athena/include/InterruptableSensorBase.h
+++ b/wpilibc/athena/include/InterruptableSensorBase.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "AnalogTriggerType.h"
 #include "HAL/Interrupts.h"
 #include "SensorBase.h"
diff --git a/wpilibc/athena/include/Notifier.h b/wpilibc/athena/include/Notifier.h
index 7767a11dde..3b50cd0de3 100644
--- a/wpilibc/athena/include/Notifier.h
+++ b/wpilibc/athena/include/Notifier.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <atomic>
 #include <functional>
 #include <utility>
diff --git a/wpilibc/athena/include/PWM.h b/wpilibc/athena/include/PWM.h
index e66a81ec4c..37918a69dc 100644
--- a/wpilibc/athena/include/PWM.h
+++ b/wpilibc/athena/include/PWM.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 
diff --git a/wpilibc/athena/include/Preferences.h b/wpilibc/athena/include/Preferences.h
index 1dcd39ba8b..3b1a3ca8ba 100644
--- a/wpilibc/athena/include/Preferences.h
+++ b/wpilibc/athena/include/Preferences.h
@@ -7,7 +7,8 @@
 
 #pragma once
 
-#include <map>
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/wpilibc/athena/include/SPI.h b/wpilibc/athena/include/SPI.h
index b422f1dcb2..8d77679f9f 100644
--- a/wpilibc/athena/include/SPI.h
+++ b/wpilibc/athena/include/SPI.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include "SensorBase.h"
 
 enum HAL_SPIPort : int32_t;
diff --git a/wpilibc/athena/include/SensorBase.h b/wpilibc/athena/include/SensorBase.h
index 09720fc591..38cd70b05a 100644
--- a/wpilibc/athena/include/SensorBase.h
+++ b/wpilibc/athena/include/SensorBase.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include "Base.h"
 #include "ErrorBase.h"
 
diff --git a/wpilibc/athena/include/SolenoidBase.h b/wpilibc/athena/include/SolenoidBase.h
index 817c6cbf0a..06fc437117 100644
--- a/wpilibc/athena/include/SolenoidBase.h
+++ b/wpilibc/athena/include/SolenoidBase.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "SensorBase.h"
 
 namespace frc {
diff --git a/wpilibc/athena/include/Task.h b/wpilibc/athena/include/Task.h
index 646a400e40..29f5c8e890 100644
--- a/wpilibc/athena/include/Task.h
+++ b/wpilibc/athena/include/Task.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include <string>
 #include <thread>