From 9ca5c2a231bf8eab00c661a03366410c02426687 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Tue, 4 Jun 2024 03:24:04 +0100
Subject: [PATCH] Merge fixes

---
 applications/main/archive/views/archive_browser_view.c         | 1 +
 applications/main/subghz/subghz_i.h                            | 1 -
 applications/main/subghz/views/receiver.c                      | 2 ++
 applications/main/subghz/views/subghz_read_raw.h               | 2 ++
 applications/services/desktop/scenes/desktop_scene_lock_menu.c | 1 +
 applications/services/desktop/views/desktop_view_main.c        | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c
index 5635cf36d..2af02de90 100644
--- a/applications/main/archive/views/archive_browser_view.c
+++ b/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"
 
diff --git a/applications/main/subghz/subghz_i.h b/applications/main/subghz/subghz_i.h
index b777388a3..0d1eeb00f 100644
--- a/applications/main/subghz/subghz_i.h
+++ b/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 {
diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c
index de1023f6e..cf769a67c 100644
--- a/applications/main/subghz/views/receiver.c
+++ b/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
diff --git a/applications/main/subghz/views/subghz_read_raw.h b/applications/main/subghz/views/subghz_read_raw.h
index 54eea1440..c7d87f2d5 100644
--- a/applications/main/subghz/views/subghz_read_raw.h
+++ b/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);
diff --git a/applications/services/desktop/scenes/desktop_scene_lock_menu.c b/applications/services/desktop/scenes/desktop_scene_lock_menu.c
index 505d9a241..f0b02105a 100644
--- a/applications/services/desktop/scenes/desktop_scene_lock_menu.c
+++ b/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"
 
diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c
index 3e3042c78..071c59f33 100644
--- a/applications/services/desktop/views/desktop_view_main.c
+++ b/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 {