Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

applications/services/desktop/animations/animation_storage.c

@@ -8,7 +8,6 @@
 
 #include "animation_manager.h"
 #include "animation_storage.h"
-#include "animation_storage_i.h"
 #include <assets_dolphin_internal.h>
 #include <assets_dolphin_blocking.h>
 #include <momentum/momentum.h>

applications/services/desktop/animations/views/bubble_animation_view.c

@@ -1,6 +1,5 @@
 
 #include "../animation_manager.h"
-#include "../animation_storage.h"
 #include "bubble_animation_view.h"
 
 #include <furi_hal.h>

applications/services/desktop/helpers/pin.c

@@ -7,8 +7,6 @@
 #include <furi_hal.h>
 #include <gui/gui.h>
 
-#include "../desktop_i.h"
-
 static const NotificationSequence sequence_pin_fail = {
     &message_display_backlight_on,
 

applications/services/desktop/scenes/desktop_scene_lock_menu.c

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

applications/services/desktop/scenes/desktop_scene_locked.c

@@ -9,7 +9,6 @@
 #include "../helpers/pin.h"
 #include "../animations/animation_manager.h"
 #include "../views/desktop_events.h"
-#include "../views/desktop_view_pin_input.h"
 #include "../views/desktop_view_locked.h"
 #include "desktop_scene.h"
 #include "desktop_scene_i.h"

applications/services/desktop/scenes/desktop_scene_main.c

@@ -8,7 +8,6 @@
 #include "../views/desktop_events.h"
 #include "../views/desktop_view_main.h"
 #include "desktop_scene.h"
-#include "desktop_scene_i.h"
 
 #define TAG "DesktopSrv"
 

applications/services/desktop/scenes/desktop_scene_pin_input.c

@@ -9,12 +9,10 @@
 
 #include "../desktop.h"
 #include "../desktop_i.h"
-#include "../animations/animation_manager.h"
 #include "../views/desktop_events.h"
 #include "../views/desktop_view_pin_input.h"
 #include "../helpers/pin.h"
 #include "desktop_scene.h"
-#include "desktop_scene_i.h"
 
 #define WRONG_PIN_HEADER_TIMEOUT 3000
 #define INPUT_PIN_VIEW_TIMEOUT 15000

applications/services/desktop/scenes/desktop_scene_pin_timeout.c

@@ -5,7 +5,6 @@
 #include "../desktop_i.h"
 #include "../views/desktop_view_pin_timeout.h"
 #include "desktop_scene.h"
-#include "desktop_scene_i.h"
 
 static void desktop_scene_pin_timeout_callback(void* context) {
     Desktop* desktop = (Desktop*)context;

applications/services/desktop/views/desktop_view_main.c

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

applications/services/desktop/views/desktop_view_slideshow.c

@@ -3,7 +3,6 @@
 #include <gui/elements.h>
 
 #include "desktop_view_slideshow.h"
-#include "../desktop_i.h"
 #include "../helpers/slideshow.h"
 
 #define DESKTOP_SLIDESHOW_POWEROFF_SHORT 5000

applications/services/desktop/views/desktop_view_slideshow.h

@@ -3,6 +3,7 @@
 #include <gui/view.h>
 
 #include "desktop_events.h"
+#include <storage/storage.h>
 
 #define SLIDESHOW_FS_PATH EXT_PATH(".slideshow")