diff --git a/hal/lib/athena/HAL.cpp b/hal/lib/athena/HAL.cpp
index ca949e249e..865765032f 100644
--- a/hal/lib/athena/HAL.cpp
+++ b/hal/lib/athena/HAL.cpp
@@ -22,7 +22,9 @@
 #include "FRC_NetworkCommunication/FRCComm.h"
 #include "FRC_NetworkCommunication/LoadOut.h"
 #include "HAL/ChipObject.h"
+#include "HAL/DriverStation.h"
 #include "HAL/Errors.h"
+#include "HAL/Notifier.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "HAL/handles/HandlesInternal.h"
 #include "ctre/ctre.h"
diff --git a/hal/lib/athena/Notifier.cpp b/hal/lib/athena/Notifier.cpp
index 7c9bba09a6..81815f860c 100644
--- a/hal/lib/athena/Notifier.cpp
+++ b/hal/lib/athena/Notifier.cpp
@@ -15,6 +15,7 @@
 #include <mutex>
 
 #include "HAL/ChipObject.h"
+#include "HAL/Errors.h"
 #include "HAL/HAL.h"
 #include "HAL/cpp/make_unique.h"
 #include "HAL/cpp/priority_mutex.h"
diff --git a/hal/lib/athena/SPI.cpp b/hal/lib/athena/SPI.cpp
index 80ebcabaa0..01f93fa31b 100644
--- a/hal/lib/athena/SPI.cpp
+++ b/hal/lib/athena/SPI.cpp
@@ -13,6 +13,7 @@
 #include "DigitalInternal.h"
 #include "HAL/DIO.h"
 #include "HAL/HAL.h"
+#include "HAL/Notifier.h"
 #include "HAL/cpp/make_unique.h"
 #include "HAL/cpp/priority_mutex.h"
 #include "HAL/handles/HandlesInternal.h"
diff --git a/wpilibc/athena/src/AnalogGyro.cpp b/wpilibc/athena/src/AnalogGyro.cpp
index 336479a479..e9d3cd4a24 100644
--- a/wpilibc/athena/src/AnalogGyro.cpp
+++ b/wpilibc/athena/src/AnalogGyro.cpp
@@ -6,10 +6,12 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogGyro.h"
+#include "HAL/AnalogGyro.h"
 
 #include <climits>
 
 #include "AnalogInput.h"
+#include "HAL/Errors.h"
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
diff --git a/wpilibc/athena/src/AnalogInput.cpp b/wpilibc/athena/src/AnalogInput.cpp
index ae3e4dd585..73cce492ba 100644
--- a/wpilibc/athena/src/AnalogInput.cpp
+++ b/wpilibc/athena/src/AnalogInput.cpp
@@ -6,10 +6,13 @@
 /*----------------------------------------------------------------------------*/
 
 #include "AnalogInput.h"
+#include "HAL/AnalogInput.h"
 
 #include <sstream>
 
+#include "HAL/AnalogAccumulator.h"
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "LiveWindow/LiveWindow.h"
 #include "Timer.h"
 #include "WPIErrors.h"
diff --git a/wpilibc/athena/src/AnalogOutput.cpp b/wpilibc/athena/src/AnalogOutput.cpp
index 1ea9b0b752..c0fba90629 100644
--- a/wpilibc/athena/src/AnalogOutput.cpp
+++ b/wpilibc/athena/src/AnalogOutput.cpp
@@ -11,6 +11,7 @@
 #include <sstream>
 
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/BuiltInAccelerometer.cpp b/wpilibc/athena/src/BuiltInAccelerometer.cpp
index 7d7ac298bc..d1e701de20 100644
--- a/wpilibc/athena/src/BuiltInAccelerometer.cpp
+++ b/wpilibc/athena/src/BuiltInAccelerometer.cpp
@@ -7,6 +7,7 @@
 
 #include "BuiltInAccelerometer.h"
 
+#include "HAL/Accelerometer.h"
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
diff --git a/wpilibc/athena/src/Compressor.cpp b/wpilibc/athena/src/Compressor.cpp
index e1101bcf9e..9812479094 100644
--- a/wpilibc/athena/src/Compressor.cpp
+++ b/wpilibc/athena/src/Compressor.cpp
@@ -6,8 +6,11 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Compressor.h"
+#include "HAL/Compressor.h"
 
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
+#include "HAL/Solenoid.h"
 #include "WPIErrors.h"
 
 using namespace frc;
diff --git a/wpilibc/athena/src/DigitalGlitchFilter.cpp b/wpilibc/athena/src/DigitalGlitchFilter.cpp
index 983b72331c..0e5b742ea8 100644
--- a/wpilibc/athena/src/DigitalGlitchFilter.cpp
+++ b/wpilibc/athena/src/DigitalGlitchFilter.cpp
@@ -12,6 +12,8 @@
 
 #include "Counter.h"
 #include "Encoder.h"
