diff --git a/apps/gat562_mesh_evb_pro/src/ui_runtime.cpp b/apps/gat562_mesh_evb_pro/src/ui_runtime.cpp
index e2c19b24..a54ea52a 100644
--- a/apps/gat562_mesh_evb_pro/src/ui_runtime.cpp
+++ b/apps/gat562_mesh_evb_pro/src/ui_runtime.cpp
@@ -18,9 +18,9 @@ namespace apps::gat562_mesh_evb_pro::ui_runtime
 {
 namespace
 {
+using Adafruit_LittleFS_Namespace::File;
 using boards::gat562_mesh_evb_pro::BoardInputEvent;
 using boards::gat562_mesh_evb_pro::BoardInputKey;
-using Adafruit_LittleFS_Namespace::File;
 constexpr uint32_t kProbeHoldMs = 900;
 constexpr uint32_t kGat562TotalRamBytes = 248832U;
 constexpr uint32_t kGat562FsTotalBytes = 7U * 4096U;
diff --git a/boards/gat562_mesh_evb_pro/src/gat562_board.cpp b/boards/gat562_mesh_evb_pro/src/gat562_board.cpp
index f5519c55..1c3166ac 100644
--- a/boards/gat562_mesh_evb_pro/src/gat562_board.cpp
+++ b/boards/gat562_mesh_evb_pro/src/gat562_board.cpp
@@ -14,10 +14,10 @@
 
 #include <algorithm>
 #include <array>
-#include <cstdlib>
 #include <cmath>
-#include <cstring>
 #include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <limits>
 
 namespace boards::gat562_mesh_evb_pro
diff --git a/modules/ui_mono_128x64/include/ui/mono_128x64/runtime.h b/modules/ui_mono_128x64/include/ui/mono_128x64/runtime.h
index 8f752125..5ae85805 100644
--- a/modules/ui_mono_128x64/include/ui/mono_128x64/runtime.h
+++ b/modules/ui_mono_128x64/include/ui/mono_128x64/runtime.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "app/app_facades.h"
 #include "app/app_config.h"
+#include "app/app_facades.h"
 #include "chat/domain/contact_types.h"
 #include "chat/usecase/chat_service.h"
 #include "platform/ui/device_runtime.h"
 #include "platform/ui/gps_runtime.h"
 #include "ui/mono_128x64/text_renderer.h"
 
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <ctime>
-#include <array>
 
 namespace ui::mono_128x64
 {
diff --git a/modules/ui_mono_128x64/src/runtime.cpp b/modules/ui_mono_128x64/src/runtime.cpp
index c1c1311f..efc24a64 100644
--- a/modules/ui_mono_128x64/src/runtime.cpp
+++ b/modules/ui_mono_128x64/src/runtime.cpp
@@ -2236,8 +2236,9 @@ void Runtime::renderNodeList()
             drawTextClipped(kBrgX, row_y, kBrgW, "-", selected_row);
         }
 
-        const int bars = std::strcmp(sig, "STR") == 0 ? 3 : std::strcmp(sig, "OK") == 0 ? 2 : std::strcmp(sig, "WEAK") == 0 ? 1
-                                                                                                                   : 0;
+        const int bars = std::strcmp(sig, "STR") == 0 ? 3 : std::strcmp(sig, "OK") == 0 ? 2
+                                                        : std::strcmp(sig, "WEAK") == 0 ? 1
+                                                                                        : 0;
         for (int bar = 0; bar < 3; ++bar)
         {
             if (bar >= bars)
@@ -2386,9 +2387,9 @@ void Runtime::renderNodeCompass()
     char age_buf[12] = {};
     formatElapsedShort(host_.utc_now_fn ? host_.utc_now_fn() : 0, node->last_seen, age_buf, sizeof(age_buf));
     char footer[24] = {};
-    const char* proto = node->protocol == chat::contacts::NodeProtocolType::MeshCore ? "MC"
+    const char* proto = node->protocol == chat::contacts::NodeProtocolType::MeshCore     ? "MC"
                         : node->protocol == chat::contacts::NodeProtocolType::Meshtastic ? "MT"
-                                                                                           : "?";
+                                                                                         : "?";
     if (node->hops_away == 0xFF)
     {
         std::snprintf(footer, sizeof(footer), "%s  %s", proto, age_buf);
diff --git a/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp b/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp
index 103b9ae7..27d666e1 100644
--- a/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp
+++ b/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp
@@ -9,12 +9,12 @@
 #include "chat/runtime/meshtastic_self_announcement_core.h"
 #include "chat/runtime/self_identity_policy.h"
 #include "meshtastic/mqtt.pb.h"
-#include "platform/ui/gps_runtime.h"
-#include "platform/ui/settings_store.h"
 #include "platform/nrf52/arduino_common/chat/infra/radio_packet_io.h"
 #include "platform/nrf52/arduino_common/device_identity.h"
-#include "sys/clock.h"
 #include "platform/nrf52/arduino_common/sys/event_bus.h"
+#include "platform/ui/gps_runtime.h"
+#include "platform/ui/settings_store.h"
+#include "sys/clock.h"
 
 #include <Arduino.h>
 #include <Curve25519.h>