diff --git a/lib/hal/HalDisplay.cpp b/lib/hal/HalDisplay.cpp
index 76481df9d..dce045a21 100644
--- a/lib/hal/HalDisplay.cpp
+++ b/lib/hal/HalDisplay.cpp
@@ -9,7 +9,9 @@ HalDisplay::~HalDisplay() {}
 
 void HalDisplay::begin() { einkDisplay.begin(); }
 
-void HalDisplay::setDisplayDimensions(uint16_t width, uint16_t height) { einkDisplay.setDisplayDimensions(width, height); }
+void HalDisplay::setDisplayDimensions(uint16_t width, uint16_t height) {
+  einkDisplay.setDisplayDimensions(width, height);
+}
 
 void HalDisplay::clearScreen(uint8_t color) const { einkDisplay.clearScreen(color); }
 
diff --git a/src/components/themes/BaseTheme.cpp b/src/components/themes/BaseTheme.cpp
index 9686f8818..cacee60b4 100644
--- a/src/components/themes/BaseTheme.cpp
+++ b/src/components/themes/BaseTheme.cpp
@@ -1,6 +1,7 @@
 #include "BaseTheme.h"
 
 #include <GfxRenderer.h>
+#include <HalGPIO.h>
 #include <HalStorage.h>
 #include <Logging.h>
 #include <Utf8.h>
@@ -8,7 +9,6 @@
 #include <cstdint>
 #include <string>
 
-#include <HalGPIO.h>
 #include "RecentBooksStore.h"
 #include "components/UITheme.h"
 #include "fontIds.h"
diff --git a/src/components/themes/lyra/LyraTheme.cpp b/src/components/themes/lyra/LyraTheme.cpp
index c7f55307c..5e6edad2b 100644
--- a/src/components/themes/lyra/LyraTheme.cpp
+++ b/src/components/themes/lyra/LyraTheme.cpp
@@ -1,12 +1,12 @@
 #include "LyraTheme.h"
 
 #include <GfxRenderer.h>
+#include <HalGPIO.h>
 #include <HalStorage.h>
 
 #include <cstdint>
 #include <string>
 
-#include <HalGPIO.h>
 #include "RecentBooksStore.h"
 #include "components/UITheme.h"
 #include "fontIds.h"