diff --git a/src/etl/LoadBalancer.cpp b/src/etl/LoadBalancer.cpp
index 03b4854f1..3a743f992 100644
--- a/src/etl/LoadBalancer.cpp
+++ b/src/etl/LoadBalancer.cpp
@@ -1,8 +1,8 @@
 #include "etl/LoadBalancer.hpp"
 
 #include "data/BackendInterface.hpp"
-#include "etl/Errors.hpp"
 #include "etl/ETLState.hpp"
+#include "etl/Errors.hpp"
 #include "etl/InitialLoadObserverInterface.hpp"
 #include "etl/LoadBalancerInterface.hpp"
 #include "etl/NetworkValidatedLedgersInterface.hpp"
diff --git a/src/etl/Source.hpp b/src/etl/Source.hpp
index 58659c0f4..4bb606c3b 100644
--- a/src/etl/Source.hpp
+++ b/src/etl/Source.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
+#include "etl/Errors.hpp"
 #include "etl/InitialLoadObserverInterface.hpp"
 #include "etl/LoadBalancerInterface.hpp"
 #include "etl/NetworkValidatedLedgersInterface.hpp"
 #include "feed/SubscriptionManagerInterface.hpp"
-#include "etl/Errors.hpp"
 #include "util/config/ObjectView.hpp"
 
 #include <boost/asio/io_context.hpp>
diff --git a/src/etl/impl/SourceImpl.hpp b/src/etl/impl/SourceImpl.hpp
index 34d3cc8e6..ccd6f5444 100644
--- a/src/etl/impl/SourceImpl.hpp
+++ b/src/etl/impl/SourceImpl.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
+#include "etl/Errors.hpp"
 #include "etl/InitialLoadObserverInterface.hpp"
 #include "etl/LoadBalancerInterface.hpp"
 #include "etl/Source.hpp"
 #include "etl/impl/ForwardingSource.hpp"
 #include "etl/impl/GrpcSource.hpp"
 #include "etl/impl/SubscriptionSource.hpp"
-#include "etl/Errors.hpp"
 
 #include <boost/asio/spawn.hpp>
 #include <boost/json/object.hpp>
diff --git a/src/web/impl/ErrorHandling.hpp b/src/web/impl/ErrorHandling.hpp
index fbc1b765c..dee79d6db 100644
--- a/src/web/impl/ErrorHandling.hpp
+++ b/src/web/impl/ErrorHandling.hpp
@@ -86,7 +86,9 @@ public:
                         break;
                 }
             } else if (std::get_if<rpc::EtlError>(&err.code) != nullptr) {
-                ASSERT(false, "ETL error should not reach HTTP error handler");  // this should never happen
+                ASSERT(
+                    false, "ETL error should not reach HTTP error handler"
+                );  // this should never happen
             } else {
                 connection_->send(
                     boost::json::serialize(composeError(err)),
diff --git a/tests/common/util/MockSource.hpp b/tests/common/util/MockSource.hpp
index ce15e75ed..c54897fd7 100644
--- a/tests/common/util/MockSource.hpp
+++ b/tests/common/util/MockSource.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
+#include "etl/Errors.hpp"
 #include "etl/InitialLoadObserverInterface.hpp"
 #include "etl/LoadBalancerInterface.hpp"
 #include "etl/NetworkValidatedLedgersInterface.hpp"
 #include "etl/Source.hpp"
 #include "feed/SubscriptionManagerInterface.hpp"
-#include "etl/Errors.hpp"
 #include "util/config/ObjectView.hpp"
 
 #include <boost/asio/io_context.hpp>
diff --git a/tests/unit/etl/ForwardingSourceTests.cpp b/tests/unit/etl/ForwardingSourceTests.cpp
index 40ba3efde..4971b13c2 100644
--- a/tests/unit/etl/ForwardingSourceTests.cpp
+++ b/tests/unit/etl/ForwardingSourceTests.cpp
@@ -1,5 +1,5 @@
-#include "etl/impl/ForwardingSource.hpp"
 #include "etl/Errors.hpp"
+#include "etl/impl/ForwardingSource.hpp"
 #include "util/AsioContextTestFixture.hpp"
 #include "util/Spawn.hpp"
 #include "util/TestWsServer.hpp"
diff --git a/tests/unit/etl/LoadBalancerTests.cpp b/tests/unit/etl/LoadBalancerTests.cpp
index b383c4a71..2ab70e19c 100644
--- a/tests/unit/etl/LoadBalancerTests.cpp
+++ b/tests/unit/etl/LoadBalancerTests.cpp
@@ -1,9 +1,9 @@
+#include "etl/Errors.hpp"
 #include "etl/InitialLoadObserverInterface.hpp"
 #include "etl/LoadBalancer.hpp"
 #include "etl/LoadBalancerInterface.hpp"
 #include "etl/Models.hpp"
 #include "etl/Source.hpp"
-#include "etl/Errors.hpp"
 #include "rpc/Errors.hpp"
 #include "util/AsioContextTestFixture.hpp"
 #include "util/MockBackendTestFixture.hpp"
diff --git a/tests/unit/etl/SourceImplTests.cpp b/tests/unit/etl/SourceImplTests.cpp
index c250a9253..4d9b08df6 100644
--- a/tests/unit/etl/SourceImplTests.cpp
+++ b/tests/unit/etl/SourceImplTests.cpp
@@ -1,8 +1,8 @@
+#include "etl/Errors.hpp"
 #include "etl/InitialLoadObserverInterface.hpp"
 #include "etl/LoadBalancerInterface.hpp"
 #include "etl/Models.hpp"
 #include "etl/impl/SourceImpl.hpp"
-#include "etl/Errors.hpp"
 #include "rpc/Errors.hpp"
 #include "util/Spawn.hpp"