diff --git a/applications/services/bt/bt_service/bt_i.h b/applications/services/bt/bt_service/bt_i.h
index cc1cd5a96..e5578ff22 100644
--- a/applications/services/bt/bt_service/bt_i.h
+++ b/applications/services/bt/bt_service/bt_i.h
@@ -86,6 +86,7 @@ struct Bt {
     FuriEventFlag* api_event;
     BtStatusChangedCallback status_changed_cb;
     void* status_changed_ctx;
+
     uint32_t pin;
     bool suppress_pin_screen;
 };
diff --git a/applications/services/gui/view_dispatcher_i.h b/applications/services/gui/view_dispatcher_i.h
index 28c794b59..ae2f819fe 100644
--- a/applications/services/gui/view_dispatcher_i.h
+++ b/applications/services/gui/view_dispatcher_i.h
@@ -16,7 +16,6 @@ DICT_DEF2(ViewDict, uint32_t, M_DEFAULT_OPLIST, View*, M_PTR_OPLIST) // NOLINT
 struct ViewDispatcher {
     FuriEventLoop* event_loop;
     FuriMessageQueue* input_queue;
-    FuriMessageQueue* ascii_queue;
     FuriMessageQueue* event_queue;
 
     Gui* gui;
@@ -33,6 +32,8 @@ struct ViewDispatcher {
     ViewDispatcherTickEventCallback tick_event_callback;
     uint32_t tick_period;
     void* event_context;
+
+    FuriMessageQueue* ascii_queue;
 };
 
 /** ViewPort Draw Callback */
diff --git a/applications/services/notification/notification_app.h b/applications/services/notification/notification_app.h
index f9666910a..9c1ecddcf 100644
--- a/applications/services/notification/notification_app.h
+++ b/applications/services/notification/notification_app.h
@@ -49,7 +49,6 @@ typedef struct {
 struct NotificationApp {
     FuriMessageQueue* queue;
     FuriPubSub* event_record;
-    FuriPubSub* ascii_record;
     FuriTimer* display_timer;
 
     NotificationLedLayer display;
@@ -57,6 +56,8 @@ struct NotificationApp {
     uint8_t display_led_lock;
 
     NotificationSettings settings;
+
+    FuriPubSub* ascii_record;
 };
 
 #ifdef __cplusplus