diff --git a/radio/src/bluetooth.h b/radio/src/bluetooth.h
index a2f07a0cd..29047e8b9 100644
--- a/radio/src/bluetooth.h
+++ b/radio/src/bluetooth.h
@@ -19,6 +19,10 @@
  * GNU General Public License for more details.
  */
 
+#pragma once
+
+#include "popups.h"
+
 enum BluetoothStates {
 #if defined(PCBX9E)
   BLUETOOTH_INIT,
diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp
index 73ce76054..4435f54a4 100644
--- a/radio/src/gui/colorlcd/radio_hardware.cpp
+++ b/radio/src/gui/colorlcd/radio_hardware.cpp
@@ -95,7 +95,7 @@ RadioHardwarePage::RadioHardwarePage():
 class ModeChoice : public Choice
 {
  public:
-  ModeChoice(FormGroup *parent, const rect_t &rect, const char *values,
+  ModeChoice(FormGroup *parent, const rect_t &rect, const char **values,
              int vmin, int vmax, std::function<int()> getValue,
              std::function<void(int)> setValue = nullptr,
              bool *menuOpen = nullptr) :
diff --git a/radio/src/gui/colorlcd/trainer_setup.h b/radio/src/gui/colorlcd/trainer_setup.h
index 34a4bb747..7f2ae1eb5 100644
--- a/radio/src/gui/colorlcd/trainer_setup.h
+++ b/radio/src/gui/colorlcd/trainer_setup.h
@@ -27,6 +27,10 @@
 #include "button.h"
 #include "numberedit.h"
 
+#if defined(BLUETOOTH)
+#include "bluetooth.h"
+#endif
+
 class TrChoice;
 
 class TrainerModuleWindow : public FormGroup
diff --git a/radio/src/lv_conf.h b/radio/src/lv_conf.h
index b77e97c5e..5b567d805 100644
--- a/radio/src/lv_conf.h
+++ b/radio/src/lv_conf.h
@@ -173,11 +173,21 @@
     /*Must be defined to include path of CMSIS header of target processor
     e.g. "stm32f769xx.h" or "stm32f429xx.h"*/
     #define LV_GPU_DMA2D_CMSIS_INCLUDE "stm32f4xx.h"
-    #define DMA2D_NLR_PL_Pos 16
-    #define DMA2D_NLR_NL_Pos 0
-    #define DMA2D_CR_START_Msk DMA2D_CR_START
-    #define DMA2D_FGPFCCR_AM_Pos 16
-    #define DMA2D_FGPFCCR_ALPHA_Pos 24
+    #if !defined(DMA2D_NLR_PL_Pos)
+      #define DMA2D_NLR_PL_Pos 16
+    #endif
+    #if !defined(DMA2D_NLR_NL_Pos)
+      #define DMA2D_NLR_NL_Pos 0
+    #endif
+    #if !defined(DMA2D_CR_START_Msk)
+      #define DMA2D_CR_START_Msk DMA2D_CR_START
+    #endif
+    #if !defined(DMA2D_FGPFCCR_AM_Pos)
+      #define DMA2D_FGPFCCR_AM_Pos 16
+    #endif
+    #if !defined(DMA2D_FGPFCCR_ALPHA_Pos)
+      #define DMA2D_FGPFCCR_ALPHA_Pos 24
+    #endif
 #endif
 
 /*Use NXP's PXP GPU iMX RTxxx platforms*/
diff --git a/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp b/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp
index 7282d94a4..56f28e0e9 100644
--- a/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp
@@ -23,6 +23,9 @@
 #include "debug.h"
 
 #if !defined(BOOT)
+
+#include "fifo.h"
+
 Fifo<uint8_t, BT_TX_FIFO_SIZE> btTxFifo;
 Fifo<uint8_t, BT_RX_FIFO_SIZE> btRxFifo;
 
diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
index 2bec36436..6f9c937ea 100644
--- a/radio/src/targets/horus/board.cpp
+++ b/radio/src/targets/horus/board.cpp
@@ -64,6 +64,10 @@ void watchdogInit(unsigned int duration)
 }
 
 #if HAS_SPORT_UPDATE_CONNECTOR() && !defined(BOOT)
+
+// g_eeGeneral
+#include "opentx.h"
+
 void sportUpdateInit()
 {
   GPIO_InitTypeDef GPIO_InitStructure;
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 86e73979e..404f619c6 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 86e73979e0178fb5afd086ff563c068ebb9ee093
+Subproject commit 404f619c6173074024fef94ed7a61613af4aee07