+#include "HAL/Constants.h"
+#include "HAL/DIO.h"
 #include "HAL/HAL.h"
 #include "Utility.h"
 #include "WPIErrors.h"
diff --git a/wpilibc/athena/src/DigitalInput.cpp b/wpilibc/athena/src/DigitalInput.cpp
index 31af36a5bd..c282d8109e 100644
--- a/wpilibc/athena/src/DigitalInput.cpp
+++ b/wpilibc/athena/src/DigitalInput.cpp
@@ -10,7 +10,9 @@
 #include <limits>
 #include <sstream>
 
+#include "HAL/DIO.h"
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/DigitalOutput.cpp b/wpilibc/athena/src/DigitalOutput.cpp
index 7dc8ae05b1..46c30f8dcf 100644
--- a/wpilibc/athena/src/DigitalOutput.cpp
+++ b/wpilibc/athena/src/DigitalOutput.cpp
@@ -10,7 +10,9 @@
 #include <limits>
 #include <sstream>
 
+#include "HAL/DIO.h"
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "WPIErrors.h"
 
 using namespace frc;
diff --git a/wpilibc/athena/src/DoubleSolenoid.cpp b/wpilibc/athena/src/DoubleSolenoid.cpp
index 9de2dbc19d..5615e291e6 100644
--- a/wpilibc/athena/src/DoubleSolenoid.cpp
+++ b/wpilibc/athena/src/DoubleSolenoid.cpp
@@ -10,6 +10,8 @@
 #include <sstream>
 
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
+#include "HAL/Solenoid.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/DriverStation.cpp b/wpilibc/athena/src/DriverStation.cpp
index 8378dea515..44ad77e0e6 100644
--- a/wpilibc/athena/src/DriverStation.cpp
+++ b/wpilibc/athena/src/DriverStation.cpp
@@ -12,6 +12,7 @@
 #include "AnalogInput.h"
 #include "FRC_NetworkCommunication/FRCComm.h"
 #include "HAL/HAL.h"
+#include "HAL/Power.h"
 #include "HAL/cpp/Log.h"
 #include "MotorSafetyHelper.h"
 #include "Timer.h"
diff --git a/wpilibc/athena/src/I2C.cpp b/wpilibc/athena/src/I2C.cpp
index 248a39ec3e..24be556457 100644
--- a/wpilibc/athena/src/I2C.cpp
+++ b/wpilibc/athena/src/I2C.cpp
@@ -5,6 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "HAL/I2C.h"
 #include "I2C.h"
 
 #include "HAL/HAL.h"
diff --git a/wpilibc/athena/src/PWM.cpp b/wpilibc/athena/src/PWM.cpp
index c08f3af947..e9ed084867 100644
--- a/wpilibc/athena/src/PWM.cpp
+++ b/wpilibc/athena/src/PWM.cpp
@@ -5,11 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "HAL/PWM.h"
 #include "PWM.h"
 
 #include <sstream>
 
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "Utility.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/PowerDistributionPanel.cpp b/wpilibc/athena/src/PowerDistributionPanel.cpp
index 3f659b788c..db534f2835 100644
--- a/wpilibc/athena/src/PowerDistributionPanel.cpp
+++ b/wpilibc/athena/src/PowerDistributionPanel.cpp
@@ -10,6 +10,8 @@
 #include <sstream>
 
 #include "HAL/HAL.h"
+#include "HAL/PDP.h"
+#include "HAL/Ports.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/Relay.cpp b/wpilibc/athena/src/Relay.cpp
index 9acec570a4..dc5a6a797f 100644
--- a/wpilibc/athena/src/Relay.cpp
+++ b/wpilibc/athena/src/Relay.cpp
@@ -5,11 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "HAL/Relay.h"
 #include "Relay.h"
 
 #include <sstream>
 
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "LiveWindow/LiveWindow.h"
 #include "MotorSafetyHelper.h"
 #include "WPIErrors.h"
diff --git a/wpilibc/athena/src/SPI.cpp b/wpilibc/athena/src/SPI.cpp
index 241514f49e..a2d4e0f527 100644
--- a/wpilibc/athena/src/SPI.cpp
+++ b/wpilibc/athena/src/SPI.cpp
@@ -5,6 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "HAL/SPI.h"
 #include "SPI.h"
 
 #include <cstring>
diff --git a/wpilibc/athena/src/SensorBase.cpp b/wpilibc/athena/src/SensorBase.cpp
index fee6dbe3ad..820fe84936 100644
--- a/wpilibc/athena/src/SensorBase.cpp
+++ b/wpilibc/athena/src/SensorBase.cpp
@@ -8,7 +8,15 @@
 #include "SensorBase.h"
 
 #include "FRC_NetworkCommunication/LoadOut.h"
