Index: order.c
===================================================================
--- order.c	(revision 37093)
+++ order.c	(revision 37094)
@@ -36,6 +36,8 @@
 #include <librnd/core/plugins.h>
 #include <librnd/hid/hid_dad.h>
 #include <librnd/core/hid_cfg.h>
+#include <librnd/core/hidlib.h>
+#include <librnd/core/conf_multi.h>
 #include <librnd/hid/hid_menu.h>
 #include "layer.h"
 #include <librnd/core/event.h>
@@ -199,8 +201,7 @@
 void pplg_uninit_order(void)
 {
 	rnd_remove_actions_by_cookie(order_cookie);
-	rnd_conf_unreg_intern(order_conf_internal);
-	rnd_conf_unreg_fields("plugins/order/");
+	rnd_conf_plug_unreg("plugins/order/", order_conf_internal, order_cookie);
 	rnd_hid_menu_unload(rnd_gui, order_cookie);
 }
 
@@ -208,7 +209,7 @@
 {
 	RND_API_CHK_VER;
 
-	rnd_conf_reg_intern(order_conf_internal);
+rnd_conf_plug_reg(conf_order, order_conf_internal, order_cookie);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	rnd_conf_reg_field(conf_order, field,isarray,type_name,cpath,cname,desc,flags);
 #include "order_conf_fields.h"