Index: trunk/src_plugins/cam/cam.c
===================================================================
--- trunk/src_plugins/cam/cam.c	(revision 37092)
+++ trunk/src_plugins/cam/cam.c	(revision 37093)
@@ -39,6 +39,8 @@
 #include <librnd/hid/hid_nogui.h>
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "cam_conf.h"
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/safe_fs.h>
@@ -285,8 +287,7 @@
 
 void pplg_uninit_cam(void)
 {
-	rnd_conf_unreg_intern(cam_conf_internal);
-	rnd_conf_unreg_fields("plugins/cam/");
+	rnd_conf_plug_unreg("plugins/cam/", cam_conf_internal, cam_cookie);
 	rnd_remove_actions_by_cookie(cam_cookie);
 	rnd_export_remove_opts_by_cookie(cam_cookie);
 	rnd_hid_remove_hid(&export_cam_hid);
@@ -295,7 +296,8 @@
 int pplg_init_cam(void)
 {
 	RND_API_CHK_VER;
-	rnd_conf_reg_intern(cam_conf_internal);
+
+	rnd_conf_plug_reg(conf_cam, cam_conf_internal, cam_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_cam, field,isarray,type_name,cpath,cname,desc,flags);
 #include "cam_conf_fields.h"
Index: trunk/src_plugins/io_pads/io_pads.c
===================================================================
--- trunk/src_plugins/io_pads/io_pads.c	(revision 37092)
+++ trunk/src_plugins/io_pads/io_pads.c	(revision 37093)
@@ -32,6 +32,8 @@
 #include <librnd/core/plugins.h>
 #include <librnd/core/actions.h>
 #include <librnd/hid/hid.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include <librnd/core/compat_misc.h>
 #include "plug_io.h"
 #include "io_pads_conf.h"
@@ -69,8 +71,7 @@
 {
 	RND_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_pads_2005);
 	RND_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_pads_9_4);
-	rnd_conf_unreg_intern(io_pads_conf_internal);
-	rnd_conf_unreg_fields("plugins/io_pads/");
+	rnd_conf_plug_unreg("plugins/io_pads/", io_pads_conf_internal, pads_cookie);
 }
 
 int pplg_init_io_pads(void)
@@ -102,7 +103,7 @@
 	io_pads_9_4.write_pcb = io_pads_write_pcb_9_4;
 	RND_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_pads_9_4);
 
-	rnd_conf_reg_intern(io_pads_conf_internal);
+rnd_conf_plug_reg(conf_io_pads, io_pads_conf_internal, pads_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_io_pads, field,isarray,type_name,cpath,cname,desc,flags);
 #include "io_pads_conf_fields.h"