Index: remove_act.c
===================================================================
--- remove_act.c	(revision 30899)
+++ remove_act.c	(revision 30900)
@@ -49,7 +49,7 @@
 {
 	int id;
 
-	PCB_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1]));
+	RND_PCB_ACT_CONVARG(1, FGW_KEYWORD, Delete, id = fgw_keyword(&argv[1]));
 
 	if (id == -1) { /* no arg */
 		if (pcb_remove_selected(pcb_false) == pcb_false)
@@ -61,23 +61,23 @@
 		if (argc > 2) { /* delete by idpath */
 			pcb_idpath_t *idp;
 			pcb_any_obj_t *obj;
-			PCB_ACT_CONVARG(2, FGW_IDPATH, Delete, idp = fgw_idpath(&argv[2]));
+			RND_PCB_ACT_CONVARG(2, FGW_IDPATH, Delete, idp = fgw_idpath(&argv[2]));
 			if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH))
 				return FGW_ERR_PTR_DOMAIN;
 			obj = pcb_idpath2obj(PCB, idp);
 			if ((obj == NULL) || ((obj->type & PCB_OBJ_CLASS_REAL) == 0)) {
-				PCB_ACT_IRES(-1);
+				RND_ACT_IRES(-1);
 				return 0;
 			}
 			pcb_remove_object(obj->type, obj->parent.any, obj, obj);
 		}
 		else { /* interactive remove */
-			pcb_hidlib_t *hidlib = PCB_ACT_HIDLIB;
+			pcb_hidlib_t *hidlib = RND_ACT_HIDLIB;
 			rnd_hid_get_coords("Click on object to delete", &hidlib->tool_x, &hidlib->tool_y, 0);
-			pcb_tool_save(PCB_ACT_HIDLIB);
-			pcb_tool_select_by_name(PCB_ACT_HIDLIB, "remove");
-			pcb_tool_do_press(PCB_ACT_HIDLIB);
-			pcb_tool_restore(PCB_ACT_HIDLIB);
+			pcb_tool_save(RND_ACT_HIDLIB);
+			pcb_tool_select_by_name(RND_ACT_HIDLIB, "remove");
+			pcb_tool_do_press(RND_ACT_HIDLIB);
+			pcb_tool_restore(RND_ACT_HIDLIB);
 		}
 		break;
 	case F_Selected:
@@ -93,7 +93,7 @@
 		break;
 	}
 
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }
 
@@ -103,7 +103,7 @@
 {
 	if (pcb_remove_selected(pcb_false))
 		pcb_board_set_changed_flag(pcb_true);
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }