Index: polyhelp.c
===================================================================
--- polyhelp.c	(revision 30897)
+++ polyhelp.c	(revision 30898)
@@ -526,7 +526,7 @@
 }
 
 
-static pcb_action_t polyhelp_action_list[] = {
+static rnd_action_t polyhelp_action_list[] = {
 	{"PolyHatch", pcb_act_PolyHatch, pcb_acth_PolyHatch, pcb_acts_PolyHatch},
 	{"PolyOffs", pcb_act_PolyOffs, pcb_acth_PolyOffs, pcb_acts_PolyOffs},
 	{"ToPoly", pcb_act_topoly, pcb_acth_topoly, pcb_acts_topoly}
@@ -536,7 +536,7 @@
 
 void pplg_uninit_lib_polyhelp(void)
 {
-	pcb_remove_actions_by_cookie(polyhelp_cookie);
+	rnd_remove_actions_by_cookie(polyhelp_cookie);
 }
 
 int pplg_init_lib_polyhelp(void)
Index: topoly.c
===================================================================
--- topoly.c	(revision 30897)
+++ topoly.c	(revision 30898)
@@ -346,7 +346,7 @@
 
 	if (op == NULL) {
 		pcb_coord_t x, y;
-		pcb_hid_get_coords("Click on a line or arc of the contour loop", &x, &y, 0);
+		rnd_hid_get_coords("Click on a line or arc of the contour loop", &x, &y, 0);
 		if (pcb_search_screen(x, y, CONT_TYPE, &r1, &r2, &r3) == 0) {
 			pcb_message(PCB_MSG_ERROR, "ToPoly(): failed to find a line or arc there\n");
 			PCB_ACT_IRES(1);