SCRIPT: wpiformat

cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp

@@ -7,11 +7,10 @@
 #include <memory>
 #include <string>
 
-#include "wpi/util/timestamp.h"
-
 #include "Handle.hpp"
 #include "Instance.hpp"
 #include "Notifier.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_CONFIGURABLESOURCEIMPL_H_
-#define CSCORE_CONFIGURABLESOURCEIMPL_H_
+#ifndef CSCORE_CONFIGURABLESOURCEIMPL_HPP_
+#define CSCORE_CONFIGURABLESOURCEIMPL_HPP_
 
 #include <atomic>
 #include <functional>
@@ -50,4 +50,4 @@ class ConfigurableSourceImpl : public SourceImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_CONFIGURABLESOURCEIMPL_H_
+#endif  // CSCORE_CONFIGURABLESOURCEIMPL_HPP_

cscore/src/main/native/cpp/Frame.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_FRAME_H_
-#define CSCORE_FRAME_H_
+#ifndef CSCORE_FRAME_HPP_
+#define CSCORE_FRAME_HPP_
 
 #include <atomic>
 #include <memory>
@@ -12,11 +12,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "Image.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 
@@ -253,4 +252,4 @@ class Frame {
 
 }  // namespace cs
 
-#endif  // CSCORE_FRAME_H_
+#endif  // CSCORE_FRAME_HPP_

cscore/src/main/native/cpp/Handle.hpp

@@ -2,12 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_HANDLE_H_
-#define CSCORE_HANDLE_H_
-
-#include "wpi/util/Synchronization.h"
+#ifndef CSCORE_HANDLE_HPP_
+#define CSCORE_HANDLE_HPP_
 
 #include "wpi/cs/cscore_c.h"
