Index: io_kicad.c
===================================================================
--- io_kicad.c	(revision 30897)
+++ io_kicad.c	(revision 30898)
@@ -50,7 +50,7 @@
 	return 100;
 }
 
-pcb_action_t eeschema_action_list[] = {
+rnd_action_t eeschema_action_list[] = {
 	{"LoadEeschemaFrom", pcb_act_LoadeeschemaFrom, pcb_acth_LoadeeschemaFrom, pcb_acts_LoadeeschemaFrom}
 };
 
@@ -59,7 +59,7 @@
 void pplg_uninit_io_kicad(void)
 {
 	/* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */
-	pcb_remove_actions_by_cookie(kicad_cookie);
+	rnd_remove_actions_by_cookie(kicad_cookie);
 	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
 	pcb_eeschema_uninit();
 }
Index: read_net.c
===================================================================
--- read_net.c	(revision 30897)
+++ read_net.c	(revision 30898)
@@ -98,7 +98,7 @@
 	}
 
 	/* Load the elements */
-	pcb_actionva(&PCB->hidlib, "ElementList", "start", NULL);
+	rnd_actionva(&PCB->hidlib, "ElementList", "start", NULL);
 
 	for(c = components->children; c != NULL; c = c->next) {
 		const char *ref = NULL, *value = NULL, *footprint = NULL;
@@ -117,15 +117,15 @@
 			pcb_message(PCB_MSG_WARNING, "eeschema: ignoring component %s with no footprint\n", ref);
 			continue;
 		}
-		pcb_actionva(&PCB->hidlib, "ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL);
+		rnd_actionva(&PCB->hidlib, "ElementList", "Need", ref, footprint, value == NULL ? "" : value, NULL);
 	}
 
-	pcb_actionva(&PCB->hidlib, "ElementList", "Done", NULL);
+	rnd_actionva(&PCB->hidlib, "ElementList", "Done", NULL);
 
 	/* Load the netlist */
 
-	pcb_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL);
-	pcb_actionva(&PCB->hidlib, "Netlist", "Clear", NULL);
+	rnd_actionva(&PCB->hidlib, "Netlist", "Freeze", NULL);
+	rnd_actionva(&PCB->hidlib, "Netlist", "Clear", NULL);
 
 	for(net = nets->children; net != NULL; net = net->next) {
 		const char *netname = NULL, *code = NULL, *name = NULL;
@@ -164,13 +164,13 @@
 					continue;
 				}
 				pcb_snprintf(refpin, sizeof(refpin), "%s-%s", ref, pin);
-				pcb_actionva(&PCB->hidlib, "Netlist", "Add",  netname, refpin, NULL);
+				rnd_actionva(&PCB->hidlib, "Netlist", "Add",  netname, refpin, NULL);
 			}
 		}
 	}
 
-	pcb_actionva(&PCB->hidlib, "Netlist", "Sort", NULL);
-	pcb_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL);
+	rnd_actionva(&PCB->hidlib, "Netlist", "Sort", NULL);
+	rnd_actionva(&PCB->hidlib, "Netlist", "Thaw", NULL);
 
 	return 0;
 }