diff --git a/modules/core_phone/tests/test_phone_core_smoke.cpp b/modules/core_phone/tests/test_phone_core_smoke.cpp
index 534d7f6e..b7d8a05b 100644
--- a/modules/core_phone/tests/test_phone_core_smoke.cpp
+++ b/modules/core_phone/tests/test_phone_core_smoke.cpp
@@ -1,5 +1,5 @@
-#include "fake_phone_runtime_context.h"
 #include "chat/infra/meshtastic/mt_protocol_helpers.h"
+#include "fake_phone_runtime_context.h"
 #include "phone/meshcore/meshcore_phone_core.h"
 #include "phone/meshtastic/meshtastic_phone_session.h"
 
diff --git a/modules/ui_shared/tests/test_chat_presentation_source.cpp b/modules/ui_shared/tests/test_chat_presentation_source.cpp
index 98b7ef3b..a93526b1 100644
--- a/modules/ui_shared/tests/test_chat_presentation_source.cpp
+++ b/modules/ui_shared/tests/test_chat_presentation_source.cpp
@@ -4,9 +4,9 @@
 #include "chat/infra/store/ram_store.h"
 #include "chat/ports/i_mesh_adapter.h"
 #include "chat/usecase/chat_service.h"
+#include "sys/clock.h"
 #include "ui/presentation_sources/chat_presentation_source.h"
 #include "ui/presentation_sources/legacy_chat_action_sink.h"
-#include "sys/clock.h"
 
 #include <cassert>
 #include <cstdlib>
diff --git a/platform/esp/arduino_common/src/ble/app_phone_facade.cpp b/platform/esp/arduino_common/src/ble/app_phone_facade.cpp
index a49aec12..f230b921 100644
--- a/platform/esp/arduino_common/src/ble/app_phone_facade.cpp
+++ b/platform/esp/arduino_common/src/ble/app_phone_facade.cpp
@@ -2,8 +2,8 @@
 
 #include "board/BoardBase.h"
 #include "chat/ble/meshtastic_phone_config_bridge.h"
-#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/infra/meshcore/meshcore_ble_backend.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/ports/i_mesh_adapter.h"
 #include "chat/ports/i_node_store.h"
 #include "chat/usecase/chat_service.h"
diff --git a/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp b/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp
index 24083bbd..114dc316 100644
--- a/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp
+++ b/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp
@@ -1658,7 +1658,7 @@ bool MeshCoreAdapter::canTransmitNow(uint32_t now_ms) const
 }
 
 MeshActionResult MeshCoreAdapter::transmitFrameNowDetailed(const uint8_t* data, size_t len,
-                                                          uint32_t now_ms)
+                                                           uint32_t now_ms)
 {
     if (!data || len == 0 || len > kMeshcoreMaxFrameSize)
     {
@@ -2162,7 +2162,7 @@ MeshActionResult MeshCoreAdapter::sendIdentityAdvertDetailed(bool broadcast)
 }
 
 MeshActionResult MeshCoreAdapter::sendIdentityAdvertDetailed(bool broadcast, bool include_location,
-                                                            int32_t lat_i6, int32_t lon_i6)
+                                                             int32_t lat_i6, int32_t lon_i6)
 {
     if (!identity_.isReady())
     {
diff --git a/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp b/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp
index 94ce6b1b..a3912b10 100644
--- a/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp
+++ b/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp
@@ -1,8 +1,8 @@
 #include "../../include/ble/app_phone_facade.h"
 
 #include "chat/ble/meshtastic_phone_config_bridge.h"
-#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/infra/meshcore/meshcore_ble_backend.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/ports/i_mesh_adapter.h"
 #include "chat/ports/i_node_store.h"
 #include "chat/usecase/chat_service.h"