diff --git a/src/realm/sync/client.cpp b/src/realm/sync/client.cpp
index 22de48e9f58..6f87545ff9f 100644
--- a/src/realm/sync/client.cpp
+++ b/src/realm/sync/client.cpp
@@ -635,6 +635,7 @@ void ClientImpl::remove_connection(ClientImpl::Connection& conn) noexcept
 }
 
 
+
 // ################ SessionImpl ################
 
 
diff --git a/src/realm/sync/noinst/client_impl_base.cpp b/src/realm/sync/noinst/client_impl_base.cpp
index 1cb7563e317..022a4364bc2 100644
--- a/src/realm/sync/noinst/client_impl_base.cpp
+++ b/src/realm/sync/noinst/client_impl_base.cpp
@@ -1,4 +1,3 @@
-#include "realm/sync/protocol.hpp"
 #include <system_error>
 #include <sstream>
 
@@ -17,6 +16,7 @@
 #include <realm/sync/noinst/client_history_impl.hpp>
 #include <realm/sync/noinst/client_impl_base.hpp>
 #include <realm/sync/noinst/compact_changesets.hpp>
+#include <realm/sync/protocol.hpp>
 #include <realm/version.hpp>
 #include <realm/sync/changeset_parser.hpp>
 
diff --git a/src/realm/sync/noinst/client_impl_base.hpp b/src/realm/sync/noinst/client_impl_base.hpp
index d449334bb99..4abae6a22ee 100644
--- a/src/realm/sync/noinst/client_impl_base.hpp
+++ b/src/realm/sync/noinst/client_impl_base.hpp
@@ -2,7 +2,6 @@
 #ifndef REALM_NOINST_CLIENT_IMPL_BASE_HPP
 #define REALM_NOINST_CLIENT_IMPL_BASE_HPP
 
-#include "realm/util/span.hpp"
 #include <cstdint>
 #include <utility>
 #include <functional>
@@ -17,6 +16,7 @@
 #include <realm/util/logger.hpp>
 #include <realm/util/network_ssl.hpp>
 #include <realm/util/ez_websocket.hpp>
+#include "realm/util/span.hpp"
 #include <realm/sync/noinst/client_history_impl.hpp>
 #include <realm/sync/noinst/protocol_codec.hpp>
 #include <realm/sync/noinst/client_reset_operation.hpp>
diff --git a/test/object-store/sync/flx_sync_harness.hpp b/test/object-store/sync/flx_sync_harness.hpp
index ab4cc062098..5a03ad6d2a5 100644
--- a/test/object-store/sync/flx_sync_harness.hpp
+++ b/test/object-store/sync/flx_sync_harness.hpp
@@ -19,11 +19,11 @@
 #ifndef FLX_SYNC_HARNESS_H
 #define FLX_SYNC_HARNESS_H
 
-#include "util/test_file.hpp"
 #ifdef REALM_ENABLE_AUTH_TESTS
 
 #include "sync/sync_test_utils.hpp"
 #include "util/baas_admin_api.hpp"
+#include "util/test_file.hpp"
 
 namespace realm::app {