+#include "wpi/util/Synchronization.h"
 
 namespace cs {
 
@@ -66,4 +65,4 @@ class Handle {
 
 }  // namespace cs
 
-#endif  // CSCORE_HANDLE_H_
+#endif  // CSCORE_HANDLE_HPP_

cscore/src/main/native/cpp/HttpCameraImpl.cpp

@@ -10,10 +10,7 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/timestamp.h"
-#include "wpi/net/TCPConnector.h"
+#include <wpi/net/TCPConnector.h>
 
 #include "Instance.hpp"
 #include "JpegUtil.hpp"
@@ -21,6 +18,9 @@
 #include "Notifier.hpp"
 #include "Telemetry.hpp"
 #include "c_util.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/HttpCameraImpl.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_HTTPCAMERAIMPL_H_
-#define CSCORE_HTTPCAMERAIMPL_H_
+#ifndef CSCORE_HTTPCAMERAIMPL_HPP_
+#define CSCORE_HTTPCAMERAIMPL_HPP_
 
 #include <atomic>
 #include <functional>
@@ -15,13 +15,13 @@
 #include <thread>
 #include <vector>
 
-#include "wpi/util/StringMap.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/raw_istream.hpp"
-#include "wpi/net/HttpUtil.hpp"
+#include <wpi/net/HttpUtil.hpp>
 
 #include "SourceImpl.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/raw_istream.hpp"
 
 namespace cs {
 
@@ -160,4 +160,4 @@ class AxisCameraImpl : public HttpCameraImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_HTTPCAMERAIMPL_H_
+#endif  // CSCORE_HTTPCAMERAIMPL_HPP_

cscore/src/main/native/cpp/Image.hpp

@@ -2,16 +2,16 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_IMAGE_H_
-#define CSCORE_IMAGE_H_
+#ifndef CSCORE_IMAGE_HPP_
+#define CSCORE_IMAGE_HPP_
 
 #include <string_view>
 #include <vector>
 
 #include <opencv2/core/core.hpp>
 
-#include "wpi/cs/cscore_cpp.hpp"
 #include "default_init_allocator.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 
@@ -131,4 +131,4 @@ class Image {
 
 }  // namespace cs
 
-#endif  // CSCORE_IMAGE_H_
+#endif  // CSCORE_IMAGE_HPP_

cscore/src/main/native/cpp/Instance.cpp

@@ -9,6 +9,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
 

cscore/src/main/native/cpp/Instance.hpp

@@ -2,14 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_INSTANCE_H_
-#define CSCORE_INSTANCE_H_
+#ifndef CSCORE_INSTANCE_HPP_
+#define CSCORE_INSTANCE_HPP_
 
 #include <memory>
 #include <utility>
 
-#include "wpi/util/Logger.hpp"
-#include "wpi/net/EventLoopRunner.hpp"
+#include <wpi/net/EventLoopRunner.hpp>
 
 #include "Log.hpp"
 #include "NetworkListener.hpp"
@@ -19,6 +18,7 @@
 #include "Telemetry.hpp"
 #include "UnlimitedHandleResource.hpp"
 #include "UsbCameraListener.hpp"
+#include "wpi/util/Logger.hpp"
 
 namespace cs {
 
@@ -112,4 +112,4 @@ class Instance {
 
 }  // namespace cs
 
-#endif  // CSCORE_INSTANCE_H_
+#endif  // CSCORE_INSTANCE_HPP_

cscore/src/main/native/cpp/JpegUtil.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_JPEGUTIL_H_
-#define CSCORE_JPEGUTIL_H_
+#ifndef CSCORE_JPEGUTIL_HPP_
+#define CSCORE_JPEGUTIL_HPP_
 
 #include <string>
 #include <string_view>
@@ -26,4 +26,4 @@ bool ReadJpeg(wpi::raw_istream& is, std::string& buf, int* width, int* height);
 
 }  // namespace cs
 
-#endif  // CSCORE_JPEGUTIL_H_
+#endif  // CSCORE_JPEGUTIL_HPP_

cscore/src/main/native/cpp/Log.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_LOG_H_
-#define CSCORE_LOG_H_
+#ifndef CSCORE_LOG_HPP_
+#define CSCORE_LOG_HPP_
 
 #include <string_view>
 
@@ -88,4 +88,4 @@ inline void NamedLog(wpi::Logger& logger, unsigned int level, const char* file,
   SLOG(::wpi::WPI_LOG_DEBUG4, format __VA_OPT__(, ) __VA_ARGS__)
 #endif
 
-#endif  // CSCORE_LOG_H_
+#endif  // CSCORE_LOG_HPP_

cscore/src/main/native/cpp/MjpegServerImpl.cpp

@@ -9,14 +9,10 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/fmt/raw_ostream.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/net/HttpUtil.hpp"
-#include "wpi/net/TCPAcceptor.h"
-#include "wpi/net/raw_socket_istream.hpp"
-#include "wpi/net/raw_socket_ostream.hpp"
+#include <wpi/net/HttpUtil.hpp>
+#include <wpi/net/TCPAcceptor.h>
+#include <wpi/net/raw_socket_istream.hpp>
+#include <wpi/net/raw_socket_ostream.hpp>
 
 #include "Instance.hpp"
 #include "JpegUtil.hpp"
@@ -25,6 +21,10 @@
 #include "SourceImpl.hpp"
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fmt/raw_ostream.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/MjpegServerImpl.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_MJPEGSERVERIMPL_H_
-#define CSCORE_MJPEGSERVERIMPL_H_
+#ifndef CSCORE_MJPEGSERVERIMPL_HPP_
+#define CSCORE_MJPEGSERVERIMPL_HPP_
 
 #include <atomic>
 #include <memory>
@@ -12,15 +12,15 @@
 #include <thread>
 #include <vector>
 
+#include <wpi/net/NetworkAcceptor.hpp>
+#include <wpi/net/NetworkStream.hpp>
+#include <wpi/net/raw_socket_ostream.hpp>
+
+#include "SinkImpl.hpp"
 #include "wpi/util/SafeThread.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/raw_istream.hpp"
 #include "wpi/util/raw_ostream.hpp"
-#include "wpi/net/NetworkAcceptor.hpp"
-#include "wpi/net/NetworkStream.hpp"
-#include "wpi/net/raw_socket_ostream.hpp"
-
-#include "SinkImpl.hpp"
 
 namespace cs {
 
@@ -65,4 +65,4 @@ class MjpegServerImpl : public SinkImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_MJPEGSERVERIMPL_H_
+#endif  // CSCORE_MJPEGSERVERIMPL_HPP_

cscore/src/main/native/cpp/NetworkListener.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_NETWORKLISTENER_H_
-#define CSCORE_NETWORKLISTENER_H_
+#ifndef CSCORE_NETWORKLISTENER_HPP_
+#define CSCORE_NETWORKLISTENER_HPP_
 
 #include <memory>
 
@@ -28,4 +28,4 @@ class NetworkListener {
 
 }  // namespace cs
 
-#endif  // CSCORE_NETWORKLISTENER_H_
+#endif  // CSCORE_NETWORKLISTENER_HPP_

cscore/src/main/native/cpp/Notifier.hpp

@@ -2,16 +2,15 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_NOTIFIER_H_
-#define CSCORE_NOTIFIER_H_
+#ifndef CSCORE_NOTIFIER_HPP_
+#define CSCORE_NOTIFIER_HPP_
 
 #include <functional>
 #include <utility>
 
-#include "wpi/util/CallbackManager.hpp"
-
 #include "Handle.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/CallbackManager.hpp"
 
 namespace cs {
 
@@ -90,4 +89,4 @@ class Notifier : public wpi::CallbackManager<Notifier, impl::NotifierThread> {
 
 }  // namespace cs
 
-#endif  // CSCORE_NOTIFIER_H_
+#endif  // CSCORE_NOTIFIER_HPP_

cscore/src/main/native/cpp/PropertyContainer.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_PROPERTYCONTAINER_H_
-#define CSCORE_PROPERTYCONTAINER_H_
+#ifndef CSCORE_PROPERTYCONTAINER_HPP_
+#define CSCORE_PROPERTYCONTAINER_HPP_
 
 #include <atomic>
 #include <cstddef>
@@ -13,13 +13,12 @@
 #include <string_view>
 #include <vector>
 
+#include "PropertyImpl.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "PropertyImpl.hpp"
-#include "wpi/cs/cscore_cpp.hpp"
-
 namespace wpi {
 class Logger;
 template <typename T>
@@ -126,4 +125,4 @@ class PropertyContainer {
 
 }  // namespace cs
 
-#endif  // CSCORE_PROPERTYCONTAINER_H_
+#endif  // CSCORE_PROPERTYCONTAINER_HPP_

cscore/src/main/native/cpp/PropertyImpl.hpp

@@ -2,16 +2,15 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_PROPERTYIMPL_H_
-#define CSCORE_PROPERTYIMPL_H_
+#ifndef CSCORE_PROPERTYIMPL_HPP_
+#define CSCORE_PROPERTYIMPL_HPP_
 
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/cs/cscore_c.h"
+#include "wpi/util/Signal.h"
 
 namespace cs {
 
@@ -51,4 +50,4 @@ class PropertyImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_PROPERTYIMPL_H_
+#endif  // CSCORE_PROPERTYIMPL_HPP_

cscore/src/main/native/cpp/RawSinkImpl.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_RAWSINKIMPL_H_
-#define CSCORE_RAWSINKIMPL_H_
+#ifndef CSCORE_RAWSINKIMPL_HPP_
+#define CSCORE_RAWSINKIMPL_HPP_
 
 #include <stdint.h>
 
@@ -12,11 +12,10 @@
 #include <string_view>
 #include <thread>
 
-#include "wpi/util/condition_variable.hpp"
-
 #include "Frame.hpp"
 #include "SinkImpl.hpp"
 #include "wpi/cs/cscore_raw.h"
+#include "wpi/util/condition_variable.hpp"
 
 namespace cs {
 class SourceImpl;
@@ -51,4 +50,4 @@ class RawSinkImpl : public SinkImpl {
 };
 }  // namespace cs
 
-#endif  // CSCORE_RAWSINKIMPL_H_
+#endif  // CSCORE_RAWSINKIMPL_HPP_

cscore/src/main/native/cpp/RawSourceImpl.cpp

@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "wpi/util/timestamp.h"
-
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "wpi/cs/cscore_raw.h"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/RawSourceImpl.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_RAWSOURCEIMPL_H_
-#define CSCORE_RAWSOURCEIMPL_H_
+#ifndef CSCORE_RAWSOURCEIMPL_HPP_
+#define CSCORE_RAWSOURCEIMPL_HPP_
 
 #include <atomic>
 #include <functional>
@@ -33,4 +33,4 @@ class RawSourceImpl : public ConfigurableSourceImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_RAWSOURCEIMPL_H_
+#endif  // CSCORE_RAWSOURCEIMPL_HPP_

cscore/src/main/native/cpp/SinkImpl.cpp

@@ -6,13 +6,12 @@
 
 #include <string>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/json.hpp"
-
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "SourceImpl.hpp"
 #include "c_util.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/SinkImpl.hpp

@@ -2,19 +2,18 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_SINKIMPL_H_
-#define CSCORE_SINKIMPL_H_
+#ifndef CSCORE_SINKIMPL_HPP_
+#define CSCORE_SINKIMPL_HPP_
 
 #include <memory>
 #include <string>
 #include <string_view>
 
+#include "SourceImpl.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "SourceImpl.hpp"
-
 namespace cs {
 
 class Frame;
@@ -75,4 +74,4 @@ class SinkImpl : public PropertyContainer {
 
 }  // namespace cs
 
-#endif  // CSCORE_SINKIMPL_H_
+#endif  // CSCORE_SINKIMPL_HPP_

cscore/src/main/native/cpp/SourceImpl.cpp

@@ -11,13 +11,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "Log.hpp"
 #include "Notifier.hpp"
 #include "Telemetry.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/SourceImpl.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_SOURCEIMPL_H_
-#define CSCORE_SOURCEIMPL_H_
+#ifndef CSCORE_SOURCEIMPL_HPP_
+#define CSCORE_SOURCEIMPL_HPP_
 
 #include <atomic>
 #include <cstddef>
@@ -12,17 +12,16 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/RawFrame.h"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/json_fwd.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "Frame.hpp"
 #include "Handle.hpp"
 #include "Image.hpp"
 #include "PropertyContainer.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 
@@ -196,4 +195,4 @@ class SourceImpl : public PropertyContainer {
 
 }  // namespace cs
 
-#endif  // CSCORE_SOURCEIMPL_H_
+#endif  // CSCORE_SOURCEIMPL_HPP_

cscore/src/main/native/cpp/Telemetry.cpp

@@ -7,13 +7,12 @@
 #include <chrono>
 #include <utility>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "Handle.hpp"
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "SourceImpl.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 

cscore/src/main/native/cpp/Telemetry.hpp

@@ -2,12 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_TELEMETRY_H_
-#define CSCORE_TELEMETRY_H_
-
-#include "wpi/util/SafeThread.hpp"
+#ifndef CSCORE_TELEMETRY_HPP_
+#define CSCORE_TELEMETRY_HPP_
 
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/SafeThread.hpp"
 
 namespace cs {
 
@@ -44,4 +43,4 @@ class Telemetry {
 
 }  // namespace cs
 
-#endif  // CSCORE_TELEMETRY_H_
+#endif  // CSCORE_TELEMETRY_HPP_

cscore/src/main/native/cpp/UnlimitedHandleResource.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_UNLIMITEDHANDLERESOURCE_H_
-#define CSCORE_UNLIMITEDHANDLERESOURCE_H_
+#ifndef CSCORE_UNLIMITEDHANDLERESOURCE_HPP_
+#define CSCORE_UNLIMITEDHANDLERESOURCE_HPP_
 
 #include <memory>
 #include <span>
@@ -191,4 +191,4 @@ UnlimitedHandleResource<THandle, TStruct, typeValue, TMutex>::FindIf(F func) {
 
 }  // namespace cs
 
-#endif  // CSCORE_UNLIMITEDHANDLERESOURCE_H_
+#endif  // CSCORE_UNLIMITEDHANDLERESOURCE_HPP_

cscore/src/main/native/cpp/UsbCameraImplCommon.cpp

@@ -4,10 +4,9 @@
 
 #include "wpi/cs/cscore_c.h"  // NOLINT(build/include_order)
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/MemAlloc.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/UsbCameraListener.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_USBCAMERALISTENER_H_
-#define CSCORE_USBCAMERALISTENER_H_
+#ifndef CSCORE_USBCAMERALISTENER_HPP_
+#define CSCORE_USBCAMERALISTENER_HPP_
 
 #include <memory>
 
@@ -28,4 +28,4 @@ class UsbCameraListener {
 
 }  // namespace cs
 
-#endif  // CSCORE_USBCAMERALISTENER_H_
+#endif  // CSCORE_USBCAMERALISTENER_HPP_

cscore/src/main/native/cpp/c_util.hpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#ifndef CSCORE_C_UTIL_H_
-#define CSCORE_C_UTIL_H_
+#ifndef CSCORE_C_UTIL_HPP_
+#define CSCORE_C_UTIL_HPP_
 
 #include <cstring>
 #include <string_view>
@@ -19,4 +19,4 @@ inline void ConvertToC(struct WPI_String* output, std::string_view str) {
 
 }  // namespace cs
 
-#endif  // CSCORE_C_UTIL_H_
+#endif  // CSCORE_C_UTIL_HPP_

cscore/src/main/native/cpp/cscore_c.cpp

@@ -10,11 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/SmallString.hpp"
-
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/SmallString.hpp"
 
 static CS_Event ConvertToC(const cs::RawEvent& rawEvent) {
   CS_Event event;

cscore/src/main/native/cpp/cscore_cpp.cpp

@@ -8,9 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/net/hostname.hpp"
+#include <wpi/net/hostname.hpp>
 
 #include "Handle.hpp"
 #include "Instance.hpp"
@@ -20,6 +18,8 @@
 #include "SinkImpl.hpp"
 #include "SourceImpl.hpp"
 #include "Telemetry.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace cs;
 

cscore/src/main/native/cpp/cscore_oo.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/util/json.hpp"
 
 using namespace cs;

cscore/src/main/native/cpp/default_init_allocator.hpp

@@ -2,8 +2,8 @@
 // http://stackoverflow.com/questions/21028299/is-this-behavior-of-vectorresizesize-type-n-under-c11-and-boost-container
 // Credits: Casey and Howard Hinnant
 
-#ifndef CSCORE_DEFAULT_INIT_ALLOCATOR_H_
-#define CSCORE_DEFAULT_INIT_ALLOCATOR_H_
+#ifndef CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_
+#define CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_
 
 #include <memory>
 #include <utility>
@@ -38,4 +38,4 @@ class default_init_allocator : public A {
 
 }  // namespace cs
 
-#endif  // CSCORE_DEFAULT_INIT_ALLOCATOR_H_
+#endif  // CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_