diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 5906533eb..45af58136 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -748,8 +748,8 @@ typedef uint8_t swarnenable_t;
 #endif
 
 #if defined(PCBHORUS)
-#include "layout.h"
-#include "topbar.h"
+#include "gui/horus/layout.h"
+#include "gui/horus/topbar.h"
 PACK(struct CustomScreenData {
   char layoutName[10];
   Layout::PersistentData layoutData;
@@ -942,7 +942,7 @@ PACK(struct TrainerData {
 #endif
 
 #if defined(COLORLCD)
-  #include "theme.h"
+  #include "gui/horus/theme.h"
   #define THEME_DATA \
     NOBACKUP(char themeName[8]); \
     NOBACKUP(Theme::PersistentData themeData);
diff --git a/radio/src/gui/horus/view_main.cpp b/radio/src/gui/horus/view_main.cpp
index 57282f26f..7263b54ab 100644
--- a/radio/src/gui/horus/view_main.cpp
+++ b/radio/src/gui/horus/view_main.cpp
@@ -56,14 +56,11 @@ void drawTrims(uint8_t flightMode)
 
     int32_t trim = getTrimValue(flightMode, i);
     int32_t val = trim * TRIM_LEN / 125;
-    bool exttrim = false;
     if (val < -(TRIM_LEN+1)) {
       val = -(TRIM_LEN+1);
-      exttrim = true;
     }
     else if (val > (TRIM_LEN+1)) {
       val = TRIM_LEN+1;
-      exttrim = true;
     }
 
     if (vert[i]) {