diff --git a/applications/services/bt/bt_service/bt.h b/applications/services/bt/bt_service/bt.h
index 84e0e573c..0f2f23c1a 100644
--- a/applications/services/bt/bt_service/bt.h
+++ b/applications/services/bt/bt_service/bt.h
@@ -20,11 +20,6 @@ typedef enum {
     BtStatusConnected,
 } BtStatus;
 
-typedef struct {
-    uint8_t rssi;
-    uint32_t since;
-} BtRssi;
-
 typedef void (*BtStatusChangedCallback)(BtStatus status, void* context);
 
 /** Change BLE Profile
@@ -84,6 +79,12 @@ void bt_keys_storage_set_storage_path(Bt* bt, const char* keys_storage_path);
  */
 void bt_keys_storage_set_default_path(Bt* bt);
 
+/** Get BLE remote RSSI value
+ *
+ * @param bt    Bt instance
+ *
+ * @return      true on success
+ */
 bool bt_remote_rssi(Bt* bt, uint8_t* rssi);
 
 /** Open a new RPC connection
diff --git a/applications/services/dolphin/helpers/dolphin_state.h b/applications/services/dolphin/helpers/dolphin_state.h
index 770d8d707..9eeef7fb0 100644
--- a/applications/services/dolphin/helpers/dolphin_state.h
+++ b/applications/services/dolphin/helpers/dolphin_state.h
@@ -5,6 +5,16 @@
 
 #include "dolphin_deed.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const uint32_t DOLPHIN_LEVELS[];
+extern const size_t DOLPHIN_LEVEL_COUNT;
+
+#define BUTTHURT_MAX 14
+#define BUTTHURT_MIN 0
+
 typedef struct DolphinState DolphinState;
 typedef struct {
     uint8_t icounter_daily_limit[DolphinAppMAX];
diff --git a/applications/services/gui/icon_i.h b/applications/services/gui/icon_i.h
index 46ceef327..e33cdbf23 100644
--- a/applications/services/gui/icon_i.h
+++ b/applications/services/gui/icon_i.h
@@ -6,8 +6,6 @@
 #pragma once
 #include <stdint.h>
 
-#include "icon.h"
-
 struct Icon {
     const uint16_t width;
     const uint16_t height;
diff --git a/applications/services/rpc/rpc.c b/applications/services/rpc/rpc.c
index cbecf3dca..821d8f53b 100644
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -8,7 +8,7 @@
 #include <flipper.pb.h>
 
 #include <furi.h>
-#include <furi_hal.h>
+#include <furi_hal_rtc.h>
 
 #include <cli/cli.h>
 #include <stdint.h>