Index: infobar.c
===================================================================
--- infobar.c	(revision 28033)
+++ infobar.c	(revision 28034)
@@ -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("InfoBarFileChanged", "close", NULL);
+	pcb_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("InfoBarFileChanged", "open", NULL);
+				pcb_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("InfoBarFileChanged", "close", NULL);
+		pcb_actionva(hidlib, "InfoBarFileChanged", "close", NULL);
 	}
 }
 
Index: layersel.c
===================================================================
--- layersel.c	(revision 28033)
+++ layersel.c	(revision 28034)
@@ -274,7 +274,7 @@
 	else if (lys->ml != NULL) {
 		vis = (pcb_bool *)((char *)PCB + lys->ml->vis_offs);
 		*vis = 1;
-		pcb_actionva("SelectLayer", lys->ml->select_name, NULL);
+		pcb_actionva(&PCB->hidlib, "SelectLayer", lys->ml->select_name, NULL);
 	}
 	else
 		return;
@@ -430,7 +430,7 @@
 		return;
 
 	layer_select(lys);
-	pcb_actionva("Popup", "layer", NULL);
+	pcb_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("Popup", "group", NULL);
+	pcb_actionva(&PCB->hidlib, "Popup", "group", NULL);
 }
 
 
Index: status.c
===================================================================
--- status.c	(revision 28033)
+++ status.c	(revision 28034)
@@ -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("SetUnits", "mil", NULL);
+		pcb_actionva(&PCB->hidlib, "SetUnits", "mil", NULL);
 	else
-		pcb_actionva("SetUnits", "mm", NULL);
+		pcb_actionva(&PCB->hidlib, "SetUnits", "mm", NULL);
 
 	status_rd_pcb2dlg();
 }