diff --git a/hal/src/main/native/athena/CAN.cpp b/hal/src/main/native/athena/CAN.cpp
index 4974808301..3938c29824 100644
--- a/hal/src/main/native/athena/CAN.cpp
+++ b/hal/src/main/native/athena/CAN.cpp
@@ -46,4 +46,4 @@ void HAL_CAN_GetCANStatus(float* percentBusUtilization, uint32_t* busOffCount,
       percentBusUtilization, busOffCount, txFullCount, receiveErrorCount,
       transmitErrorCount, status);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/include/HAL/Accelerometer.h b/hal/src/main/native/include/HAL/Accelerometer.h
index 40c7d665ed..f405a44bf0 100644
--- a/hal/src/main/native/include/HAL/Accelerometer.h
+++ b/hal/src/main/native/include/HAL/Accelerometer.h
@@ -24,5 +24,5 @@ double HAL_GetAccelerometerX(void);
 double HAL_GetAccelerometerY(void);
 double HAL_GetAccelerometerZ(void);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/AnalogAccumulator.h b/hal/src/main/native/include/HAL/AnalogAccumulator.h
index ae2d973d32..d08c21daf5 100644
--- a/hal/src/main/native/include/HAL/AnalogAccumulator.h
+++ b/hal/src/main/native/include/HAL/AnalogAccumulator.h
@@ -32,5 +32,5 @@ int64_t HAL_GetAccumulatorCount(HAL_AnalogInputHandle analogPortHandle,
 void HAL_GetAccumulatorOutput(HAL_AnalogInputHandle analogPortHandle,
                               int64_t* value, int64_t* count, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/AnalogGyro.h b/hal/src/main/native/include/HAL/AnalogGyro.h
index b2a95a3d05..1442c91b6b 100644
--- a/hal/src/main/native/include/HAL/AnalogGyro.h
+++ b/hal/src/main/native/include/HAL/AnalogGyro.h
@@ -34,5 +34,5 @@ double HAL_GetAnalogGyroRate(HAL_GyroHandle handle, int32_t* status);
 double HAL_GetAnalogGyroOffset(HAL_GyroHandle handle, int32_t* status);
 int32_t HAL_GetAnalogGyroCenter(HAL_GyroHandle handle, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/AnalogInput.h b/hal/src/main/native/include/HAL/AnalogInput.h
index 64bd1e16b5..0d7e228849 100644
--- a/hal/src/main/native/include/HAL/AnalogInput.h
+++ b/hal/src/main/native/include/HAL/AnalogInput.h
@@ -46,5 +46,5 @@ int32_t HAL_GetAnalogLSBWeight(HAL_AnalogInputHandle analogPortHandle,
 int32_t HAL_GetAnalogOffset(HAL_AnalogInputHandle analogPortHandle,
                             int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/AnalogOutput.h b/hal/src/main/native/include/HAL/AnalogOutput.h
index 5e3034bbb4..679e65954b 100644
--- a/hal/src/main/native/include/HAL/AnalogOutput.h
+++ b/hal/src/main/native/include/HAL/AnalogOutput.h
@@ -24,5 +24,5 @@ double HAL_GetAnalogOutput(HAL_AnalogOutputHandle analogOutputHandle,
                            int32_t* status);
 HAL_Bool HAL_CheckAnalogOutputChannel(int32_t channel);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/AnalogTrigger.h b/hal/src/main/native/include/HAL/AnalogTrigger.h
index fd90630fc6..ae9887a38b 100644
--- a/hal/src/main/native/include/HAL/AnalogTrigger.h
+++ b/hal/src/main/native/include/HAL/AnalogTrigger.h
@@ -43,5 +43,5 @@ HAL_Bool HAL_GetAnalogTriggerOutput(HAL_AnalogTriggerHandle analogTriggerHandle,
                                     HAL_AnalogTriggerType type,
                                     int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/CAN.h b/hal/src/main/native/include/HAL/CAN.h
index e1d9b2e259..68e5f458ae 100644
--- a/hal/src/main/native/include/HAL/CAN.h
+++ b/hal/src/main/native/include/HAL/CAN.h
@@ -56,5 +56,5 @@ void HAL_CAN_GetCANStatus(float* percentBusUtilization, uint32_t* busOffCount,
                           uint32_t* transmitErrorCount, int32_t* status);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Compressor.h b/hal/src/main/native/include/HAL/Compressor.h
index ea89feb6c1..dd5cbb8adf 100644
--- a/hal/src/main/native/include/HAL/Compressor.h
+++ b/hal/src/main/native/include/HAL/Compressor.h
@@ -44,5 +44,5 @@ HAL_Bool HAL_GetCompressorNotConnectedStickyFault(
 HAL_Bool HAL_GetCompressorNotConnectedFault(
     HAL_CompressorHandle compressorHandle, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Constants.h b/hal/src/main/native/include/HAL/Constants.h
index 841fee13fb..8fe295801a 100644
--- a/hal/src/main/native/include/HAL/Constants.h
+++ b/hal/src/main/native/include/HAL/Constants.h
@@ -15,5 +15,5 @@ extern "C" {
 
 int32_t HAL_GetSystemClockTicksPerMicrosecond(void);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Counter.h b/hal/src/main/native/include/HAL/Counter.h
index 6f55d5a912..c5d1e0b6b0 100644
--- a/hal/src/main/native/include/HAL/Counter.h
+++ b/hal/src/main/native/include/HAL/Counter.h
@@ -69,5 +69,5 @@ HAL_Bool HAL_GetCounterDirection(HAL_CounterHandle counterHandle,
 void HAL_SetCounterReverseDirection(HAL_CounterHandle counterHandle,
                                     HAL_Bool reverseDirection, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/DIO.h b/hal/src/main/native/include/HAL/DIO.h
index 80ba39f4ac..21d8223f4e 100644
--- a/hal/src/main/native/include/HAL/DIO.h
+++ b/hal/src/main/native/include/HAL/DIO.h
@@ -41,5 +41,5 @@ int32_t HAL_GetFilterSelect(HAL_DigitalHandle dioPortHandle, int32_t* status);
 void HAL_SetFilterPeriod(int32_t filterIndex, int64_t value, int32_t* status);
 int64_t HAL_GetFilterPeriod(int32_t filterIndex, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Encoder.h b/hal/src/main/native/include/HAL/Encoder.h
index 4a322a937e..a495f63c46 100644
--- a/hal/src/main/native/include/HAL/Encoder.h
+++ b/hal/src/main/native/include/HAL/Encoder.h
@@ -75,5 +75,5 @@ double HAL_GetEncoderDistancePerPulse(HAL_EncoderHandle encoderHandle,
 HAL_EncoderEncodingType HAL_GetEncoderEncodingType(
     HAL_EncoderHandle encoderHandle, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/HAL.h b/hal/src/main/native/include/HAL/HAL.h
index 5003cc0f2d..cbd8d81566 100644
--- a/hal/src/main/native/include/HAL/HAL.h
+++ b/hal/src/main/native/include/HAL/HAL.h
@@ -82,5 +82,5 @@ int64_t HAL_Report(int32_t resource, int32_t instanceNumber, int32_t context,
 
 #endif  // HAL_USE_LABVIEW
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/I2C.h b/hal/src/main/native/include/HAL/I2C.h
index 1dbcd4d6f1..9ade477d9c 100644
--- a/hal/src/main/native/include/HAL/I2C.h
+++ b/hal/src/main/native/include/HAL/I2C.h
@@ -25,5 +25,5 @@ int32_t HAL_ReadI2C(HAL_I2CPort port, int32_t deviceAddress, uint8_t* buffer,
                     int32_t count);
 void HAL_CloseI2C(HAL_I2CPort port);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Interrupts.h b/hal/src/main/native/include/HAL/Interrupts.h
index e493adc155..8943d2126f 100644
--- a/hal/src/main/native/include/HAL/Interrupts.h
+++ b/hal/src/main/native/include/HAL/Interrupts.h
@@ -46,5 +46,5 @@ void HAL_SetInterruptUpSourceEdge(HAL_InterruptHandle interruptHandle,
                                   HAL_Bool risingEdge, HAL_Bool fallingEdge,
                                   int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Notifier.h b/hal/src/main/native/include/HAL/Notifier.h
index 83d4adb3aa..f269697887 100644
--- a/hal/src/main/native/include/HAL/Notifier.h
+++ b/hal/src/main/native/include/HAL/Notifier.h
@@ -26,5 +26,5 @@ void HAL_UpdateNotifierAlarm(HAL_NotifierHandle notifierHandle,
                              uint64_t triggerTime, int32_t* status);
 void HAL_StopNotifierAlarm(HAL_NotifierHandle notifierHandle, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/OSSerialPort.h b/hal/src/main/native/include/HAL/OSSerialPort.h
index 1eabbe85ee..ea689e5c75 100644
--- a/hal/src/main/native/include/HAL/OSSerialPort.h
+++ b/hal/src/main/native/include/HAL/OSSerialPort.h
@@ -46,5 +46,5 @@ void HAL_FlushOSSerial(HAL_SerialPort port, int32_t* status);
 void HAL_ClearOSSerial(HAL_SerialPort port, int32_t* status);
 void HAL_CloseOSSerial(HAL_SerialPort port, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/PDP.h b/hal/src/main/native/include/HAL/PDP.h
index 8f1b4d977f..3d729df0e4 100644
--- a/hal/src/main/native/include/HAL/PDP.h
+++ b/hal/src/main/native/include/HAL/PDP.h
@@ -28,5 +28,5 @@ double HAL_GetPDPTotalEnergy(int32_t module, int32_t* status);
 void HAL_ResetPDPTotalEnergy(int32_t module, int32_t* status);
 void HAL_ClearPDPStickyFaults(int32_t module, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/PWM.h b/hal/src/main/native/include/HAL/PWM.h
index 999b109abb..b581701b95 100644
--- a/hal/src/main/native/include/HAL/PWM.h
+++ b/hal/src/main/native/include/HAL/PWM.h
@@ -51,5 +51,5 @@ void HAL_SetPWMPeriodScale(HAL_DigitalHandle pwmPortHandle, int32_t squelchMask,
                            int32_t* status);
 int32_t HAL_GetLoopTiming(int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Ports.h b/hal/src/main/native/include/HAL/Ports.h
index 392b48e79f..29c7195125 100644
--- a/hal/src/main/native/include/HAL/Ports.h
+++ b/hal/src/main/native/include/HAL/Ports.h
@@ -32,5 +32,5 @@ int32_t HAL_GetNumSolenoidChannels(void);
 int32_t HAL_GetNumPDPModules(void);
 int32_t HAL_GetNumPDPChannels(void);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Power.h b/hal/src/main/native/include/HAL/Power.h
index c69f7f1b63..be34b9b4ef 100644
--- a/hal/src/main/native/include/HAL/Power.h
+++ b/hal/src/main/native/include/HAL/Power.h
@@ -30,5 +30,5 @@ double HAL_GetUserCurrent3V3(int32_t* status);
 HAL_Bool HAL_GetUserActive3V3(int32_t* status);
 int32_t HAL_GetUserCurrentFaults3V3(int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Relay.h b/hal/src/main/native/include/HAL/Relay.h
index d0e986445f..2f23cec5ac 100644
--- a/hal/src/main/native/include/HAL/Relay.h
+++ b/hal/src/main/native/include/HAL/Relay.h
@@ -25,5 +25,5 @@ void HAL_SetRelay(HAL_RelayHandle relayPortHandle, HAL_Bool on,
                   int32_t* status);
 HAL_Bool HAL_GetRelay(HAL_RelayHandle relayPortHandle, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/SPI.h b/hal/src/main/native/include/HAL/SPI.h
index 274f4c9ed2..65447fd2ab 100644
--- a/hal/src/main/native/include/HAL/SPI.h
+++ b/hal/src/main/native/include/HAL/SPI.h
@@ -55,5 +55,5 @@ double HAL_GetSPIAccumulatorAverage(HAL_SPIPort port, int32_t* status);
 void HAL_GetSPIAccumulatorOutput(HAL_SPIPort port, int64_t* value,
                                  int64_t* count, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/SerialPort.h b/hal/src/main/native/include/HAL/SerialPort.h
index a317b4036f..2e2e0b0c26 100644
--- a/hal/src/main/native/include/HAL/SerialPort.h
+++ b/hal/src/main/native/include/HAL/SerialPort.h
@@ -46,5 +46,5 @@ void HAL_FlushSerial(HAL_SerialPort port, int32_t* status);
 void HAL_ClearSerial(HAL_SerialPort port, int32_t* status);
 void HAL_CloseSerial(HAL_SerialPort port, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Solenoid.h b/hal/src/main/native/include/HAL/Solenoid.h
index d96234970e..3b5667309d 100644
--- a/hal/src/main/native/include/HAL/Solenoid.h
+++ b/hal/src/main/native/include/HAL/Solenoid.h
@@ -31,5 +31,5 @@ HAL_Bool HAL_GetPCMSolenoidVoltageStickyFault(int32_t module, int32_t* status);
 HAL_Bool HAL_GetPCMSolenoidVoltageFault(int32_t module, int32_t* status);
 void HAL_ClearAllPCMStickyFaults(int32_t module, int32_t* status);
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/HAL/Threads.h b/hal/src/main/native/include/HAL/Threads.h
index 7241cc00d3..6742df8167 100644
--- a/hal/src/main/native/include/HAL/Threads.h
+++ b/hal/src/main/native/include/HAL/Threads.h
@@ -25,4 +25,4 @@ HAL_Bool HAL_SetThreadPriority(NativeThreadHandle handle, HAL_Bool realTime,
                                int32_t priority, int32_t* status);
 HAL_Bool HAL_SetCurrentThreadPriority(HAL_Bool realTime, int32_t priority,
                                       int32_t* status);
-}
+}  // extern "C"
diff --git a/hal/src/main/native/include/HAL/cpp/NotifierInternal.h b/hal/src/main/native/include/HAL/cpp/NotifierInternal.h
index 05268fe8d6..7d0cc59f66 100644
--- a/hal/src/main/native/include/HAL/cpp/NotifierInternal.h
+++ b/hal/src/main/native/include/HAL/cpp/NotifierInternal.h
@@ -12,4 +12,4 @@
 extern "C" {
 HAL_NotifierHandle HAL_InitializeNotifierNonThreadedUnsafe(
     HAL_NotifierProcessFunction process, void* param, int32_t* status);
-}
+}  // extern "C"
diff --git a/hal/src/main/native/include/MockData/AccelerometerData.h b/hal/src/main/native/include/MockData/AccelerometerData.h
index 7ad30d8e60..449a70d413 100644
--- a/hal/src/main/native/include/MockData/AccelerometerData.h
+++ b/hal/src/main/native/include/MockData/AccelerometerData.h
@@ -56,5 +56,5 @@ double HALSIM_GetAccelerometerZ(int32_t index);
 void HALSIM_SetAccelerometerZ(int32_t index, double z);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/AnalogGyroData.h b/hal/src/main/native/include/MockData/AnalogGyroData.h
index 2c4263a035..f89f4e8dd2 100644
--- a/hal/src/main/native/include/MockData/AnalogGyroData.h
+++ b/hal/src/main/native/include/MockData/AnalogGyroData.h
@@ -39,5 +39,5 @@ HAL_Bool HALSIM_GetAnalogGyroInitialized(int32_t index);
 void HALSIM_SetAnalogGyroInitialized(int32_t index, HAL_Bool initialized);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/AnalogInData.h b/hal/src/main/native/include/MockData/AnalogInData.h
index e25cd368fc..516a627ae0 100644
--- a/hal/src/main/native/include/MockData/AnalogInData.h
+++ b/hal/src/main/native/include/MockData/AnalogInData.h
@@ -89,5 +89,5 @@ void HALSIM_SetAnalogInAccumulatorDeadband(int32_t index,
                                            int32_t accumulatorDeadband);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/AnalogOutData.h b/hal/src/main/native/include/MockData/AnalogOutData.h
index 0688207ca0..1f5f2be695 100644
--- a/hal/src/main/native/include/MockData/AnalogOutData.h
+++ b/hal/src/main/native/include/MockData/AnalogOutData.h
@@ -32,5 +32,5 @@ HAL_Bool HALSIM_GetAnalogOutInitialized(int32_t index);
 void HALSIM_SetAnalogOutInitialized(int32_t index, HAL_Bool initialized);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/AnalogTriggerData.h b/hal/src/main/native/include/MockData/AnalogTriggerData.h
index 3096dc8dbd..cee35e3cac 100644
--- a/hal/src/main/native/include/MockData/AnalogTriggerData.h
+++ b/hal/src/main/native/include/MockData/AnalogTriggerData.h
@@ -55,5 +55,5 @@ void HALSIM_SetAnalogTriggerTriggerMode(int32_t index,
                                         HALSIM_AnalogTriggerMode triggerMode);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/DIOData.h b/hal/src/main/native/include/MockData/DIOData.h
index db2dfb48fc..281ee0d3b0 100644
--- a/hal/src/main/native/include/MockData/DIOData.h
+++ b/hal/src/main/native/include/MockData/DIOData.h
@@ -54,5 +54,5 @@ int32_t HALSIM_GetDIOFilterIndex(int32_t index);
 void HALSIM_SetDIOFilterIndex(int32_t index, int32_t filterIndex);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/DigitalPWMData.h b/hal/src/main/native/include/MockData/DigitalPWMData.h
index 4675c3ad0a..9a4e8e1ca1 100644
--- a/hal/src/main/native/include/MockData/DigitalPWMData.h
+++ b/hal/src/main/native/include/MockData/DigitalPWMData.h
@@ -39,5 +39,5 @@ int32_t HALSIM_GetDigitalPWMPin(int32_t index);
 void HALSIM_SetDigitalPWMPin(int32_t index, int32_t pin);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/DriverStationData.h b/hal/src/main/native/include/MockData/DriverStationData.h
index 7535626c33..79a8ee9303 100644
--- a/hal/src/main/native/include/MockData/DriverStationData.h
+++ b/hal/src/main/native/include/MockData/DriverStationData.h
@@ -70,5 +70,5 @@ void HALSIM_SetDriverStationMatchTime(double matchTime);
 void HALSIM_NotifyDriverStationNewData(void);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/EncoderData.h b/hal/src/main/native/include/MockData/EncoderData.h
index 0af3e6d29b..f6588d98e2 100644
--- a/hal/src/main/native/include/MockData/EncoderData.h
+++ b/hal/src/main/native/include/MockData/EncoderData.h
@@ -79,5 +79,5 @@ int32_t HALSIM_GetEncoderSamplesToAverage(int32_t index);
 void HALSIM_SetEncoderSamplesToAverage(int32_t index, int32_t samplesToAverage);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/MockHooks.h b/hal/src/main/native/include/MockData/MockHooks.h
index 519fedcec5..1d5adac561 100644
--- a/hal/src/main/native/include/MockData/MockHooks.h
+++ b/hal/src/main/native/include/MockData/MockHooks.h
@@ -11,4 +11,4 @@ extern "C" {
 void HALSIM_WaitForProgramStart(void);
 void HALSIM_SetProgramStarted(void);
 void HALSIM_RestartTiming(void);
-}
+}  // extern "C"
diff --git a/hal/src/main/native/include/MockData/PCMData.h b/hal/src/main/native/include/MockData/PCMData.h
index e13c46e11f..8fed2299c1 100644
--- a/hal/src/main/native/include/MockData/PCMData.h
+++ b/hal/src/main/native/include/MockData/PCMData.h
@@ -75,5 +75,5 @@ double HALSIM_GetPCMCompressorCurrent(int32_t index);
 void HALSIM_SetPCMCompressorCurrent(int32_t index, double compressorCurrent);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/PDPData.h b/hal/src/main/native/include/MockData/PDPData.h
index cd2508ce4c..c16a59d4d8 100644
--- a/hal/src/main/native/include/MockData/PDPData.h
+++ b/hal/src/main/native/include/MockData/PDPData.h
@@ -47,5 +47,5 @@ double HALSIM_GetPDPCurrent(int32_t index, int32_t channel);
 void HALSIM_SetPDPCurrent(int32_t index, int32_t channel, double current);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/PWMData.h b/hal/src/main/native/include/MockData/PWMData.h
index 7ebe425211..77218c7ca5 100644
--- a/hal/src/main/native/include/MockData/PWMData.h
+++ b/hal/src/main/native/include/MockData/PWMData.h
@@ -61,5 +61,5 @@ HAL_Bool HALSIM_GetPWMZeroLatch(int32_t index);
 void HALSIM_SetPWMZeroLatch(int32_t index, HAL_Bool zeroLatch);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/RelayData.h b/hal/src/main/native/include/MockData/RelayData.h
index ec74e088e5..2ec8b1abcc 100644
--- a/hal/src/main/native/include/MockData/RelayData.h
+++ b/hal/src/main/native/include/MockData/RelayData.h
@@ -48,5 +48,5 @@ HAL_Bool HALSIM_GetRelayReverse(int32_t index);
 void HALSIM_SetRelayReverse(int32_t index, HAL_Bool reverse);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/RoboRioData.h b/hal/src/main/native/include/MockData/RoboRioData.h
index b4a4d71a99..0d2a022a0b 100644
--- a/hal/src/main/native/include/MockData/RoboRioData.h
+++ b/hal/src/main/native/include/MockData/RoboRioData.h
@@ -134,5 +134,5 @@ int32_t HALSIM_GetRoboRioUserFaults3V3(int32_t index);
 void HALSIM_SetRoboRioUserFaults3V3(int32_t index, int32_t userFaults3V3);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/include/MockData/SPIAccelerometerData.h b/hal/src/main/native/include/MockData/SPIAccelerometerData.h
index 9d4efe26d7..6a21db15aa 100644
--- a/hal/src/main/native/include/MockData/SPIAccelerometerData.h
+++ b/hal/src/main/native/include/MockData/SPIAccelerometerData.h
@@ -54,5 +54,5 @@ double HALSIM_GetSPIAccelerometerZ(int32_t index);
 void HALSIM_SetSPIAccelerometerZ(int32_t index, double z);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
diff --git a/hal/src/main/native/sim/Accelerometer.cpp b/hal/src/main/native/sim/Accelerometer.cpp
index d2c4b2c4e6..f71ffefab0 100644
--- a/hal/src/main/native/sim/Accelerometer.cpp
+++ b/hal/src/main/native/sim/Accelerometer.cpp
@@ -22,4 +22,4 @@ void HAL_SetAccelerometerRange(HAL_AccelerometerRange range) {
 double HAL_GetAccelerometerX(void) { return SimAccelerometerData[0].GetX(); }
 double HAL_GetAccelerometerY(void) { return SimAccelerometerData[0].GetY(); }
 double HAL_GetAccelerometerZ(void) { return SimAccelerometerData[0].GetZ(); }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/AnalogAccumulator.cpp b/hal/src/main/native/sim/AnalogAccumulator.cpp
index db40b67cab..fc6ba34ba9 100644
--- a/hal/src/main/native/sim/AnalogAccumulator.cpp
+++ b/hal/src/main/native/sim/AnalogAccumulator.cpp
@@ -103,4 +103,4 @@ void HAL_GetAccumulatorOutput(HAL_AnalogInputHandle analogPortHandle,
   *count = SimAnalogInData[port->channel].GetAccumulatorCount();
   *value = SimAnalogInData[port->channel].GetAccumulatorValue();
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/AnalogGyro.cpp b/hal/src/main/native/sim/AnalogGyro.cpp
index 92bc9437af..92edb37140 100644
--- a/hal/src/main/native/sim/AnalogGyro.cpp
+++ b/hal/src/main/native/sim/AnalogGyro.cpp
@@ -21,7 +21,7 @@ struct AnalogGyro {
   HAL_AnalogInputHandle handle;
   uint8_t index;
 };
-}
+}  // namespace
 
 using namespace hal;
 
@@ -132,4 +132,4 @@ double HAL_GetAnalogGyroOffset(HAL_GyroHandle handle, int32_t* status) {
 int32_t HAL_GetAnalogGyroCenter(HAL_GyroHandle handle, int32_t* status) {
   return 0;
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/AnalogInternal.cpp b/hal/src/main/native/sim/AnalogInternal.cpp
index 2bdb9e513f..104a0e7ba1 100644
--- a/hal/src/main/native/sim/AnalogInternal.cpp
+++ b/hal/src/main/native/sim/AnalogInternal.cpp
@@ -14,4 +14,4 @@ namespace hal {
 IndexedHandleResource<HAL_AnalogInputHandle, hal::AnalogPort, kNumAnalogInputs,
                       HAL_HandleEnum::AnalogInput>
     analogInputHandles;
-}
+}  // namespace hal
diff --git a/hal/src/main/native/sim/AnalogOutput.cpp b/hal/src/main/native/sim/AnalogOutput.cpp
index 2e805e7eab..503db278a7 100644
--- a/hal/src/main/native/sim/AnalogOutput.cpp
+++ b/hal/src/main/native/sim/AnalogOutput.cpp
@@ -19,7 +19,7 @@ namespace {
 struct AnalogOutput {
   uint8_t channel;
 };
-}
+}  // namespace
 
 static IndexedHandleResource<HAL_AnalogOutputHandle, AnalogOutput,
                              kNumAnalogOutputs, HAL_HandleEnum::AnalogOutput>
@@ -85,4 +85,4 @@ double HAL_GetAnalogOutput(HAL_AnalogOutputHandle analogOutputHandle,
 
   return SimAnalogOutData[port->channel].GetVoltage();
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/AnalogTrigger.cpp b/hal/src/main/native/sim/AnalogTrigger.cpp
index fe54c629c9..84bdae6c61 100644
--- a/hal/src/main/native/sim/AnalogTrigger.cpp
+++ b/hal/src/main/native/sim/AnalogTrigger.cpp
@@ -22,7 +22,7 @@ struct AnalogTrigger {
   uint8_t index;
   HAL_Bool trigState;
 };
-}
+}  // namespace
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/CAN.cpp b/hal/src/main/native/sim/CAN.cpp
index 7409f7c795..7b8d2133af 100644
--- a/hal/src/main/native/sim/CAN.cpp
+++ b/hal/src/main/native/sim/CAN.cpp
@@ -25,4 +25,4 @@ void HAL_CAN_ReadStreamSession(uint32_t sessionHandle,
 void HAL_CAN_GetCANStatus(float* percentBusUtilization, uint32_t* busOffCount,
                           uint32_t* txFullCount, uint32_t* receiveErrorCount,
                           uint32_t* transmitErrorCount, int32_t* status) {}
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/Constants.cpp b/hal/src/main/native/sim/Constants.cpp
index 070dba2d94..8969ebf6a6 100644
--- a/hal/src/main/native/sim/Constants.cpp
+++ b/hal/src/main/native/sim/Constants.cpp
@@ -15,4 +15,4 @@ extern "C" {
 int32_t HAL_GetSystemClockTicksPerMicrosecond(void) {
   return kSystemClockTicksPerMicrosecond;
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/ConstantsInternal.h b/hal/src/main/native/sim/ConstantsInternal.h
index dec1227e8a..44b060078a 100644
--- a/hal/src/main/native/sim/ConstantsInternal.h
+++ b/hal/src/main/native/sim/ConstantsInternal.h
@@ -11,4 +11,4 @@
 
 namespace hal {
 constexpr int32_t kSystemClockTicksPerMicrosecond = 40;
-}
+}  // namespace hal
diff --git a/hal/src/main/native/sim/Counter.cpp b/hal/src/main/native/sim/Counter.cpp
index 2f56adff10..fdef404485 100644
--- a/hal/src/main/native/sim/Counter.cpp
+++ b/hal/src/main/native/sim/Counter.cpp
@@ -18,7 +18,7 @@ namespace hal {
 LimitedHandleResource<HAL_CounterHandle, Counter, kNumCounters,
                       HAL_HandleEnum::Counter>
     counterHandles;
-}
+}  // namespace hal
 
 extern "C" {
 HAL_CounterHandle HAL_InitializeCounter(HAL_Counter_Mode mode, int32_t* index,
@@ -83,4 +83,4 @@ HAL_Bool HAL_GetCounterDirection(HAL_CounterHandle counterHandle,
 void HAL_SetCounterReverseDirection(HAL_CounterHandle counterHandle,
                                     HAL_Bool reverseDirection,
                                     int32_t* status) {}
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/DIO.cpp b/hal/src/main/native/sim/DIO.cpp
index 61eb9b7ba2..3b8ededd88 100644
--- a/hal/src/main/native/sim/DIO.cpp
+++ b/hal/src/main/native/sim/DIO.cpp
@@ -333,4 +333,4 @@ void HAL_SetFilterPeriod(int32_t filterIndex, int64_t value, int32_t* status) {
 int64_t HAL_GetFilterPeriod(int32_t filterIndex, int32_t* status) {
   return 0;  // TODO(Thad) figure this out
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/Encoder.cpp b/hal/src/main/native/sim/Encoder.cpp
index 415ae64df8..a80a17b56c 100644
--- a/hal/src/main/native/sim/Encoder.cpp
+++ b/hal/src/main/native/sim/Encoder.cpp
@@ -25,7 +25,7 @@ struct Encoder {
   uint8_t index;
 };
 struct Empty {};
-}
+}  // namespace
 
 static LimitedHandleResource<HAL_EncoderHandle, Encoder,
                              kNumEncoders + kNumCounters,
diff --git a/hal/src/main/native/sim/I2C.cpp b/hal/src/main/native/sim/I2C.cpp
index 71dc289714..d31d0734f4 100644
--- a/hal/src/main/native/sim/I2C.cpp
+++ b/hal/src/main/native/sim/I2C.cpp
@@ -23,4 +23,4 @@ int32_t HAL_ReadI2C(HAL_I2CPort port, int32_t deviceAddress, uint8_t* buffer,
   return 0;
 }
 void HAL_CloseI2C(HAL_I2CPort port) {}
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/AccelerometerData.cpp b/hal/src/main/native/sim/MockData/AccelerometerData.cpp
index a21c4b17cb..3b513df2c2 100644
--- a/hal/src/main/native/sim/MockData/AccelerometerData.cpp
+++ b/hal/src/main/native/sim/MockData/AccelerometerData.cpp
@@ -309,4 +309,4 @@ double HALSIM_GetAccelerometerZ(int32_t index) {
 void HALSIM_SetAccelerometerZ(int32_t index, double z) {
   SimAccelerometerData[index].SetZ(z);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/AnalogGyroData.cpp b/hal/src/main/native/sim/MockData/AnalogGyroData.cpp
index 6156231deb..f0bcba3024 100644
--- a/hal/src/main/native/sim/MockData/AnalogGyroData.cpp
+++ b/hal/src/main/native/sim/MockData/AnalogGyroData.cpp
@@ -192,4 +192,4 @@ HAL_Bool HALSIM_GetAnalogGyroInitialized(int32_t index) {
 void HALSIM_SetAnalogGyroInitialized(int32_t index, HAL_Bool initialized) {
   SimAnalogGyroData[index].SetInitialized(initialized);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/AnalogInData.cpp b/hal/src/main/native/sim/MockData/AnalogInData.cpp
index 55e6797fbf..a8935d564b 100644
--- a/hal/src/main/native/sim/MockData/AnalogInData.cpp
+++ b/hal/src/main/native/sim/MockData/AnalogInData.cpp
@@ -550,4 +550,4 @@ void HALSIM_SetAnalogInAccumulatorDeadband(int32_t index,
                                            int32_t accumulatorDeadband) {
   SimAnalogInData[index].SetAccumulatorDeadband(accumulatorDeadband);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/AnalogOutData.cpp b/hal/src/main/native/sim/MockData/AnalogOutData.cpp
index 115d0f28b6..dd4a0928f9 100644
--- a/hal/src/main/native/sim/MockData/AnalogOutData.cpp
+++ b/hal/src/main/native/sim/MockData/AnalogOutData.cpp
@@ -135,4 +135,4 @@ HAL_Bool HALSIM_GetAnalogOutInitialized(int32_t index) {
 void HALSIM_SetAnalogOutInitialized(int32_t index, HAL_Bool initialized) {
   SimAnalogOutData[index].SetInitialized(initialized);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp b/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp
index 9bef85b0e6..a12ae19312 100644
--- a/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp
+++ b/hal/src/main/native/sim/MockData/AnalogTriggerData.cpp
@@ -254,4 +254,4 @@ void HALSIM_SetAnalogTriggerTriggerMode(int32_t index,
                                         HALSIM_AnalogTriggerMode triggerMode) {
   SimAnalogTriggerData[index].SetTriggerMode(triggerMode);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/DIOData.cpp b/hal/src/main/native/sim/MockData/DIOData.cpp
index e26742418e..e68f3cc5e8 100644
--- a/hal/src/main/native/sim/MockData/DIOData.cpp
+++ b/hal/src/main/native/sim/MockData/DIOData.cpp
@@ -303,4 +303,4 @@ int32_t HALSIM_GetDIOFilterIndex(int32_t index) {
 void HALSIM_SetDIOFilterIndex(int32_t index, int32_t filterIndex) {
   SimDIOData[index].SetFilterIndex(filterIndex);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/DigitalPWMData.cpp b/hal/src/main/native/sim/MockData/DigitalPWMData.cpp
index a45d3c5660..6d76e091e2 100644
--- a/hal/src/main/native/sim/MockData/DigitalPWMData.cpp
+++ b/hal/src/main/native/sim/MockData/DigitalPWMData.cpp
@@ -192,4 +192,4 @@ int32_t HALSIM_GetDigitalPWMPin(int32_t index) {
 void HALSIM_SetDigitalPWMPin(int32_t index, int32_t pin) {
   SimDigitalPWMData[index].SetPin(pin);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/EncoderData.cpp b/hal/src/main/native/sim/MockData/EncoderData.cpp
index ad7a0e27f5..b7f1a878b4 100644
--- a/hal/src/main/native/sim/MockData/EncoderData.cpp
+++ b/hal/src/main/native/sim/MockData/EncoderData.cpp
@@ -485,4 +485,4 @@ void HALSIM_SetEncoderSamplesToAverage(int32_t index,
                                        int32_t samplesToAverage) {
   SimEncoderData[index].SetSamplesToAverage(samplesToAverage);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/PCMData.cpp b/hal/src/main/native/sim/MockData/PCMData.cpp
index 5d23c95221..1da5f6a2ad 100644
--- a/hal/src/main/native/sim/MockData/PCMData.cpp
+++ b/hal/src/main/native/sim/MockData/PCMData.cpp
@@ -448,4 +448,4 @@ double HALSIM_GetPCMCompressorCurrent(int32_t index) {
 void HALSIM_SetPCMCompressorCurrent(int32_t index, double compressorCurrent) {
   SimPCMData[index].SetCompressorCurrent(compressorCurrent);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/PDPData.cpp b/hal/src/main/native/sim/MockData/PDPData.cpp
index 4cf666df87..2fb8048635 100644
--- a/hal/src/main/native/sim/MockData/PDPData.cpp
+++ b/hal/src/main/native/sim/MockData/PDPData.cpp
@@ -250,4 +250,4 @@ double HALSIM_GetPDPCurrent(int32_t index, int32_t channel) {
 void HALSIM_SetPDPCurrent(int32_t index, int32_t channel, double current) {
   SimPDPData[index].SetCurrent(channel, current);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/PWMData.cpp b/hal/src/main/native/sim/MockData/PWMData.cpp
index ec0098bfc9..2f86d893fd 100644
--- a/hal/src/main/native/sim/MockData/PWMData.cpp
+++ b/hal/src/main/native/sim/MockData/PWMData.cpp
@@ -361,4 +361,4 @@ HAL_Bool HALSIM_GetPWMZeroLatch(int32_t index) {
 void HALSIM_SetPWMZeroLatch(int32_t index, HAL_Bool zeroLatch) {
   SimPWMData[index].SetZeroLatch(zeroLatch);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/RelayData.cpp b/hal/src/main/native/sim/MockData/RelayData.cpp
index c9ad8b2aaf..496e123e43 100644
--- a/hal/src/main/native/sim/MockData/RelayData.cpp
+++ b/hal/src/main/native/sim/MockData/RelayData.cpp
@@ -251,4 +251,4 @@ HAL_Bool HALSIM_GetRelayReverse(int32_t index) {
 void HALSIM_SetRelayReverse(int32_t index, HAL_Bool reverse) {
   SimRelayData[index].SetReverse(reverse);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/RoboRioData.cpp b/hal/src/main/native/sim/MockData/RoboRioData.cpp
index 58ab6fd9b8..7c4c797528 100644
--- a/hal/src/main/native/sim/MockData/RoboRioData.cpp
+++ b/hal/src/main/native/sim/MockData/RoboRioData.cpp
@@ -887,4 +887,4 @@ int32_t HALSIM_GetRoboRioUserFaults3V3(int32_t index) {
 void HALSIM_SetRoboRioUserFaults3V3(int32_t index, int32_t userFaults3V3) {
   SimRoboRioData[index].SetUserFaults3V3(userFaults3V3);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp b/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp
index eb729871d5..3436e7fa88 100644
--- a/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp
+++ b/hal/src/main/native/sim/MockData/SPIAccelerometerData.cpp
@@ -306,4 +306,4 @@ double HALSIM_GetSPIAccelerometerZ(int32_t index) {
 void HALSIM_SetSPIAccelerometerZ(int32_t index, double z) {
   SimSPIAccelerometerData[index].SetZ(z);
 }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockHooks.cpp b/hal/src/main/native/sim/MockHooks.cpp
index 35b03dee7e..15f1fc0aa6 100644
--- a/hal/src/main/native/sim/MockHooks.cpp
+++ b/hal/src/main/native/sim/MockHooks.cpp
@@ -51,4 +51,4 @@ void HALSIM_WaitForProgramStart(void) {
 void HALSIM_SetProgramStarted(void) { SetProgramStarted(); }
 
 void HALSIM_RestartTiming(void) { RestartTiming(); }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/MockHooksInternal.h b/hal/src/main/native/sim/MockHooksInternal.h
index 4b656dc8ef..44e9e454f7 100644
--- a/hal/src/main/native/sim/MockHooksInternal.h
+++ b/hal/src/main/native/sim/MockHooksInternal.h
@@ -19,4 +19,4 @@ int64_t GetFPGATime();
 double GetFPGATimestamp();
 
 void SetProgramStarted();
-}
+}  // namespace hal
diff --git a/hal/src/main/native/sim/OSSerialPort.cpp b/hal/src/main/native/sim/OSSerialPort.cpp
index 18db8ee144..31dc0b5df0 100644
--- a/hal/src/main/native/sim/OSSerialPort.cpp
+++ b/hal/src/main/native/sim/OSSerialPort.cpp
@@ -44,4 +44,4 @@ int32_t HAL_WriteOSSerial(HAL_SerialPort port, const char* buffer,
 void HAL_FlushOSSerial(HAL_SerialPort port, int32_t* status) {}
 void HAL_ClearOSSerial(HAL_SerialPort port, int32_t* status) {}
 void HAL_CloseOSSerial(HAL_SerialPort port, int32_t* status) {}
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/PDP.cpp b/hal/src/main/native/sim/PDP.cpp
index 311cd2c52b..b0389b888a 100644
--- a/hal/src/main/native/sim/PDP.cpp
+++ b/hal/src/main/native/sim/PDP.cpp
@@ -38,4 +38,4 @@ double HAL_GetPDPTotalPower(int32_t module, int32_t* status) { return 0.0; }
 double HAL_GetPDPTotalEnergy(int32_t module, int32_t* status) { return 0.0; }
 void HAL_ResetPDPTotalEnergy(int32_t module, int32_t* status) {}
 void HAL_ClearPDPStickyFaults(int32_t module, int32_t* status) {}
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/Ports.cpp b/hal/src/main/native/sim/Ports.cpp
index 8403cf70ef..ba70c91921 100644
--- a/hal/src/main/native/sim/Ports.cpp
+++ b/hal/src/main/native/sim/Ports.cpp
@@ -31,4 +31,4 @@ int32_t HAL_GetNumSolenoidChannels(void) { return kNumSolenoidChannels; }
 int32_t HAL_GetNumPDPModules(void) { return kNumPDPModules; }
 int32_t HAL_GetNumPDPChannels(void) { return kNumPDPChannels; }
 int32_t HAL_GetNumCanTalons(void) { return kNumCanTalons; }
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/Relay.cpp b/hal/src/main/native/sim/Relay.cpp
index 883dc03a95..5dfca08a34 100644
--- a/hal/src/main/native/sim/Relay.cpp
+++ b/hal/src/main/native/sim/Relay.cpp
@@ -18,7 +18,7 @@ struct Relay {
   uint8_t channel;
   bool fwd;
 };
-}
+}  // namespace
 
 static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
                              HAL_HandleEnum::Relay>
diff --git a/hal/src/main/native/sim/SerialPort.cpp b/hal/src/main/native/sim/SerialPort.cpp
index 18bd829e4e..8a8661004a 100644
--- a/hal/src/main/native/sim/SerialPort.cpp
+++ b/hal/src/main/native/sim/SerialPort.cpp
@@ -61,4 +61,4 @@ void HAL_FlushSerial(HAL_SerialPort port, int32_t* status) {}
 void HAL_ClearSerial(HAL_SerialPort port, int32_t* status) {}
 
 void HAL_CloseSerial(HAL_SerialPort port, int32_t* status) {}
-}
+}  // extern "C"
diff --git a/hal/src/main/native/sim/Solenoid.cpp b/hal/src/main/native/sim/Solenoid.cpp
index 26d44f92c9..145bb75f67 100644
--- a/hal/src/main/native/sim/Solenoid.cpp
+++ b/hal/src/main/native/sim/Solenoid.cpp
@@ -18,7 +18,7 @@ struct Solenoid {
   uint8_t module;
   uint8_t channel;
 };
-}
+}  // namespace
 
 using namespace hal;
 
@@ -117,4 +117,4 @@ HAL_Bool HAL_GetPCMSolenoidVoltageFault(int32_t module, int32_t* status) {
   return 0;
 }
 void HAL_ClearAllPCMStickyFaults(int32_t module, int32_t* status) {}
-}
+}  // extern "C"
diff --git a/wpilibc/src/main/native/include/Base.h b/wpilibc/src/main/native/include/Base.h
index cda0e301ce..a87c801d99 100644
--- a/wpilibc/src/main/native/include/Base.h
+++ b/wpilibc/src/main/native/include/Base.h
@@ -37,7 +37,7 @@
 namespace std {
 template <class T>
 using decay_t = typename decay<T>::type;
-}
+}  // namespace std
 #endif
 #endif
 
diff --git a/wpilibc/src/main/native/include/vision/VisionPipeline.h b/wpilibc/src/main/native/include/vision/VisionPipeline.h
index df494f863b..59d3092231 100644
--- a/wpilibc/src/main/native/include/vision/VisionPipeline.h
+++ b/wpilibc/src/main/native/include/vision/VisionPipeline.h
@@ -9,7 +9,7 @@
 
 namespace cv {
 class Mat;
-}
+}  // namespace cv
 
 namespace frc {