diff --git a/src/main/native/cpp/JpegUtil.h b/src/main/native/cpp/JpegUtil.h
index f347b6c62e..e632317f53 100644
--- a/src/main/native/cpp/JpegUtil.h
+++ b/src/main/native/cpp/JpegUtil.h
@@ -14,7 +14,7 @@
 
 namespace wpi {
 class raw_istream;
-}
+}  // namespace wpi
 
 namespace cs {
 
diff --git a/src/main/native/include/cscore_c.h b/src/main/native/include/cscore_c.h
index 0348ca6731..d910906ccd 100644
--- a/src/main/native/include/cscore_c.h
+++ b/src/main/native/include/cscore_c.h
@@ -377,7 +377,7 @@ char** CS_GetNetworkInterfaces(int* count);
 void CS_FreeNetworkInterfaces(char** interfaces, int count);
 
 #ifdef __cplusplus
-}
+}  // extern "C"
 #endif
 
 #endif  // CSCORE_CSCORE_C_H_
diff --git a/src/main/native/include/cscore_cpp.h b/src/main/native/include/cscore_cpp.h
index 4f8f32890b..f46537e9a7 100644
--- a/src/main/native/include/cscore_cpp.h
+++ b/src/main/native/include/cscore_cpp.h
@@ -22,7 +22,7 @@
 
 namespace cv {
 class Mat;
-}
+}  // namespace cv
 
 namespace cs {
 
@@ -337,6 +337,6 @@ uint64_t CS_GrabSinkFrameCpp(CS_Sink sink, cv::Mat* image, CS_Status* status);
 uint64_t CS_GrabSinkFrameTimeoutCpp(CS_Sink sink, cv::Mat* image,
                                     double timeout, CS_Status* status);
 void CS_PutSourceFrameCpp(CS_Source source, cv::Mat* image, CS_Status* status);
-}
+}  // extern "C"
 
 #endif  // CSCORE_CSCORE_CPP_H_