Index: shape.c
===================================================================
--- shape.c	(revision 30966)
+++ shape.c	(revision 30967)
@@ -627,7 +627,7 @@
 
 void pplg_uninit_shape(void)
 {
-	pcb_event_unbind_allcookie(pcb_shape_cookie);
+	rnd_event_unbind_allcookie(pcb_shape_cookie);
 	rnd_remove_actions_by_cookie(pcb_shape_cookie);
 }
 
@@ -636,7 +636,7 @@
 	PCB_API_CHK_VER;
 	RND_REGISTER_ACTIONS(shape_action_list, pcb_shape_cookie)
 
-	pcb_event_bind(PCB_EVENT_LAYERVIS_CHANGED, shape_layer_chg, NULL, pcb_shape_cookie);
+	rnd_event_bind(PCB_EVENT_LAYERVIS_CHANGED, shape_layer_chg, NULL, pcb_shape_cookie);
 
 	return 0;
 }
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 30966)
+++ shape_dialog.c	(revision 30967)
@@ -115,7 +115,7 @@
 }
 
 
-static void shape_layer_chg(rnd_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
+static void shape_layer_chg(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	void *hid_ctx;
 	int tab;