Index: act.c
===================================================================
--- act.c	(revision 30897)
+++ act.c	(revision 30898)
@@ -95,7 +95,7 @@
 
 	PCB_GUI_NOGUI();
 
-	pcb_hid_get_coords("Click to center of flip", &x, &y, 0);
+	rnd_hid_get_coords("Click to center of flip", &x, &y, 0);
 
 	x = pcb_crosshair.X;
 	y = pcb_crosshair.Y;
@@ -221,7 +221,7 @@
 					void *o1, *o2, *o3;
 					pcb_any_obj_t *o;
 
-					pcb_hid_get_coords("context sensitive popup: select object", &x, &y, 0);
+					rnd_hid_get_coords("context sensitive popup: select object", &x, &y, 0);
 					type = pcb_search_screen(x, y, PCB_OBJ_PSTK | PCB_OBJ_SUBC_PART, &o1, &o2, &o3);
 					o = o2;
 					if ((type == 0) || ((o != NULL) && (pcb_gobj_parent_subc(o->parent_type, &o->parent) == NULL))) {
@@ -295,16 +295,16 @@
 	args[1].type = FGW_STR; args[1].val.cstr = msg;
 	args[2].type = FGW_STR; args[2].val.cstr = val;
 	args[3].type = FGW_STR; args[3].val.cstr = title;
-	er = pcb_actionv_bin(PCB_ACT_HIDLIB, "promptfor", &r, 4, args);
+	er = rnd_actionv_bin(PCB_ACT_HIDLIB, "promptfor", &r, 4, args);
 
 	if ((er != 0) || ((r.type & FGW_STR) != FGW_STR)) {
-		fgw_arg_free(&pcb_fgw, &r);
+		fgw_arg_free(&rnd_fgw, &r);
 		PCB_ACT_IRES(1);
 		return 0;
 	}
 	
 	pcb_attribute_put(&ly->Attributes, key, r.val.str);
-	fgw_arg_free(&pcb_fgw, &r);
+	fgw_arg_free(&rnd_fgw, &r);
 
 	PCB_ACT_IRES(0);
 	return 0;
Index: infobar.c
===================================================================
--- infobar.c	(revision 30897)
+++ infobar.c	(revision 30898)
@@ -38,7 +38,7 @@
 
 static void pcb_infobar_brdchg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
-	pcb_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
+	rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
 	if ((hidlib != NULL) && (hidlib->filename != NULL))
 		last_date = pcb_file_mtime(NULL, PCB->hidlib.filename);
 	else
@@ -61,7 +61,7 @@
 			double last_chg = pcb_file_mtime(NULL, PCB->hidlib.filename);
 			if (last_chg > last_date) {
 				last_date = last_chg;
-				pcb_actionva(&PCB->hidlib, "InfoBarFileChanged", "open", NULL);
+				rnd_actionva(&PCB->hidlib, "InfoBarFileChanged", "open", NULL);
 			}
 		}
 	}
@@ -91,7 +91,7 @@
 {
 	if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) {
 		last_date = pcb_file_mtime(NULL, PCB->hidlib.filename);
-		pcb_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
+		rnd_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
 	}
 }
 
Index: layersel.c
===================================================================
--- layersel.c	(revision 30897)
+++ layersel.c	(revision 30898)
@@ -274,7 +274,7 @@
 	else if (lys->ml != NULL) {
 		vis = (pcb_bool *)((char *)PCB + lys->ml->vis_offs);
 		*vis = 1;
-		pcb_actionva(&PCB->hidlib, "SelectLayer", lys->ml->select_name, NULL);
+		rnd_actionva(&PCB->hidlib, "SelectLayer", lys->ml->select_name, NULL);
 	}
 	else
 		return;
@@ -430,7 +430,7 @@
 		return;
 
 	layer_select(lys);
-	pcb_actionva(&PCB->hidlib, "Popup", "layer", NULL);
+	rnd_actionva(&PCB->hidlib, "Popup", "layer", NULL);
 }
 
 extern pcb_layergrp_id_t pcb_actd_EditGroup_gid;
@@ -440,7 +440,7 @@
 	if (grp->gid < 0)
 		return;
 	pcb_actd_EditGroup_gid = grp->gid;
-	pcb_actionva(&PCB->hidlib, "Popup", "group", NULL);
+	rnd_actionva(&PCB->hidlib, "Popup", "group", NULL);
 }
 
 
Index: lib_hid_pcbui.c
===================================================================
--- lib_hid_pcbui.c	(revision 30897)
+++ lib_hid_pcbui.c	(revision 30898)
@@ -54,16 +54,16 @@
 static const char *title_cookie = "lib_hid_pcbui/title";
 static const char *layersel_cookie = "lib_hid_pcbui/layersel";
 
-static pcb_action_t rst_action_list[] = {
+static rnd_action_t rst_action_list[] = {
 	{"AdjustStyle", pcb_act_AdjustStyle, pcb_acth_AdjustStyle, pcb_acts_AdjustStyle}
 };
 
-static pcb_action_t status_action_list[] = {
+static rnd_action_t status_action_list[] = {
 	{"StatusSetText", pcb_act_StatusSetText, pcb_acth_StatusSetText, pcb_acts_StatusSetText},
 	{"DescribeLocation", pcb_act_DescribeLocation, pcb_acth_DescribeLocation, pcb_acts_DescribeLocation}
 };
 
-static pcb_action_t act_action_list[] = {
+static rnd_action_t act_action_list[] = {
 	{"Zoom", pcb_act_Zoom, pcb_acth_Zoom, pcb_acts_Zoom_},
 	{"ZoomTo", pcb_act_Zoom, pcb_acth_Zoom, pcb_acts_Zoom_},
 	{"SwapSides", pcb_act_SwapSides, pcb_acth_SwapSides, pcb_acts_SwapSides},
@@ -76,9 +76,9 @@
 
 void pplg_uninit_lib_hid_pcbui(void)
 {
-	pcb_remove_actions_by_cookie(rst_cookie);
-	pcb_remove_actions_by_cookie(status_cookie);
-	pcb_remove_actions_by_cookie(act_cookie);
+	rnd_remove_actions_by_cookie(rst_cookie);
+	rnd_remove_actions_by_cookie(status_cookie);
+	rnd_remove_actions_by_cookie(act_cookie);
 	pcb_event_unbind_allcookie(layer_cookie);
 	pcb_event_unbind_allcookie(rst_cookie);
 	pcb_event_unbind_allcookie(status_cookie);
Index: status.c
===================================================================
--- status.c	(revision 30897)
+++ status.c	(revision 30898)
@@ -242,9 +242,9 @@
 static void unit_change_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
 {
 	if (pcbhl_conf.editor.grid_unit == get_unit_struct("mm"))
-		pcb_actionva(&PCB->hidlib, "SetUnits", "mil", NULL);
+		rnd_actionva(&PCB->hidlib, "SetUnits", "mil", NULL);
 	else
-		pcb_actionva(&PCB->hidlib, "SetUnits", "mm", NULL);
+		rnd_actionva(&PCB->hidlib, "SetUnits", "mm", NULL);
 
 	status_rd_pcb2dlg();
 }