diff --git a/hal/build.gradle b/hal/build.gradle
index 0c4aa06fd4..a01638634e 100644
--- a/hal/build.gradle
+++ b/hal/build.gradle
@@ -20,7 +20,7 @@ model {
                         includes = ["**/*.cpp"]
                     }
                     exportedHeaders {
-                        srcDirs = ["include", "lib/athena", "lib/athena/FRC_FPGA_ChipObject", "lib/shared"]
+                        srcDirs = ["include", "lib/athena/FRC_FPGA_ChipObject"]
                     }
                 }
             }
diff --git a/hal/include/Log.h b/hal/include/HAL/cpp/Log.h
similarity index 100%
rename from hal/include/Log.h
rename to hal/include/HAL/cpp/Log.h
diff --git a/hal/include/FRC_NetworkCommunication/AICalibration.h b/hal/lib/athena/FRC_NetworkCommunication/AICalibration.h
similarity index 95%
rename from hal/include/FRC_NetworkCommunication/AICalibration.h
rename to hal/lib/athena/FRC_NetworkCommunication/AICalibration.h
index b2f366c5bd..39755bda89 100644
--- a/hal/include/FRC_NetworkCommunication/AICalibration.h
+++ b/hal/lib/athena/FRC_NetworkCommunication/AICalibration.h
@@ -1,19 +1,19 @@
-
-#ifndef __AICalibration_h__
-#define __AICalibration_h__
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-	uint32_t FRC_NetworkCommunication_nAICalibration_getLSBWeight(const uint32_t aiSystemIndex, const uint32_t channel, int32_t *status);
-	int32_t FRC_NetworkCommunication_nAICalibration_getOffset(const uint32_t aiSystemIndex, const uint32_t channel, int32_t *status);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __AICalibration_h__
+
+#ifndef __AICalibration_h__
+#define __AICalibration_h__
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	uint32_t FRC_NetworkCommunication_nAICalibration_getLSBWeight(const uint32_t aiSystemIndex, const uint32_t channel, int32_t *status);
+	int32_t FRC_NetworkCommunication_nAICalibration_getOffset(const uint32_t aiSystemIndex, const uint32_t channel, int32_t *status);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __AICalibration_h__
diff --git a/hal/include/FRC_NetworkCommunication/CANInterfacePlugin.h b/hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h
similarity index 97%
rename from hal/include/FRC_NetworkCommunication/CANInterfacePlugin.h
rename to hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h
index 77d992cf24..f3150fbdf9 100644
--- a/hal/include/FRC_NetworkCommunication/CANInterfacePlugin.h
+++ b/hal/lib/athena/FRC_NetworkCommunication/CANInterfacePlugin.h
@@ -1,82 +1,82 @@
-// CANInterfacePlugin.h
-//
-//  Defines the API for building a CAN Interface Plugin to support
-//    PWM-cable-free CAN motor control on FRC robots.  This allows you
-//    to connect any CAN interface to the secure Jaguar CAN driver.
-//
-
-#ifndef __CANInterfacePlugin_h__
-#define __CANInterfacePlugin_h__
-
-#include <stdint.h>
-
-#define CAN_IS_FRAME_REMOTE 0x80000000
-#define CAN_IS_FRAME_11BIT  0x40000000
-#define CAN_29BIT_MESSAGE_ID_MASK 0x1FFFFFFF
-#define CAN_11BIT_MESSAGE_ID_MASK 0x000007FF
-
-class CANInterfacePlugin
-{
-public:
-	CANInterfacePlugin() {}
-	virtual ~CANInterfacePlugin() {}
-
-	/**
-	 * This entry-point of the CANInterfacePlugin is passed a message that the driver needs to send to
-	 * a device on the CAN bus.
-	 * 
-	 * This function may be called from multiple contexts and must therefore be reentrant.
-	 * 
-	 * @param messageID The 29-bit CAN message ID in the lsbs.  The msb can indicate a remote frame.
-	 * @param data A pointer to a buffer containing between 0 and 8 bytes to send with the message.  May be NULL if dataSize is 0.
-	 * @param dataSize The number of bytes to send with the message.
-	 * @return Return any error code.  On success return 0.
-	 */
-	virtual int32_t sendMessage(uint32_t messageID, const uint8_t *data, uint8_t dataSize) = 0;
-
-	/**
-	 * This entry-point of the CANInterfacePlugin is passed buffers which should be populated with
-	 * any received messages from devices on the CAN bus.
-	 * 
-	 * This function is always called by a single task in the Jaguar driver, so it need not be reentrant.
-	 * 
-	 * This function is expected to block for some period of time waiting for a message from the CAN bus.
-	 * It may timeout periodically (returning non-zero to indicate no message was populated) to allow for
-	 * shutdown and unloading of the plugin.
-	 * 
-	 * @param messageID A reference to be populated with a received 29-bit CAN message ID in the lsbs.
-	 * @param data A pointer to a buffer of 8 bytes to be populated with data received with the message.
-	 * @param dataSize A reference to be populated with the size of the data received (0 - 8 bytes).
-	 * @return This should return 0 if a message was populated, non-0 if no message was not populated.
-	 */
-	virtual int32_t receiveMessage(uint32_t &messageID, uint8_t *data, uint8_t &dataSize) = 0;
-
-#if defined(__linux)
-	/**
-	 * This entry-point of the CANInterfacePlugin returns status of the CAN bus.
-	 * 
-	 * This function may be called from multiple contexts and must therefore be reentrant.
-	 * 
-	 * This function will return detailed hardware status if available for diagnostics of the CAN interface.
-	 * 
-	 * @param busOffCount The number of times that sendMessage failed with a busOff error indicating that messages
-	 *  are not successfully transmitted on the bus.
-	 * @param txFullCount The number of times that sendMessage failed with a txFifoFull error indicating that messages
-	 *  are not successfully received by any CAN device.
-	 * @param receiveErrorCount The count of receive errors as reported by the CAN driver.
-	 * @param transmitErrorCount The count of transmit errors as reported by the CAN driver.
-	 * @return This should return 0 if all status was retrieved successfully or an error code if not.
-	 */
-	virtual int32_t getStatus(uint32_t &busOffCount, uint32_t &txFullCount, uint32_t &receiveErrorCount, uint32_t &transmitErrorCount) {return 0;}
-#endif
-};
-
-/**
- * This function allows you to register a CANInterfacePlugin to provide access a CAN bus.
- * 
- * @param interface A pointer to an object that inherits from CANInterfacePlugin and implements
- * the pure virtual interface.  If NULL, unregister the current plugin.
- */
-void FRC_NetworkCommunication_CANSessionMux_registerInterface(CANInterfacePlugin* interface);
-
-#endif // __CANInterfacePlugin_h__
+// CANInterfacePlugin.h
+//
+//  Defines the API for building a CAN Interface Plugin to support
+//    PWM-cable-free CAN motor control on FRC robots.  This allows you
+//    to connect any CAN interface to the secure Jaguar CAN driver.
+//
+
+#ifndef __CANInterfacePlugin_h__
+#define __CANInterfacePlugin_h__
+
+#include <stdint.h>
+
+#define CAN_IS_FRAME_REMOTE 0x80000000
+#define CAN_IS_FRAME_11BIT  0x40000000
+#define CAN_29BIT_MESSAGE_ID_MASK 0x1FFFFFFF
+#define CAN_11BIT_MESSAGE_ID_MASK 0x000007FF
+
+class CANInterfacePlugin
+{
+public:
+	CANInterfacePlugin() {}
+	virtual ~CANInterfacePlugin() {}
+
+	/**
+	 * This entry-point of the CANInterfacePlugin is passed a message that the driver needs to send to
+	 * a device on the CAN bus.
+	 * 
+	 * This function may be called from multiple contexts and must therefore be reentrant.
+	 * 
+	 * @param messageID The 29-bit CAN message ID in the lsbs.  The msb can indicate a remote frame.
+	 * @param data A pointer to a buffer containing between 0 and 8 bytes to send with the message.  May be NULL if dataSize is 0.
+	 * @param dataSize The number of bytes to send with the message.
+	 * @return Return any error code.  On success return 0.
+	 */
+	virtual int32_t sendMessage(uint32_t messageID, const uint8_t *data, uint8_t dataSize) = 0;
+
+	/**
+	 * This entry-point of the CANInterfacePlugin is passed buffers which should be populated with
+	 * any received messages from devices on the CAN bus.
+	 * 
+	 * This function is always called by a single task in the Jaguar driver, so it need not be reentrant.
+	 * 
+	 * This function is expected to block for some period of time waiting for a message from the CAN bus.
+	 * It may timeout periodically (returning non-zero to indicate no message was populated) to allow for
+	 * shutdown and unloading of the plugin.
+	 * 
+	 * @param messageID A reference to be populated with a received 29-bit CAN message ID in the lsbs.
+	 * @param data A pointer to a buffer of 8 bytes to be populated with data received with the message.
+	 * @param dataSize A reference to be populated with the size of the data received (0 - 8 bytes).
+	 * @return This should return 0 if a message was populated, non-0 if no message was not populated.
+	 */
+	virtual int32_t receiveMessage(uint32_t &messageID, uint8_t *data, uint8_t &dataSize) = 0;
+
+#if defined(__linux)
+	/**
+	 * This entry-point of the CANInterfacePlugin returns status of the CAN bus.
+	 * 
+	 * This function may be called from multiple contexts and must therefore be reentrant.
+	 * 
+	 * This function will return detailed hardware status if available for diagnostics of the CAN interface.
+	 * 
+	 * @param busOffCount The number of times that sendMessage failed with a busOff error indicating that messages
+	 *  are not successfully transmitted on the bus.
+	 * @param txFullCount The number of times that sendMessage failed with a txFifoFull error indicating that messages
+	 *  are not successfully received by any CAN device.
+	 * @param receiveErrorCount The count of receive errors as reported by the CAN driver.
+	 * @param transmitErrorCount The count of transmit errors as reported by the CAN driver.
+	 * @return This should return 0 if all status was retrieved successfully or an error code if not.
+	 */
+	virtual int32_t getStatus(uint32_t &busOffCount, uint32_t &txFullCount, uint32_t &receiveErrorCount, uint32_t &transmitErrorCount) {return 0;}
+#endif
+};
+
+/**
+ * This function allows you to register a CANInterfacePlugin to provide access a CAN bus.
+ * 
+ * @param interface A pointer to an object that inherits from CANInterfacePlugin and implements
+ * the pure virtual interface.  If NULL, unregister the current plugin.
+ */
+void FRC_NetworkCommunication_CANSessionMux_registerInterface(CANInterfacePlugin* interface);
+
+#endif // __CANInterfacePlugin_h__
diff --git a/hal/lib/shared/FRC_NetworkCommunication/FRCComm.h b/hal/lib/shared/FRC_NetworkCommunication/FRCComm.h
deleted file mode 100644
index 54c9463dcc..0000000000
--- a/hal/lib/shared/FRC_NetworkCommunication/FRCComm.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************
- * 					NOTICE
- *
- * 	These are the only externally exposed functions to the
- *   NetworkCommunication library
- *
- * This is an implementation of FRC Spec for Comm Protocol
- * Revision 4.5, June 30, 2008
- *
- * Copyright (c) National Instruments 2008.  All Rights Reserved.
- *
- *************************************************************/
-
-//This file must compile on ALL PLATFORMS. Be very careful what you put in here.
-
-#ifndef __FRC_COMM_H__
-#define __FRC_COMM_H__
-
-#ifdef _WIN32
-	#ifdef USE_THRIFT
-		#define EXPORT_FUNC
-	#else
-		#define EXPORT_FUNC __declspec(dllexport) __cdecl
-	#endif
-#else
-	#include <stdint.h>
-	#include <pthread.h>
-	#define EXPORT_FUNC
-#endif
-
-#define ERR_FRCSystem_NetCommNotResponding -44049
-#define ERR_FRCSystem_NoDSConnection -44018
-
-enum AllianceStationID_t {
-	kAllianceStationID_red1,
-	kAllianceStationID_red2,
-	kAllianceStationID_red3,
-	kAllianceStationID_blue1,
-	kAllianceStationID_blue2,
-	kAllianceStationID_blue3,
-};
-
-enum MatchType_t {
-	kMatchType_none,
-	kMatchType_practice,
-	kMatchType_qualification,
-	kMatchType_elimination,
-};
-
-struct ControlWord_t {
-	uint32_t enabled : 1;
-	uint32_t autonomous : 1;
-	uint32_t test :1;
-	uint32_t eStop : 1;
-	uint32_t fmsAttached:1;
-	uint32_t dsAttached:1;
-	uint32_t control_reserved : 26;
-};
-
-struct JoystickAxes_t {
-	uint16_t count;
-	int16_t axes[1];
-};
-
-struct JoystickPOV_t {
-	uint16_t count;
-	int16_t povs[1];
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	int EXPORT_FUNC FRC_NetworkCommunication_Reserve(void *instance);
-#ifndef SIMULATION
-	void EXPORT_FUNC getFPGAHardwareVersion(uint16_t *fpgaVersion, uint32_t *fpgaRevision);
-#endif
-	int EXPORT_FUNC setStatusData(float battery, uint8_t dsDigitalOut, uint8_t updateNumber,
-			const char *userDataHigh, int userDataHighLength,
-			const char *userDataLow, int userDataLowLength, int wait_ms);
-	int EXPORT_FUNC setErrorData(const char *errors, int errorsLength, int wait_ms);
-
-#ifdef SIMULATION
-	void EXPORT_FUNC setNewDataSem(HANDLE);
-#else
-	void EXPORT_FUNC setNewDataSem(pthread_cond_t *);
-#endif
-
-	// this uint32_t is really a LVRefNum
-	int EXPORT_FUNC setNewDataOccurRef(uint32_t refnum);
-
-	int EXPORT_FUNC FRC_NetworkCommunication_getControlWord(struct ControlWord_t *controlWord);
-	int EXPORT_FUNC FRC_NetworkCommunication_getAllianceStation(enum AllianceStationID_t *allianceStation);
-	int EXPORT_FUNC FRC_NetworkCommunication_getMatchTime(float *matchTime);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickAxes(uint8_t joystickNum, struct JoystickAxes_t *axes, uint8_t maxAxes);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickButtons(uint8_t joystickNum, uint32_t *buttons, uint8_t *count);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickPOVs(uint8_t joystickNum, struct JoystickPOV_t *povs, uint8_t maxPOVs);
-	int EXPORT_FUNC FRC_NetworkCommunication_setJoystickOutputs(uint8_t joystickNum, uint32_t hidOutputs, uint16_t leftRumble, uint16_t rightRumble);
-	int EXPORT_FUNC FRC_NetworkCommunication_getJoystickDesc(uint8_t joystickNum, uint8_t *isXBox, uint8_t *type, char *name,
-		uint8_t *axisCount, uint8_t *axisTypes, uint8_t *buttonCount, uint8_t *povCount);
-
-	void EXPORT_FUNC FRC_NetworkCommunication_getVersionString(char *version);
-	int EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramStarting(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramDisabled(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramAutonomous(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramTeleop(void);
-	void EXPORT_FUNC FRC_NetworkCommunication_observeUserProgramTest(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/wpilibc/athena/src/DriverStation.cpp b/wpilibc/athena/src/DriverStation.cpp
index 74d6aabe23..05db0dccae 100644
--- a/wpilibc/athena/src/DriverStation.cpp
+++ b/wpilibc/athena/src/DriverStation.cpp
@@ -9,7 +9,7 @@
 #include <string.h>
 #include "AnalogInput.h"
 #include "FRC_NetworkCommunication/FRCComm.h"
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 #include "MotorSafetyHelper.h"
 #include "Timer.h"
 #include "Utility.h"
diff --git a/wpilibc/sim/src/DriverStation.cpp b/wpilibc/sim/src/DriverStation.cpp
index 15d3fbe349..6cb4a40553 100644
--- a/wpilibc/sim/src/DriverStation.cpp
+++ b/wpilibc/sim/src/DriverStation.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/mem_fn.hpp>
 
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 #include "Timer.h"
 #include "Utility.h"
 #include "WPIErrors.h"
diff --git a/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp b/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp
index df7a9c3b80..1d6da1b3f1 100644
--- a/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/AnalogGyroJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_AnalogGyroJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp b/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp
index 38a2bfe0a7..cab98ece5b 100644
--- a/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/AnalogJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_AnalogJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/CANJNI.cpp b/wpilibj/src/athena/cpp/lib/CANJNI.cpp
index 2ba363cd01..dbd01222c8 100644
--- a/wpilibj/src/athena/cpp/lib/CANJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CANJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_can_CANJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp b/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
index c6a33cc9df..f6acfa3f6e 100644
--- a/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CompressorJNI.cpp
@@ -7,7 +7,7 @@
 
 #include "HAL/HAL.h"
 #include "HALUtil.h"
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 #include "edu_wpi_first_wpilibj_hal_CompressorJNI.h"
 
 extern "C" {
diff --git a/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp b/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp
index 93f6942e88..06f02f5972 100644
--- a/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/ConstantsJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_ConstantsJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/CounterJNI.cpp b/wpilibj/src/athena/cpp/lib/CounterJNI.cpp
index c798eef0de..87f943e0fc 100644
--- a/wpilibj/src/athena/cpp/lib/CounterJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/CounterJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_CounterJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/DIOJNI.cpp b/wpilibj/src/athena/cpp/lib/DIOJNI.cpp
index 8b2e6b5686..081ab37282 100644
--- a/wpilibj/src/athena/cpp/lib/DIOJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/DIOJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_DIOJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp b/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp
index fca91af9c6..d8e07451db 100644
--- a/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/EncoderJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_EncoderJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/HAL.cpp b/wpilibj/src/athena/cpp/lib/HAL.cpp
index 14147436a3..6e621fc3b0 100644
--- a/wpilibj/src/athena/cpp/lib/HAL.cpp
+++ b/wpilibj/src/athena/cpp/lib/HAL.cpp
@@ -9,7 +9,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "HAL/HAL.h"
 #include "edu_wpi_first_wpilibj_hal_HAL.h"
diff --git a/wpilibj/src/athena/cpp/lib/HALUtil.cpp b/wpilibj/src/athena/cpp/lib/HALUtil.cpp
index 8097c29ab9..e21b82c201 100644
--- a/wpilibj/src/athena/cpp/lib/HALUtil.cpp
+++ b/wpilibj/src/athena/cpp/lib/HALUtil.cpp
@@ -16,7 +16,7 @@
 
 #include "FRC_NetworkCommunication/CANSessionMux.h"
 #include "HAL/HAL.h"
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 #include "edu_wpi_first_wpilibj_hal_HALUtil.h"
 
 // set the logging level
diff --git a/wpilibj/src/athena/cpp/lib/I2CJNI.cpp b/wpilibj/src/athena/cpp/lib/I2CJNI.cpp
index 63215d7153..51fae582e9 100644
--- a/wpilibj/src/athena/cpp/lib/I2CJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/I2CJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_I2CJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp b/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
index 81822e4175..8a0980070f 100644
--- a/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/InterruptJNI.cpp
@@ -11,7 +11,7 @@
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "HAL/Interrupts.h"
 #include "HALUtil.h"
diff --git a/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp b/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
index af6990d357..d7b7950409 100644
--- a/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
+++ b/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_JNIWrapper.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp b/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
index 6c562fb6ab..157439fb9f 100644
--- a/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
@@ -15,7 +15,7 @@
 #include <mutex>
 #include <thread>
 #include "HALUtil.h"
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 #include "SafeThread.h"
 #include "edu_wpi_first_wpilibj_hal_NotifierJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/PWMJNI.cpp b/wpilibj/src/athena/cpp/lib/PWMJNI.cpp
index 7f209952a4..e65375d488 100644
--- a/wpilibj/src/athena/cpp/lib/PWMJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PWMJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_PWMJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/PortsJNI.cpp b/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
index 64eeeb2d9d..ddabdf299f 100644
--- a/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/PortsJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_PortsJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/RelayJNI.cpp b/wpilibj/src/athena/cpp/lib/RelayJNI.cpp
index c36ce19624..48f3960a9c 100644
--- a/wpilibj/src/athena/cpp/lib/RelayJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/RelayJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_RelayJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/SPIJNI.cpp b/wpilibj/src/athena/cpp/lib/SPIJNI.cpp
index 4fb286becd..3988847cc8 100644
--- a/wpilibj/src/athena/cpp/lib/SPIJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SPIJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_SPIJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp b/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp
index 9411a4c707..c92aeb637c 100644
--- a/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SerialPortJNI.cpp
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 #include <jni.h>
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_SerialPortJNI.h"
 
diff --git a/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp b/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
index 44d17827ae..dee31a0a00 100644
--- a/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
+++ b/wpilibj/src/athena/cpp/lib/SolenoidJNI.cpp
@@ -8,7 +8,7 @@
 #include <jni.h>
 #include "HAL/HAL.h"
 #include "HAL/handles/HandlesInternal.h"
-#include "Log.h"
+#include "HAL/cpp/Log.h"
 
 #include "edu_wpi_first_wpilibj_hal_SolenoidJNI.h"