diff --git a/applications/external/ir_remote/infrared_remote.h b/applications/external/ir_remote/infrared_remote.h
index 6eac193d3..00ca2e107 100644
--- a/applications/external/ir_remote/infrared_remote.h
+++ b/applications/external/ir_remote/infrared_remote.h
@@ -4,6 +4,8 @@
 
 #include "infrared_remote_button.h"
 
+#define IR_REMOTE_PATH EXT_PATH("infrared/remote")
+
 typedef struct InfraredRemote InfraredRemote;
 
 InfraredRemote* infrared_remote_alloc();
diff --git a/applications/external/ir_remote/infrared_remote_app.c b/applications/external/ir_remote/infrared_remote_app.c
index 7381a7139..409bfddd3 100644
--- a/applications/external/ir_remote/infrared_remote_app.c
+++ b/applications/external/ir_remote/infrared_remote_app.c
@@ -147,11 +147,11 @@ int32_t infrared_remote_app(void* p) {
     DialogsApp* dialogs = furi_record_open(RECORD_DIALOGS);
     DialogsFileBrowserOptions browser_options;
     dialog_file_browser_set_basic_options(&browser_options, ".txt", &I_sub1_10px);
-    browser_options.base_path = EXT_PATH("infrared/remote");
+    browser_options.base_path = IR_REMOTE_PATH;
     FuriString* map_file = furi_string_alloc();
-    furi_string_set(map_file, EXT_PATH("infrared/remote"));
-    if(!storage_file_exists(storage, EXT_PATH("infrared/remote"))) {
-        storage_common_mkdir(storage, EXT_PATH("infrared/remote")); //Make Folder If dir not exist
+    furi_string_set(map_file, IR_REMOTE_PATH);
+    if(!storage_file_exists(storage, IR_REMOTE_PATH)) {
+        storage_common_mkdir(storage, IR_REMOTE_PATH); //Make Folder If dir not exist
     }
 
     bool res = dialog_file_browser_show(dialogs, map_file, map_file, &browser_options);
diff --git a/applications/external/subghz_playlist/playlist.c b/applications/external/subghz_playlist/playlist.c
index 4ada9aa72..c300a0020 100644
--- a/applications/external/subghz_playlist/playlist.c
+++ b/applications/external/subghz_playlist/playlist.c
@@ -22,8 +22,6 @@
 #include "playlist_file.h"
 #include "canvas_helper.h"
 
-#define PLAYLIST_FOLDER EXT_PATH("subghz/playlist")
-#define PLAYLIST_EXT ".txt"
 #define TAG "Playlist"
 
 #define STATE_NONE 0
diff --git a/applications/external/subghz_playlist/playlist_file.h b/applications/external/subghz_playlist/playlist_file.h
index fb708edc7..7e853fb28 100644
--- a/applications/external/subghz_playlist/playlist_file.h
+++ b/applications/external/subghz_playlist/playlist_file.h
@@ -4,4 +4,7 @@
 
 #include <storage/storage.h>
 
+#define PLAYLIST_FOLDER EXT_PATH("subghz/playlist")
+#define PLAYLIST_EXT ".txt"
+
 int playlist_count_playlist_items(Storage* storage, const char* file_path);
diff --git a/applications/external/subghz_remote/subghz_remote_app_i.h b/applications/external/subghz_remote/subghz_remote_app_i.h
index 9291d54f2..a2ecc0c73 100644
--- a/applications/external/subghz_remote/subghz_remote_app_i.h
+++ b/applications/external/subghz_remote/subghz_remote_app_i.h
@@ -6,11 +6,7 @@
 
 #include "helpers/txrx/subghz_txrx.h"
 
-#ifdef APP_SUBGHZREMOTE
 #include <assets_icons.h>
-#else
-#include <subrem_remote_fap_icons.h>
-#endif
 
 #include "views/remote.h"