Index: infobar.c
===================================================================
--- infobar.c	(revision 30901)
+++ infobar.c	(revision 30902)
@@ -36,7 +36,7 @@
 static double last_date = -1;
 static int infobar_gui_inited = 0;
 
-static void pcb_infobar_brdchg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_infobar_brdchg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
 	if ((hidlib != NULL) && (hidlib->filename != NULL))
@@ -79,7 +79,7 @@
 }
 
 
-static void pcb_infobar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_infobar_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	infobar_gui_inited = 1;
 	pcb_infobar_brdchg_ev(hidlib, NULL, 0, NULL); /* this may have happened ebfore plugin init if file was specified on the CLI and is already loaded - pick up file data from memory */
@@ -87,7 +87,7 @@
 		infobar_tick(infobar_timer);
 }
 
-static void pcb_infobar_fn_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_infobar_fn_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) {
 		last_date = pcb_file_mtime(NULL, PCB->hidlib.filename);
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 30901)
+++ layer_menu.c	(revision 30902)
@@ -257,7 +257,7 @@
 
 }
 
-void pcb_layer_menu_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	layer_install_menu();
 	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
@@ -264,7 +264,7 @@
 		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
 }
 
-void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
 		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
@@ -282,7 +282,7 @@
 }
 
 
-void pcb_layer_menu_key_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layer_menu_key_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	pcb_hidval_t timerdata;
 
Index: layer_menu.h
===================================================================
--- layer_menu.h	(revision 30901)
+++ layer_menu.h	(revision 30902)
@@ -1,7 +1,7 @@
 #include <librnd/core/event.h>
 
-void pcb_layer_menu_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layer_menu_key_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_vis_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layer_menu_key_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 
Index: layersel.c
===================================================================
--- layersel.c	(revision 30901)
+++ layersel.c	(revision 30902)
@@ -838,13 +838,13 @@
 	}
 }
 
-void pcb_layersel_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL))
 		layersel_build();
 }
 
-void pcb_layersel_vis_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((!layersel.sub_inited) || (layersel.lock_vis > 0))
 		return;
@@ -851,7 +851,7 @@
 	layersel_update_vis(&layersel, PCB);
 }
 
-void pcb_layersel_stack_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL) && (layersel.sub_inited)) {
 		pcb_hid_dock_leave(&layersel.sub);
Index: layersel.h
===================================================================
--- layersel.h	(revision 30901)
+++ layersel.h	(revision 30902)
@@ -1,3 +1,3 @@
-void pcb_layersel_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layersel_vis_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_layersel_stack_chg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layersel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layersel_vis_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_layersel_stack_chg_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
Index: rendering.c
===================================================================
--- rendering.c	(revision 30901)
+++ rendering.c	(revision 30902)
@@ -90,7 +90,7 @@
 	return common_set_layer_group(hid, group, purpose, purpi, layer, flags, is_empty, xform);
 }
 
-static void pcb_rendering_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_rendering_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	/* hook in our dispatcher */
 	gui_set_layer_group = pcb_gui->set_layer_group;
Index: routest.c
===================================================================
--- routest.c	(revision 30901)
+++ routest.c	(revision 30902)
@@ -201,12 +201,12 @@
 }
 
 
-void pcb_rst_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	rst_update();
 }
 
-void pcb_rst_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (PCB_HAVE_GUI_ATTR_DLG) {
 		rst_docked_create();
Index: routest.h
===================================================================
--- routest.h	(revision 30901)
+++ routest.h	(revision 30902)
@@ -2,8 +2,8 @@
 #include <librnd/core/event.h>
 #include <librnd/core/actions.h>
 
-void pcb_rst_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_rst_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_rst_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_rst_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_rst_update_conf(conf_native_t *cfg, int arr_idx);
 
 
Index: status.c
===================================================================
--- status.c	(revision 30901)
+++ status.c	(revision 30902)
@@ -302,7 +302,7 @@
 }
 
 
-void pcb_status_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((PCB_HAVE_GUI_ATTR_DLG) && (pcb_gui->get_menu_cfg != NULL)) {
 		status_docked_create_st();
@@ -329,12 +329,12 @@
 	status_rd_pcb2dlg();
 }
 
-void pcb_status_st_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	status_st_pcb2dlg();
 }
 
-void pcb_status_rd_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	status_rd_pcb2dlg();
 }
Index: status.h
===================================================================
--- status.h	(revision 30901)
+++ status.h	(revision 30902)
@@ -2,11 +2,11 @@
 #include <librnd/core/conf.h>
 #include <librnd/core/actions.h>
 
-void pcb_status_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_status_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 void pcb_status_st_update_conf(conf_native_t *cfg, int arr_idx);
 void pcb_status_rd_update_conf(conf_native_t *cfg, int arr_idx);
-void pcb_status_st_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
-void pcb_status_rd_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_status_st_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
+void pcb_status_rd_update_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]);
 
 extern const char pcb_acts_StatusSetText[];
 extern const char pcb_acth_StatusSetText[];
Index: title.c
===================================================================
--- title.c	(revision 30901)
+++ title.c	(revision 30902)
@@ -56,13 +56,13 @@
 	pcb_gui->set_top_title(pcb_gui, title_buf.array);
 }
 
-static void pcb_title_board_changed_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_title_board_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	brd_changed = 0;
 	update_title();
 }
 
-static void pcb_title_meta_changed_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_title_meta_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if (brd_changed == PCB->Changed)
 		return;
@@ -70,7 +70,7 @@
 	update_title();
 }
 
-static void pcb_title_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void pcb_title_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	gui_inited = 1;
 	update_title();