diff --git a/drivers/retained_mem/CMakeLists.txt b/drivers/retained_mem/CMakeLists.txt
index f8e34a5a7c7..c119347a767 100644
--- a/drivers/retained_mem/CMakeLists.txt
+++ b/drivers/retained_mem/CMakeLists.txt
@@ -3,5 +3,6 @@
 zephyr_syscall_header(${ZEPHYR_BASE}/include/zephyr/drivers/retained_mem.h)
 
 zephyr_library()
+zephyr_library_sources_ifdef(CONFIG_USERSPACE retained_mem_handlers.c)
 zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_NRF_GPREGRET retained_mem_nrf_gpregret.c)
 zephyr_library_sources_ifdef(CONFIG_RETAINED_MEM_ZEPHYR_RAM   retained_mem_zephyr_ram.c)
diff --git a/include/zephyr/drivers/retained_mem.h b/include/zephyr/drivers/retained_mem.h
index 18bfffed099..1a4ea8e0ccc 100644
--- a/include/zephyr/drivers/retained_mem.h
+++ b/include/zephyr/drivers/retained_mem.h
@@ -75,7 +75,7 @@ typedef int (*retained_mem_clear_api)(const struct device *dev);
  *
  * Note that drivers must implement all functions, none of the functions are optional.
  */
-struct retained_mem_driver_api {
+__subsystem struct retained_mem_driver_api {
 	retained_mem_size_api size;
 	retained_mem_read_api read;
 	retained_mem_write_api write;