Index: tool_arc.c
===================================================================
--- tool_arc.c	(revision 30954)
+++ tool_arc.c	(revision 30955)
@@ -93,7 +93,7 @@
 			pcb_angle_t sa, dir;
 			wx = hl->tool_x - pcb_crosshair.AttachedBox.Point1.X;
 			wy = hl->tool_y - pcb_crosshair.AttachedBox.Point1.Y;
-pcb_trace("arc: %mm %mm wh %mm %mm\n", hl->tool_x, hl->tool_y, wx, wy);
+rnd_trace("arc: %mm %mm wh %mm %mm\n", hl->tool_x, hl->tool_y, wx, wy);
 			if (PCB_XOR(pcb_crosshair.AttachedBox.otherway, coord_abs(wy) > coord_abs(wx))) {
 				pcb_crosshair.AttachedBox.Point2.X = pcb_crosshair.AttachedBox.Point1.X + coord_abs(wy) * PCB_SGNZ(wx);
 				sa = (wx >= 0) ? 0 : 180;
Index: tool_copy.c
===================================================================
--- tool_copy.c	(revision 30954)
+++ tool_copy.c	(revision 30955)
@@ -73,7 +73,7 @@
 	case PCB_CH_STATE_SECOND:
 
 		if ((pcb->is_footprint) && (pcb_crosshair.AttachedObject.Type == PCB_OBJ_SUBC)) {
-			rnd_message(PCB_MSG_WARNING, "Can not copy subcircuit in the footprint edit mode\n");
+			rnd_message(RND_MSG_WARNING, "Can not copy subcircuit in the footprint edit mode\n");
 		}
 		else {
 			pcb_copy_obj(pcb_crosshair.AttachedObject.Type,
Index: tool_insert.c
===================================================================
--- tool_insert.c	(revision 30954)
+++ tool_insert.c	(revision 30955)
@@ -73,7 +73,7 @@
 		if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
 			pcb_any_obj_t *obj = (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2;
 			if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
-				rnd_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+				rnd_message(RND_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 				pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 				pcb_crosshair.extobj_edit = NULL;
 				break;
Index: tool_move.c
===================================================================
--- tool_move.c	(revision 30954)
+++ tool_move.c	(revision 30955)
@@ -68,7 +68,7 @@
 			if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
 				pcb_any_obj_t *obj = (pcb_any_obj_t *)pcb_crosshair.AttachedObject.Ptr2;
 				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
-					rnd_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+					rnd_message(RND_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 					pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 					pcb_crosshair.extobj_edit = NULL;
 				}
Index: tool_polyhole.c
===================================================================
--- tool_polyhole.c	(revision 30954)
+++ tool_polyhole.c	(revision 30955)
@@ -65,12 +65,12 @@
 									 &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3);
 
 		if (pcb_crosshair.AttachedObject.Type == PCB_OBJ_VOID) {
-			rnd_message(PCB_MSG_WARNING, "The first point of a polygon hole must be on a polygon.\n");
+			rnd_message(RND_MSG_WARNING, "The first point of a polygon hole must be on a polygon.\n");
 			break; /* don't start doing anything if clicket out of polys */
 		}
 
 		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_poly_t *)pcb_crosshair.AttachedObject.Ptr2)) {
-			rnd_message(PCB_MSG_WARNING, "Sorry, poly object is locked\n");
+			rnd_message(RND_MSG_WARNING, "Sorry, poly object is locked\n");
 			pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID;
 			pcb_crosshair.extobj_edit = NULL;
 			break;
Index: tool_remove.c
===================================================================
--- tool_remove.c	(revision 30954)
+++ tool_remove.c	(revision 30955)
@@ -56,13 +56,13 @@
 	if ((type = pcb_search_screen(hl->tool_x, hl->tool_y, PCB_REMOVE_TYPES | PCB_LOOSE_SUBC(PCB) | PCB_OBJ_FLOATER, &ptr1, &ptr2, &ptr3)) != PCB_OBJ_VOID) {
 		obj = (pcb_any_obj_t *)ptr2;
 		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, obj)) {
-			rnd_message(PCB_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
+			rnd_message(RND_MSG_WARNING, "Sorry, %s object is locked\n", pcb_obj_type_name(obj->type));
 			return;
 		}
 
 		if (type == PCB_OBJ_SUBC) {
 			if(pcb->is_footprint) {
-				rnd_message(PCB_MSG_WARNING, "Can not remove the subcircuit being edited in the footprint edit mode\n");
+				rnd_message(RND_MSG_WARNING, "Can not remove the subcircuit being edited in the footprint edit mode\n");
 				return;
 			}
 		}
Index: tool_via.c
===================================================================
--- tool_via.c	(revision 30954)
+++ tool_via.c	(revision 30955)
@@ -56,12 +56,12 @@
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 
 	if (!pcb->pstk_on) {
-		rnd_message(PCB_MSG_WARNING, "You must turn via visibility on before\nyou can place vias\n");
+		rnd_message(RND_MSG_WARNING, "You must turn via visibility on before\nyou can place vias\n");
 		return;
 	}
 
 	if (conf_core.design.via_drilling_hole >= conf_core.design.via_thickness) {
-		rnd_message(PCB_MSG_ERROR, "Can't place via: invalid via geometry (hole too large for via size)\n");
+		rnd_message(RND_MSG_ERROR, "Can't place via: invalid via geometry (hole too large for via size)\n");
 		return;
 	}