diff --git a/radio/src/thirdparty/libopenui/src/menu.h b/radio/src/thirdparty/libopenui/src/menu.h
index f0608d6f1..a70435e6e 100644
--- a/radio/src/thirdparty/libopenui/src/menu.h
+++ b/radio/src/thirdparty/libopenui/src/menu.h
@@ -22,6 +22,7 @@
 #include <vector>
 #include <functional>
 #include <utility>
+#include <memory>
 #include "modal_window.h"
 
 class Menu;
diff --git a/radio/src/thirdparty/libopenui/src/numberedit.cpp b/radio/src/thirdparty/libopenui/src/numberedit.cpp
index 31bd11817..e43bdb1d1 100644
--- a/radio/src/thirdparty/libopenui/src/numberedit.cpp
+++ b/radio/src/thirdparty/libopenui/src/numberedit.cpp
@@ -56,14 +56,14 @@ static void numberedit_cb(lv_event_t* e)
 
 // create a new class for number edit so we can set the sytles differently if needed.
 const lv_obj_class_t lv_numberedit_class = {
+    .base_class = &lv_obj_class,
     .constructor_cb = lv_textarea_class.constructor_cb,
     .destructor_cb = lv_textarea_class.destructor_cb,
     .event_cb = lv_textarea_class.event_cb,
-    .group_def = LV_OBJ_CLASS_GROUP_DEF_TRUE,
     .width_def = LV_DPI_DEF / 2,
     .height_def = LV_SIZE_CONTENT,
-    .instance_size = sizeof(lv_textarea_t),
-    .base_class = &lv_obj_class
+    .group_def = LV_OBJ_CLASS_GROUP_DEF_TRUE,
+    .instance_size = sizeof(lv_textarea_t)
 };
 
 lv_obj_t *lv_numberedit_create(lv_obj_t *parent)