Index: ch_editpoint.c
===================================================================
--- ch_editpoint.c	(revision 37094)
+++ ch_editpoint.c	(revision 37095)
@@ -39,6 +39,8 @@
 #include <librnd/poly/rtree2_compat.h>
 #include <librnd/hid/hid_menu.h>
 #include <librnd/core/rnd_conf.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include "board.h"
 #include "conf_core.h"
 #include "crosshair.h"
@@ -175,9 +177,8 @@
 	vtp0_uninit(editpoint_objs);
 	vtp0_uninit(old_editpoint_objs);
 
-	rnd_conf_unreg_intern(ch_editpoint_conf_internal);
+	rnd_conf_plug_unreg("plugins/ch_editpoint/", ch_editpoint_conf_internal, pcb_ch_editpoint_cookie);
 	rnd_hid_menu_unload(rnd_gui, pcb_ch_editpoint_cookie);
-	rnd_conf_unreg_fields("plugins/ch_editpoint/");
 }
 
 int pplg_init_ch_editpoint(void)
@@ -184,7 +185,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_intern(ch_editpoint_conf_internal);
+	rnd_conf_plug_reg(conf_ch_editpoint, ch_editpoint_conf_internal, pcb_ch_editpoint_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_ch_editpoint, field,isarray,type_name,cpath,cname,desc,flags);
 #include "ch_editpoint_conf_fields.h"