Merge fixes

applications/main/archive/views/archive_browser_view.c

@@ -1,6 +1,7 @@
 #include "assets_icons.h"
 #include "toolbox/path.h"
 #include <furi.h>
+#include "../archive_i.h"
 #include "archive_browser_view.h"
 #include "../helpers/archive_browser.h"
 

applications/main/subghz/subghz_i.h

@@ -43,7 +43,6 @@
 
 #define SUBGHZ_MAX_LEN_NAME 64
 #define SUBGHZ_EXT_PRESET_NAME true
-#define SUBGHZ_RAW_THRESHOLD_MIN (-90.0f)
 #define SUBGHZ_MEASURE_LOADING false
 
 typedef struct {

applications/main/subghz/views/receiver.c

@@ -6,6 +6,8 @@
 #include <assets_icons.h>
 #include <m-array.h>
 
+#include "subghz_read_raw.h"
+
 #define FRAME_HEIGHT 12
 #define MAX_LEN_PX 111
 #define MENU_ITEMS 4u

applications/main/subghz/views/subghz_read_raw.h

@@ -4,6 +4,8 @@
 #include "../helpers/subghz_types.h"
 #include "../helpers/subghz_custom_event.h"
 
+#define SUBGHZ_RAW_THRESHOLD_MIN -90.0f
+
 typedef struct SubGhzReadRAW SubGhzReadRAW;
 
 typedef void (*SubGhzReadRAWCallback)(SubGhzCustomEvent event, void* context);

applications/services/desktop/scenes/desktop_scene_lock_menu.c

@@ -10,6 +10,7 @@
 #include <desktop/desktop_settings.h>
 #include "../views/desktop_view_lock_menu.h"
 #include "desktop_scene.h"
+#include "../helpers/pin.h"
 #include <power/power_service/power.h>
 #define TAG "DesktopSceneLock"
 

applications/services/desktop/views/desktop_view_main.c

@@ -6,6 +6,7 @@
 #include <input/input.h>
 #include <dolphin/dolphin.h>
 
+#include "../desktop_i.h"
 #include "desktop_view_main.h"
 
 struct DesktopMainView {