Index: remove_act.c
===================================================================
--- remove_act.c	(revision 5011)
+++ remove_act.c	(revision 5012)
@@ -57,10 +57,10 @@
 
 	switch (id) {
 	case F_Object:
-		SaveMode();
-		SetMode(PCB_MODE_REMOVE);
+		pcb_crosshair_save_mode();
+		pcb_crosshair_set_mode(PCB_MODE_REMOVE);
 		pcb_notify_mode();
-		RestoreMode();
+		pcb_crosshair_restore_mode();
 		break;
 	case F_Selected:
 		pcb_remove_selected();
@@ -67,11 +67,11 @@
 		break;
 	case F_AllRats:
 		if (pcb_rats_destroy(pcb_false))
-			SetChangedFlag(pcb_true);
+			pcb_board_set_changed_flag(pcb_true);
 		break;
 	case F_SelectedRats:
 		if (pcb_rats_destroy(pcb_true))
-			SetChangedFlag(pcb_true);
+			pcb_board_set_changed_flag(pcb_true);
 		break;
 	}
 
@@ -91,7 +91,7 @@
 static int ActionRemoveSelected(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	if (pcb_remove_selected())
-		SetChangedFlag(pcb_true);
+		pcb_board_set_changed_flag(pcb_true);
 	return 0;
 }