+#include "HAL/AnalogInput.h"
+#include "HAL/AnalogOutput.h"
+#include "HAL/DIO.h"
 #include "HAL/HAL.h"
+#include "HAL/PDP.h"
+#include "HAL/PWM.h"
+#include "HAL/Ports.h"
+#include "HAL/Relay.h"
+#include "HAL/Solenoid.h"
 #include "WPIErrors.h"
 
 using namespace frc;
diff --git a/wpilibc/athena/src/SerialPort.cpp b/wpilibc/athena/src/SerialPort.cpp
index 466e4583c9..8eda5b64e6 100644
--- a/wpilibc/athena/src/SerialPort.cpp
+++ b/wpilibc/athena/src/SerialPort.cpp
@@ -5,6 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "HAL/SerialPort.h"
 #include "SerialPort.h"
 
 #include "HAL/HAL.h"
diff --git a/wpilibc/athena/src/Solenoid.cpp b/wpilibc/athena/src/Solenoid.cpp
index c9fbb37481..a32421ef19 100644
--- a/wpilibc/athena/src/Solenoid.cpp
+++ b/wpilibc/athena/src/Solenoid.cpp
@@ -5,11 +5,13 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
+#include "HAL/Solenoid.h"
 #include "Solenoid.h"
 
 #include <sstream>
 
 #include "HAL/HAL.h"
+#include "HAL/Ports.h"
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/SolenoidBase.cpp b/wpilibc/athena/src/SolenoidBase.cpp
index fabd111dd2..0ab6f7368a 100644
--- a/wpilibc/athena/src/SolenoidBase.cpp
+++ b/wpilibc/athena/src/SolenoidBase.cpp
@@ -8,6 +8,7 @@
 #include "SolenoidBase.h"
 
 #include "HAL/HAL.h"
+#include "HAL/Solenoid.h"
 
 using namespace frc;
 
diff --git a/wpilibc/athena/src/Utility.cpp b/wpilibc/athena/src/Utility.cpp
index de27907808..4541a16226 100644
--- a/wpilibc/athena/src/Utility.cpp
+++ b/wpilibc/athena/src/Utility.cpp
@@ -16,6 +16,7 @@
 #include <sstream>
 
 #include "ErrorBase.h"
+#include "HAL/DriverStation.h"
 #include "HAL/HAL.h"
 #include "llvm/SmallString.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp b/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
index a77edc44a7..31cc8d807f 100644
--- a/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
@@ -5,7 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "HAL/HAL.h"
+#include "HAL/Compressor.h"
+#include "HAL/Ports.h"
+#include "HAL/Solenoid.h"
 #include "HALUtil.h"
 #include "HAL/cpp/Log.h"
 #include "edu_wpi_first_wpilibj_hal_CompressorJNI.h"
diff --git a/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp b/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
index 2a9df17463..8e5ed23e43 100644
--- a/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
@@ -6,7 +6,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include <jni.h>
-#include "HAL/HAL.h"
+#include "HAL/DIO.h"
 #include "HALUtil.h"
 
 #include "edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI.h"
diff --git a/wpilibj/src/athena/cpp/lib/HAL.cpp b/wpilibj/src/athena/cpp/lib/HAL.cpp
index f93aa76766..881303d936 100644
--- a/wpilibj/src/athena/cpp/lib/HAL.cpp
+++ b/wpilibj/src/athena/cpp/lib/HAL.cpp
@@ -12,6 +12,7 @@
 #include "HAL/cpp/Log.h"
 
 #include "HAL/HAL.h"
+#include "HAL/DriverStation.h"
 #include "edu_wpi_first_wpilibj_hal_HAL.h"
 #include "HALUtil.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/HALUtil.cpp b/wpilibj/src/athena/cpp/lib/HALUtil.cpp
index 5864208b2e..e6079059cc 100644
--- a/wpilibj/src/athena/cpp/lib/HALUtil.cpp
+++ b/wpilibj/src/athena/cpp/lib/HALUtil.cpp
@@ -16,6 +16,8 @@
 
 #include "FRC_NetworkCommunication/CANSessionMux.h"
 #include "HAL/HAL.h"
+#include "HAL/DriverStation.h"
+#include "HAL/Errors.h"
 #include "HAL/cpp/Log.h"
 #include "edu_wpi_first_wpilibj_hal_HALUtil.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp b/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
index 0f16959540..a70e8af6f7 100644
--- a/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
@@ -6,7 +6,8 @@
 /*----------------------------------------------------------------------------*/
 
 #include <jni.h>
-#include "HAL/HAL.h"
+#include "HAL/Solenoid.h"
+#include "HAL/Ports.h"
 #include "HAL/handles/HandlesInternal.h"
 #include "HAL/cpp/Log.h"