Index: fp_fs.c
===================================================================
--- fp_fs.c	(revision 37093)
+++ fp_fs.c	(revision 37094)
@@ -50,6 +50,8 @@
 #include <librnd/core/error.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/conf_hid.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "conf_core.h"
 #include <librnd/hid/hid_init.h>
 #include <librnd/core/safe_fs.h>
@@ -592,10 +594,8 @@
 
 	rnd_conf_hid_unreg(fp_fs_cookie);
 
-	rnd_conf_unreg_intern(fp_fs_conf_internal);
-
 	fp_fs_cache_uninit(&fp_fs_cache);
-	rnd_conf_unreg_fields("plugins/fp_fs/");
+	rnd_conf_plug_unreg("plugins/fp_fs/", fp_fs_conf_internal, fp_fs_cookie);
 	fp_fs_free_remove_regex();
 }
 
@@ -611,7 +611,7 @@
 	RND_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
 	htsp_init(&fp_fs_cache, strhash, strkeyeq);
 
-	rnd_conf_reg_intern(fp_fs_conf_internal);
+	rnd_conf_plug_reg(conf_fp_fs, fp_fs_conf_internal, fp_fs_cookie);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_fp_fs, field,isarray,type_name,cpath,cname,desc,flags);