diff --git a/libs/libautomount/CMakeLists.txt b/libs/libautomount/CMakeLists.txt
index a85395f..c9f5ad2 100644
--- a/libs/libautomount/CMakeLists.txt
+++ b/libs/libautomount/CMakeLists.txt
@@ -27,7 +27,11 @@ target_include_directories(${DMOD_MODULE_NAME}_if INTERFACE
 # dmblkid - local sibling (repository root): headers from its _if target
 target_link_libraries(${DMOD_MODULE_NAME} dmblkid_if)
 
+# dmvfs: dmvfs_mount_fs()/dmvfs_unmount_fs() - dmvfs is built into the
+# firmware, only its header is needed (dmvfs.h includes dmfsi.h, hence dmfsi)
 dmod_link_modules(${DMOD_MODULE_NAME}
+    dmfsi
     dmosi
+    dmvfs
     libsystemd
 )
diff --git a/libs/libautomount/src/libautomount_os.c b/libs/libautomount/src/libautomount_os.c
index 3ec1aa0..36463ec 100644
--- a/libs/libautomount/src/libautomount_os.c
+++ b/libs/libautomount/src/libautomount_os.c
@@ -5,18 +5,12 @@
  * The host tests replace this file with fakes (there is no dmvfs there).
  */
 #include "dmod.h"
+#include "dmvfs.h"
 #include "libautomount_core.h"
 #include <errno.h>
 
 #define DIR_MODE    0755
 
-/*
- * dmvfs is built into the firmware (it is not a module), its API is
- * resolved from the system like the rest of the built-in API.
- */
-DMOD_BUILTIN_API( dmvfs, 1.0, bool, _mount_fs, (const char* fs_name, const char* mount_point, const char* config) );
-DMOD_BUILTIN_API( dmvfs, 1.0, bool, _unmount_fs, (const char* mount_point) );
-
 /* One per library - shared by every automount service using it. */
 static void* g_lock;