diff --git a/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp b/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp
index d8c6407d94..6a9f294131 100644
--- a/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp
@@ -15,6 +15,8 @@
 #include "HALUtil.h"
 #include "HAL/handles/HandlesInternal.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel analogGyroJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp b/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp
index e00fa3aeb4..6d0781aef2 100644
--- a/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp
@@ -19,6 +19,8 @@
 #include "HALUtil.h"
 #include "HAL/handles/HandlesInternal.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel analogJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/CANJNI.cpp b/wpilibj/src/athena/cpp/lib/CANJNI.cpp
index dd374f95cd..94a381198a 100644
--- a/wpilibj/src/athena/cpp/lib/CANJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CANJNI.cpp
@@ -15,6 +15,8 @@
 #include "HAL/CAN.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 // TLogLevel canJNILogLevel = logDEBUG;
 TLogLevel canJNILogLevel = logERROR;
diff --git a/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp b/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
index f685458a0d..cf41232448 100644
--- a/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
@@ -10,6 +10,8 @@
 #include "HAL/cpp/Log.h"
 #include "edu_wpi_first_wpilibj_hal_CompressorJNI.h"
 
+using namespace frc;
+
 extern "C" {
 
 /*
diff --git a/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp b/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp
index 06f02f5972..e1eb416c42 100644
--- a/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp
@@ -14,6 +14,8 @@
 #include "HAL/Constants.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel constantsJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/CounterJNI.cpp b/wpilibj/src/athena/cpp/lib/CounterJNI.cpp
index b14ddb3ff2..d43bb78ec8 100644
--- a/wpilibj/src/athena/cpp/lib/CounterJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CounterJNI.cpp
@@ -15,6 +15,8 @@
 #include "HAL/Errors.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel counterJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/DIOJNI.cpp b/wpilibj/src/athena/cpp/lib/DIOJNI.cpp
index 7d43a4f6ec..7c1c13109d 100644
--- a/wpilibj/src/athena/cpp/lib/DIOJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/DIOJNI.cpp
@@ -17,6 +17,8 @@
 #include "HAL/Ports.h"
 #include "HAL/handles/HandlesInternal.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel dioJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp b/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
index 92cb31b309..2a9df17463 100644
--- a/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/DigitalGlitchFilterJNI.cpp
@@ -11,6 +11,8 @@
 
 #include "edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI.h"
 
+using namespace frc;
+
 /*
  * Class:     edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI
  * Method:    setFilterSelect
diff --git a/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp b/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp
index 0f0129bb8b..9a0791ebca 100644
--- a/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp
@@ -15,6 +15,8 @@
 #include "HAL/Errors.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel encoderJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/HAL.cpp b/wpilibj/src/athena/cpp/lib/HAL.cpp
index 6e621fc3b0..f7fab3642b 100644
--- a/wpilibj/src/athena/cpp/lib/HAL.cpp
+++ b/wpilibj/src/athena/cpp/lib/HAL.cpp
@@ -15,6 +15,8 @@
 #include "edu_wpi_first_wpilibj_hal_HAL.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 static TLogLevel netCommLogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/HALUtil.cpp b/wpilibj/src/athena/cpp/lib/HALUtil.cpp
index 62e5845dda..91d9beb954 100644
--- a/wpilibj/src/athena/cpp/lib/HALUtil.cpp
+++ b/wpilibj/src/athena/cpp/lib/HALUtil.cpp
@@ -50,6 +50,8 @@ static jclass canNotInitializedExCls = nullptr;
 static jclass uncleanStatusExCls = nullptr;
 static jclass pwmConfigDataResultCls = nullptr;
 
+namespace frc {
+
 static void GetStackTrace(JNIEnv *env, std::string &res, std::string &func) {
   // create a throwable
   static jmethodID constructorId = nullptr;
@@ -269,6 +271,10 @@ jobject CreatePWMConfigDataResult(JNIEnv *env, int32_t maxPwm,
                         minPwm);
 }
 
+}  // namespace frc
+
+using namespace frc;
+
 extern "C" {
 
 //
diff --git a/wpilibj/src/athena/cpp/lib/HALUtil.h b/wpilibj/src/athena/cpp/lib/HALUtil.h
index 36b9bf39d5..d3c9439a7e 100644
--- a/wpilibj/src/athena/cpp/lib/HALUtil.h
+++ b/wpilibj/src/athena/cpp/lib/HALUtil.h
@@ -14,6 +14,8 @@
 
 extern JavaVM *jvm;
 
+namespace frc {
+
 void ReportError(JNIEnv *env, int32_t status, bool do_throw = true);
                  
 void ThrowError(JNIEnv *env, int32_t status, int32_t minRange, int32_t maxRange, 
@@ -49,5 +51,7 @@ void ThrowBoundaryException(JNIEnv *env, double value, double lower,
 jobject CreatePWMConfigDataResult(JNIEnv *env, int32_t maxPwm,
                   int32_t deadbandMaxPwm, int32_t centerPwm,
                   int32_t deadbandMinPwm, int32_t minPwm);
+                  
+}  // namespace frc
 
 #endif  // HALUTIL_H
diff --git a/wpilibj/src/athena/cpp/lib/I2CJNI.cpp b/wpilibj/src/athena/cpp/lib/I2CJNI.cpp
index 35d45eb9a9..69973513e0 100644
--- a/wpilibj/src/athena/cpp/lib/I2CJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/I2CJNI.cpp
@@ -14,6 +14,8 @@
 #include "HAL/I2C.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel i2cJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp b/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
index fc69c0e718..93443487ab 100644
--- a/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
@@ -18,6 +18,8 @@
 #include "edu_wpi_first_wpilibj_hal_InterruptJNI.h"
 #include "support/SafeThread.h"
 
+using namespace frc;
+
 TLogLevel interruptJNILogLevel = logERROR;
 
 #define INTERRUPTJNI_LOG(level)     \
diff --git a/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp b/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
index 344ef49b41..e318669fe9 100644
--- a/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
@@ -19,6 +19,8 @@
 #include "edu_wpi_first_wpilibj_hal_NotifierJNI.h"
 #include "support/SafeThread.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel notifierJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/PDPJNI.cpp b/wpilibj/src/athena/cpp/lib/PDPJNI.cpp
index 35885e101b..54ea85799a 100644
--- a/wpilibj/src/athena/cpp/lib/PDPJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PDPJNI.cpp
@@ -10,6 +10,8 @@
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_PDPJNI.h"
 
+using namespace frc;
+
 extern "C" {
 
 /*
diff --git a/wpilibj/src/athena/cpp/lib/PWMJNI.cpp b/wpilibj/src/athena/cpp/lib/PWMJNI.cpp
index d96ea204e7..5965891ec1 100644
--- a/wpilibj/src/athena/cpp/lib/PWMJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PWMJNI.cpp
@@ -17,6 +17,8 @@
 #include "HALUtil.h"
 #include "HAL/handles/HandlesInternal.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel pwmJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/PortsJNI.cpp b/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
index 6f8bf0e61c..df587ab9cd 100644
--- a/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
@@ -14,6 +14,8 @@
 #include "HAL/Ports.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel portsJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/PowerJNI.cpp b/wpilibj/src/athena/cpp/lib/PowerJNI.cpp
index 2d29a07991..f18174a78a 100644
--- a/wpilibj/src/athena/cpp/lib/PowerJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PowerJNI.cpp
@@ -10,6 +10,8 @@
 #include "HALUtil.h"
 #include "edu_wpi_first_wpilibj_hal_PowerJNI.h"
 
+using namespace frc;
+
 extern "C" {
 
 /*
diff --git a/wpilibj/src/athena/cpp/lib/RelayJNI.cpp b/wpilibj/src/athena/cpp/lib/RelayJNI.cpp
index 48d67258d8..7522f972e3 100644
--- a/wpilibj/src/athena/cpp/lib/RelayJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/RelayJNI.cpp
@@ -16,6 +16,8 @@
 #include "HALUtil.h"
 #include "HAL/handles/HandlesInternal.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel relayJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/SPIJNI.cpp b/wpilibj/src/athena/cpp/lib/SPIJNI.cpp
index 5c64d0d09e..559db20b2f 100644
--- a/wpilibj/src/athena/cpp/lib/SPIJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SPIJNI.cpp
@@ -14,6 +14,8 @@
 #include "HAL/SPI.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel spiJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp b/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp
index fcc669e7fa..e9938494d0 100644
--- a/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp
@@ -14,6 +14,8 @@
 #include "HAL/SerialPort.h"
 #include "HALUtil.h"
 
+using namespace frc;
+
 // set the logging level
 TLogLevel serialJNILogLevel = logWARNING;
 
diff --git a/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp b/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
index 6908e0aed9..0f16959540 100644
--- a/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
@@ -14,6 +14,8 @@
 
 #include "HALUtil.h"
 
+using namespace frc;
+
 TLogLevel solenoidJNILogLevel = logERROR;
 
 #define SOLENOIDJNI_LOG(level)     \