diff --git a/hal/lib/athena/AnalogTrigger.cpp b/hal/lib/athena/AnalogTrigger.cpp
index 5cdc340c6a..4312695e1c 100644
--- a/hal/lib/athena/AnalogTrigger.cpp
+++ b/hal/lib/athena/AnalogTrigger.cpp
@@ -10,7 +10,6 @@
 #include "AnalogInternal.h"
 #include "HAL/AnalogInput.h"
 #include "HAL/Errors.h"
-#include "HAL/cpp/Resource.h"
 #include "PortsInternal.h"
 #include "handles/HandlesInternal.h"
 #include "handles/LimitedHandleResource.h"
diff --git a/wpilibc/athena/include/InterruptableSensorBase.h b/wpilibc/athena/include/InterruptableSensorBase.h
index dfb19932f0..d8300d3e04 100644
--- a/wpilibc/athena/include/InterruptableSensorBase.h
+++ b/wpilibc/athena/include/InterruptableSensorBase.h
@@ -10,7 +10,6 @@
 #include <memory>
 
 #include "HAL/Interrupts.h"
-#include "Resource.h"
 #include "SensorBase.h"
 
 class InterruptableSensorBase : public SensorBase {
diff --git a/wpilibc/athena/include/SolenoidBase.h b/wpilibc/athena/include/SolenoidBase.h
index 29e5ed1b69..608511666a 100644
--- a/wpilibc/athena/include/SolenoidBase.h
+++ b/wpilibc/athena/include/SolenoidBase.h
@@ -9,7 +9,6 @@
 
 #include <memory>
 
-#include "Resource.h"
 #include "SensorBase.h"
 
 /**
diff --git a/wpilibc/athena/src/AnalogInput.cpp b/wpilibc/athena/src/AnalogInput.cpp
index 9a243d994e..5ac773d0f5 100644
--- a/wpilibc/athena/src/AnalogInput.cpp
+++ b/wpilibc/athena/src/AnalogInput.cpp
@@ -8,7 +8,6 @@
 #include "AnalogInput.h"
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
-#include "Resource.h"
 #include "Timer.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/AnalogTrigger.cpp b/wpilibc/athena/src/AnalogTrigger.cpp
index 88551fb2b3..e9a48d2cf7 100644
--- a/wpilibc/athena/src/AnalogTrigger.cpp
+++ b/wpilibc/athena/src/AnalogTrigger.cpp
@@ -9,7 +9,6 @@
 
 #include "AnalogInput.h"
 #include "HAL/HAL.h"
-#include "Resource.h"
 #include "WPIErrors.h"
 
 #include <memory>
diff --git a/wpilibc/athena/src/Counter.cpp b/wpilibc/athena/src/Counter.cpp
index d7264bea5b..c9e3cd0783 100644
--- a/wpilibc/athena/src/Counter.cpp
+++ b/wpilibc/athena/src/Counter.cpp
@@ -10,7 +10,6 @@
 #include "AnalogTrigger.h"
 #include "DigitalInput.h"
 #include "HAL/HAL.h"
-#include "Resource.h"
 #include "WPIErrors.h"
 
 /**
diff --git a/wpilibc/athena/src/DigitalGlitchFilter.cpp b/wpilibc/athena/src/DigitalGlitchFilter.cpp
index 394f756511..96f6686f52 100644
--- a/wpilibc/athena/src/DigitalGlitchFilter.cpp
+++ b/wpilibc/athena/src/DigitalGlitchFilter.cpp
@@ -13,7 +13,6 @@
 #include "Counter.h"
 #include "Encoder.h"
 #include "HAL/HAL.h"
-#include "Resource.h"
 #include "Utility.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/DigitalInput.cpp b/wpilibc/athena/src/DigitalInput.cpp
index 25c48a581b..a94d9b3b17 100644
--- a/wpilibc/athena/src/DigitalInput.cpp
+++ b/wpilibc/athena/src/DigitalInput.cpp
@@ -12,7 +12,6 @@
 
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
-#include "Resource.h"
 #include "WPIErrors.h"
 
 /**
diff --git a/wpilibc/athena/src/DigitalOutput.cpp b/wpilibc/athena/src/DigitalOutput.cpp
index bac276eb08..4b17449d25 100644
--- a/wpilibc/athena/src/DigitalOutput.cpp
+++ b/wpilibc/athena/src/DigitalOutput.cpp
@@ -8,7 +8,6 @@
 #include "DigitalOutput.h"
 
 #include "HAL/HAL.h"
-#include "Resource.h"
 #include "WPIErrors.h"
 
 #include <limits>
diff --git a/wpilibc/athena/src/Encoder.cpp b/wpilibc/athena/src/Encoder.cpp
index 79392cb17c..7bc8db87f7 100644
--- a/wpilibc/athena/src/Encoder.cpp
+++ b/wpilibc/athena/src/Encoder.cpp
@@ -9,7 +9,6 @@
 #include "DigitalInput.h"
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
-#include "Resource.h"
 #include "WPIErrors.h"
 
 /**
diff --git a/wpilibc/athena/src/PWM.cpp b/wpilibc/athena/src/PWM.cpp
index 19abbcbad0..7288524a3e 100644
--- a/wpilibc/athena/src/PWM.cpp
+++ b/wpilibc/athena/src/PWM.cpp
@@ -8,7 +8,6 @@
 #include "PWM.h"
 
 #include "HAL/HAL.h"
-#include "Resource.h"
 #include "Utility.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/athena/src/Relay.cpp b/wpilibc/athena/src/Relay.cpp
index 9533f3a302..293fef2ccf 100644
--- a/wpilibc/athena/src/Relay.cpp
+++ b/wpilibc/athena/src/Relay.cpp
@@ -10,14 +10,10 @@
 #include "HAL/HAL.h"
 #include "LiveWindow/LiveWindow.h"
 #include "MotorSafetyHelper.h"
-#include "Resource.h"
 #include "WPIErrors.h"
 
 #include <sstream>
 
-// Allocate each direction separately.
-static std::unique_ptr<Resource> relayChannels;
-
 /**
  * Relay constructor given a channel.
  *