diff --git a/applications/services/dolphin/application.fam b/applications/services/dolphin/application.fam
index 78a097e67..5d275a7b7 100644
--- a/applications/services/dolphin/application.fam
+++ b/applications/services/dolphin/application.fam
@@ -6,5 +6,8 @@ App(
     cdefines=["SRV_DOLPHIN"],
     stack_size=1 * 1024,
     order=50,
-    sdk_headers=["dolphin.h"],
+    sdk_headers=[
+        "dolphin.h",
+        "helpers/dolphin_state.h",
+    ],
 )
diff --git a/applications/services/dolphin/helpers/dolphin_state.h b/applications/services/dolphin/helpers/dolphin_state.h
index e0c6af1ef..65cea35ac 100644
--- a/applications/services/dolphin/helpers/dolphin_state.h
+++ b/applications/services/dolphin/helpers/dolphin_state.h
@@ -5,6 +5,10 @@
 #include <stdint.h>
 #include <time.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DOLPHIN_LEVEL_COUNT 29
 
 typedef struct DolphinState DolphinState;
@@ -50,3 +54,7 @@ bool dolphin_state_is_levelup(int icounter);
 void dolphin_state_increase_level(DolphinState* dolphin_state);
 
 uint8_t dolphin_get_level(int icounter);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/applications/services/xtreme/application.fam b/applications/services/xtreme/application.fam
index 1b4d73058..de90d455f 100644
--- a/applications/services/xtreme/application.fam
+++ b/applications/services/xtreme/application.fam
@@ -7,4 +7,8 @@ App(
     requires=["storage"],
     stack_size=1 * 1024,
     order=46,
+    sdk_headers=[
+        "settings.h",
+        "assets.h",
+    ],
 )
diff --git a/applications/services/xtreme/assets.h b/applications/services/xtreme/assets.h
index 7abaac450..f987fd475 100644
--- a/applications/services/xtreme/assets.h
+++ b/applications/services/xtreme/assets.h
@@ -4,6 +4,10 @@
 #include <gui/icon_i.h>
 #include <toolbox/path.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define PACKS_DIR EXT_PATH("dolphin_custom")
 
 typedef struct {
@@ -36,3 +40,7 @@ typedef struct {
 void XTREME_ASSETS_LOAD();
 
 XtremeAssets* XTREME_ASSETS();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/applications/services/xtreme/settings.h b/applications/services/xtreme/settings.h
index 87f64bb54..76df60e66 100644
--- a/applications/services/xtreme/settings.h
+++ b/applications/services/xtreme/settings.h
@@ -9,6 +9,10 @@
 #include <storage/storage.h>
 #include <power/power_service/power.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_PACK_NAME_LEN 32
 
 #define XTREME_SETTINGS_VERSION (5)
@@ -40,3 +44,7 @@ XtremeSettings* XTREME_SETTINGS();
 void XTREME_SETTINGS_LOAD();
 
 bool XTREME_SETTINGS_SAVE();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 635e55ccd..b3174300b 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -5,6 +5,7 @@ Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
 Header,+,applications/services/dialogs/dialogs.h,,
 Header,+,applications/services/dolphin/dolphin.h,,
+Header,+,applications/services/dolphin/helpers/dolphin_state.h,,
 Header,+,applications/services/gui/canvas_i.h,,
 Header,+,applications/services/gui/elements.h,,
 Header,+,applications/services/gui/gui.h,,
@@ -36,6 +37,8 @@ Header,+,applications/services/notification/notification_messages.h,,
 Header,+,applications/services/power/power_service/power.h,,
 Header,+,applications/services/rpc/rpc_app.h,,
 Header,+,applications/services/storage/storage.h,,
+Header,+,applications/services/xtreme/assets.h,,
+Header,+,applications/services/xtreme/settings.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_clock.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_console.h,,
 Header,+,firmware/targets/f7/furi_hal/furi_hal_flash.h,,
@@ -307,6 +310,11 @@ Function,-,LL_USART_StructInit,void,LL_USART_InitTypeDef*
 Function,-,LL_mDelay,void,uint32_t
 Function,-,SystemCoreClockUpdate,void,
 Function,-,SystemInit,void,
+Function,+,XTREME_ASSETS,XtremeAssets*,
+Function,-,XTREME_ASSETS_LOAD,void,
+Function,+,XTREME_SETTINGS,XtremeSettings*,
+Function,-,XTREME_SETTINGS_LOAD,void,
+Function,+,XTREME_SETTINGS_SAVE,_Bool,
 Function,-,_Exit,void,int
 Function,-,__assert,void,"const char*, int, const char*"
 Function,+,__assert_func,void,"const char*, int, const char*, const char*"
@@ -790,7 +798,21 @@ Function,+,dolphin_deed_get_app,DolphinApp,DolphinDeed
 Function,+,dolphin_deed_get_app_limit,uint8_t,DolphinApp
 Function,+,dolphin_deed_get_weight,uint8_t,DolphinDeed
 Function,+,dolphin_flush,void,Dolphin*
+Function,+,dolphin_get_level,uint8_t,int
+Function,+,dolphin_get_levels,const int*,
 Function,+,dolphin_get_pubsub,FuriPubSub*,Dolphin*
+Function,+,dolphin_state_alloc,DolphinState*,
+Function,+,dolphin_state_butthurted,void,DolphinState*
+Function,+,dolphin_state_clear_limits,void,DolphinState*
+Function,+,dolphin_state_free,void,DolphinState*
+Function,+,dolphin_state_increase_level,void,DolphinState*
+Function,+,dolphin_state_is_levelup,_Bool,int
+Function,+,dolphin_state_load,_Bool,DolphinState*
+Function,+,dolphin_state_on_deed,void,"DolphinState*, DolphinDeed"
+Function,+,dolphin_state_save,_Bool,DolphinState*
+Function,+,dolphin_state_timestamp,uint64_t,
+Function,+,dolphin_state_xp_above_last_levelup,uint32_t,int
+Function,+,dolphin_state_xp_to_levelup,uint32_t,int
 Function,+,dolphin_stats,DolphinStats,Dolphin*
 Function,+,dolphin_upgrade_level,void,Dolphin*
 Function,-,dprintf,int,"int, const char*, ..."
@@ -2625,7 +2647,7 @@ Function,+,storage_simply_remove,_Bool,"Storage*, const char*"
 Function,+,storage_simply_remove_recursive,_Bool,"Storage*, const char*"
 Function,-,stpcpy,char*,"char*, const char*"
 Function,-,stpncpy,char*,"char*, const char*, size_t"
-Function,-,strcasecmp,int,"const char*, const char*"
+Function,+,strcasecmp,int,"const char*, const char*"
 Function,-,strcasecmp_l,int,"const char*, const char*, locale_t"
 Function,+,strcasestr,char*,"const char*, const char*"
 Function,+,strcat,char*,"char*, const char*"