Index: excitation.c
===================================================================
--- excitation.c	(revision 30966)
+++ excitation.c	(revision 30967)
@@ -534,7 +534,7 @@
 	return excitations[exc_ctx.selected].get(exc_ctx.selected);
 }
 
-static void exc_ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void exc_ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	load_selector();
 	if (exc_ctx.active)
@@ -543,10 +543,10 @@
 
 static void pcb_openems_excitation_init(void)
 {
-	pcb_event_bind(PCB_EVENT_BOARD_CHANGED, exc_ev_board_changed, NULL, openems_cookie);
+	rnd_event_bind(RND_EVENT_BOARD_CHANGED, exc_ev_board_changed, NULL, openems_cookie);
 }
 
 static void pcb_openems_excitation_uninit(void)
 {
-	pcb_event_unbind_allcookie(openems_cookie);
+	rnd_event_unbind_allcookie(openems_cookie);
 }
Index: mesh.c
===================================================================
--- mesh.c	(revision 30966)
+++ mesh.c	(revision 30967)
@@ -1040,7 +1040,7 @@
 	free((char *)mesh.ui_layer_xy->name); /* we have strdup'd it */
 	mesh.ui_name_xy = pcb_strdup_printf("mesh 0: %s", mesh.layer->name);
 	mesh.ui_layer_xy->name = rnd_strdup(mesh.ui_name_xy);
-	pcb_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
+	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 
 	pcb_gui->invalidate_all(pcb_gui);
 }