Index: bus.c
===================================================================
--- bus.c	(revision 30954)
+++ bus.c	(revision 30955)
@@ -44,7 +44,7 @@
 static void pcb_bus_del_pre(pcb_subc_t *subc)
 {
 	bus_t *bus = subc->extobj_data;
-	pcb_trace("bus del_pre\n");
+	rnd_trace("bus del_pre\n");
 
 	if ((bus != NULL) && (bus->gui_active))
 		PCB_DAD_FREE(bus->dlg);
@@ -134,7 +134,7 @@
 		l->Thickness = bus->vthickness;
 		if (l1 == NULL) l1 = l;
 
-/*		pcb_trace("line\n");*/
+/*		rnd_trace("line\n");*/
 		sb.x1 = l->Point1.X-1; sb.y1 = l->Point1.Y-1;
 		sb.x2 = l->Point1.X+1; sb.y2 = l->Point1.Y+1;
 		for(ltmp = pcb_rtree_first(&it, ely->line_tree, &sb); ltmp != NULL; ltmp = pcb_rtree_next(&it))
@@ -143,13 +143,13 @@
 			if (close_enough(l->Point1, ltmp->Point1)) {
 				a1 = atan2(ltmp->Point2.Y - ltmp->Point1.Y, ltmp->Point2.X - ltmp->Point1.X);
 				c1 = 1;
-/*				pcb_trace(" conn1 2-1 %f\n", a1);*/
+/*				rnd_trace(" conn1 2-1 %f\n", a1);*/
 				break;
 			}
 			else if (close_enough(l->Point1, ltmp->Point2)) {
 				a1 = atan2(ltmp->Point1.Y - ltmp->Point2.Y, ltmp->Point1.X - ltmp->Point2.X);
 				c1 = 1;
-/*				pcb_trace(" conn1 1-2 %f\n", a1);*/
+/*				rnd_trace(" conn1 1-2 %f\n", a1);*/
 				break;
 			}
 		}
@@ -161,13 +161,13 @@
 			if (close_enough(l->Point2, ltmp->Point1)) {
 				a2 = atan2(ltmp->Point2.Y - ltmp->Point1.Y, ltmp->Point2.X - ltmp->Point1.X);
 				c2 = 1;
-/*				pcb_trace(" conn2 2-1 %f\n", a1);*/
+/*				rnd_trace(" conn2 2-1 %f\n", a1);*/
 				break;
 			}
 			if (close_enough(l->Point2, ltmp->Point2)) {
 				a2 = atan2(ltmp->Point1.Y - ltmp->Point2.Y, ltmp->Point1.X - ltmp->Point2.X);
 				c2 = 1;
-/*				pcb_trace(" conn2 2-1 %f\n", a1);*/
+/*				rnd_trace(" conn2 2-1 %f\n", a1);*/
 				break;
 			}
 		}
@@ -176,7 +176,7 @@
 
 		if (c1) {
 			double a0 = atan2(l->Point1.Y - l->Point2.Y, l->Point1.X - l->Point2.X);
-/*pcb_trace("c1 a0=%f a1=%f\n", a0 * PCB_RAD_TO_DEG, a1 * PCB_RAD_TO_DEG);*/
+/*rnd_trace("c1 a0=%f a1=%f\n", a0 * PCB_RAD_TO_DEG, a1 * PCB_RAD_TO_DEG);*/
 			a1 = a1 - a0;
 			tune1 = tan(a1/2.0);
 		}
@@ -185,7 +185,7 @@
 	
 		if (c2) {
 			double a0 = atan2(l->Point2.Y - l->Point1.Y, l->Point2.X - l->Point1.X);
-/*pcb_trace("c1 a0=%f a2=%f\n", a0 * PCB_RAD_TO_DEG, a2 * PCB_RAD_TO_DEG);*/
+/*rnd_trace("c1 a0=%f a2=%f\n", a0 * PCB_RAD_TO_DEG, a2 * PCB_RAD_TO_DEG);*/
 			a2 = a2 - a0;
 			tune2 = tan(a2/2.0);
 		}
@@ -192,12 +192,12 @@
 		else
 			tune2 = 0;
 
-/*		pcb_trace("tune: %f:%f  %f:%f\n", a1 * PCB_RAD_TO_DEG, tune1, a2 * PCB_RAD_TO_DEG, tune2);*/
+/*		rnd_trace("tune: %f:%f  %f:%f\n", a1 * PCB_RAD_TO_DEG, tune1, a2 * PCB_RAD_TO_DEG, tune2);*/
 
 		for(n = 0; n < bus->width; n++,o-=bus->pitch) {
 			double o2 = -o;
-/*			pcb_trace(" off1: %f %f %ml = %ml\n", vx, tune1, (rnd_coord_t)o, (rnd_coord_t)(vx * tune1 * o));
-			pcb_trace(" off2: %f %f %ml = %ml\n", vx, tune2, (rnd_coord_t)o, (rnd_coord_t)(vx * tune2 * o));*/
+/*			rnd_trace(" off1: %f %f %ml = %ml\n", vx, tune1, (rnd_coord_t)o, (rnd_coord_t)(vx * tune1 * o));
+			rnd_trace(" off2: %f %f %ml = %ml\n", vx, tune2, (rnd_coord_t)o, (rnd_coord_t)(vx * tune2 * o));*/
 			pcb_line_new(tly,
 				l->Point1.X + nx * o + vx * tune1 * o2, l->Point1.Y + ny * o + vy * tune1 * o2,
 				l->Point2.X + nx * o + vx * tune2 * o2, l->Point2.Y + ny * o + vy * tune2 * o2,
@@ -207,7 +207,7 @@
 	}
 
 	if (l1 != NULL) {
-pcb_trace("bus origin at %mm %mm\n", l1->Point1.X, l1->Point1.Y);
+rnd_trace("bus origin at %mm %mm\n", l1->Point1.X, l1->Point1.Y);
 		pcb_subc_move_origin_to(subc, l1->Point1.X, l1->Point1.Y, 0);
 	}
 	return pcb_exto_regen_end(subc);
@@ -248,19 +248,19 @@
 
 static void pcb_bus_float_pre(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
-	pcb_trace("bus: edit pre %ld %ld\n", subc->ID, edit_obj->ID);
+	rnd_trace("bus: edit pre %ld %ld\n", subc->ID, edit_obj->ID);
 	bus_clear(subc);
 }
 
 static void pcb_bus_float_geo(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
-	pcb_trace("bus: edit geo %ld %ld\n", subc->ID, edit_obj == NULL ? -1 : edit_obj->ID);
+	rnd_trace("bus: edit geo %ld %ld\n", subc->ID, edit_obj == NULL ? -1 : edit_obj->ID);
 	bus_gen(subc, edit_obj);
 }
 
 static pcb_extobj_new_t pcb_bus_float_new(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("bus: float new %ld %ld\n", subc->ID, floater->ID);
+	rnd_trace("bus: float new %ld %ld\n", subc->ID, floater->ID);
 	return PCB_EXTONEW_FLOATER;
 }
 
@@ -269,7 +269,7 @@
 	pcb_layer_t *ly = &subc->data->Layer[LID_EDIT];
 	long len = linelist_length(&ly->Line);
 
-	pcb_trace("bus: float del %ld %ld edit-objs=%ld\n", subc->ID, floater->ID, len);
+	rnd_trace("bus: float del %ld %ld edit-objs=%ld\n", subc->ID, floater->ID, len);
 
 	return len == 1 ? PCB_EXTODEL_SUBC : PCB_EXTODEL_FLOATER; /* removing the last floater should remove the subc */
 }
@@ -277,7 +277,7 @@
 
 static void pcb_bus_chg_attr(pcb_subc_t *subc, const char *key, const char *value)
 {
-	pcb_trace("bus chg_attr\n");
+	rnd_trace("bus chg_attr\n");
 	if (strncmp(key, "extobj::", 8) == 0) {
 		bus_clear(subc);
 		bus_unpack(subc);
@@ -298,7 +298,7 @@
 		{NULL, 0, NULL, 0, 0}
 	};
 
-	pcb_trace("bus: conv_objs\n");
+	rnd_trace("bus: conv_objs\n");
 
 	/* refuse anything that's not a line */
 	for(n = 0; n < objs->used; n++) {
@@ -344,7 +344,7 @@
 		PCB_FLAG_SET(PCB_FLAG_FLOATER, l);
 		PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, l);
 		rnd_attribute_put(&l->Attributes, "extobj::role", "edit");
-pcb_trace(" subc=%p l=%p\n", subc, ly);
+rnd_trace(" subc=%p l=%p\n", subc, ly);
 	}
 
 	bus_gen(subc, NULL);
@@ -366,13 +366,13 @@
 	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	bus_t *bus;
 
-	pcb_trace("bus: gui propedit\n");
+	rnd_trace("bus: gui propedit\n");
 
 	if (subc->extobj_data == NULL)
 		bus_unpack(subc);
 	bus = subc->extobj_data;
 
-	pcb_trace("bus: active=%d\n", bus->gui_active);
+	rnd_trace("bus: active=%d\n", bus->gui_active);
 	if (bus->gui_active)
 		return; /* do not open another */
 
Index: cord.c
===================================================================
--- cord.c	(revision 30954)
+++ cord.c	(revision 30955)
@@ -110,7 +110,7 @@
 
 	cord_get_ends(subc, group, &e1, &a1, &e2, &a2);
 	if ((e1 == NULL) || (e2 == NULL)) {
-		rnd_message(PCB_MSG_ERROR, "extended object cord: failed to generate cord for #%ld group %s: missing endpoint\n", subc->ID, group);
+		rnd_message(RND_MSG_ERROR, "extended object cord: failed to generate cord for #%ld group %s: missing endpoint\n", subc->ID, group);
 		return -1;
 	}
 
@@ -179,7 +179,7 @@
 
 static void pcb_cord_float_pre(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("cord: float pre %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
+	rnd_trace("cord: float pre %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
 
 	if (floater->extobj_role == NULL)
 		return;
@@ -196,7 +196,7 @@
 		return;
 	}
 
-	pcb_trace("cord: float geo %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
+	rnd_trace("cord: float geo %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
 
 	if (floater->extobj_role == NULL)
 		return;
@@ -219,7 +219,7 @@
 	const char *group = group_of(floater);
 	int has_other_grp = 0;
 
-	pcb_trace("cord: float del %ld %ld\n", subc->ID, floater->ID);
+	rnd_trace("cord: float del %ld %ld\n", subc->ID, floater->ID);
 
 	if ((floater->type != PCB_OBJ_LINE) || (group == NULL))
 		return PCB_EXTODEL_FLOATER; /* e.g. refdes text - none of our business */
@@ -241,7 +241,7 @@
 
 static void pcb_cord_chg_attr(pcb_subc_t *subc, const char *key, const char *value)
 {
-	pcb_trace("cord chg_attr\n");
+	rnd_trace("cord chg_attr\n");
 }
 
 static rnd_cardinal_t endpt_pstk_proto(pcb_data_t *data, pcb_layer_type_t lyt)
@@ -338,7 +338,7 @@
 		{NULL, 0, NULL, 0, 0}
 	};
 
-	pcb_trace("cord: conv_objs\n");
+	rnd_trace("cord: conv_objs\n");
 
 	/* origin override: if converting subcircuits, keep the first subcircuits origin */
 	for(n = 0; n < objs->used; n++) {
@@ -371,9 +371,9 @@
 
 	/* create padstack prototypes */
 	if (endpt_pstk_proto(subc->data, PCB_LYT_COPPER | PCB_LYT_TOP) != COPPER_END)
-		rnd_message(PCB_MSG_WARNING, "extended object cord: wrong pstk proto ID for copper end\n");
+		rnd_message(RND_MSG_WARNING, "extended object cord: wrong pstk proto ID for copper end\n");
 	if (endpt_pstk_proto(subc->data, PCB_LYT_SILK | PCB_LYT_TOP) != SILK_END)
-		rnd_message(PCB_MSG_WARNING, "extended object cord: wrong pstk proto ID for silk end\n");
+		rnd_message(RND_MSG_WARNING, "extended object cord: wrong pstk proto ID for silk end\n");
 
 	/* convert lines into 2-ended cords */
 	for(n = 0; n < objs->used; n++) {
Index: dimension.c
===================================================================
--- dimension.c	(revision 30954)
+++ dimension.c	(revision 30955)
@@ -51,7 +51,7 @@
 
 static void pcb_dimension_del_pre(pcb_subc_t *subc)
 {
-	pcb_trace("dim del_pre\n");
+	rnd_trace("dim del_pre\n");
 	free(subc->extobj_data);
 	subc->extobj_data = NULL;
 }
@@ -252,7 +252,7 @@
 
 static void pcb_dimension_float_pre(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("dim: float pre %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
+	rnd_trace("dim: float pre %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
 
 	dimension_clear(subc);
 }
@@ -288,12 +288,12 @@
 			d = -d;
 	}
 
-pcb_trace("new disp: %mm f=%mm;%mm\n", (rnd_coord_t)d, fx, fy);
+rnd_trace("new disp: %mm f=%mm;%mm\n", (rnd_coord_t)d, fx, fy);
 
 	if ((d > -PCB_MM_TO_COORD(0.1)) && (d < PCB_MM_TO_COORD(0.1)))
 		return;
 
-pcb_trace("let's do it!\n");
+rnd_trace("let's do it!\n");
 
 	dimension_clear(subc);
 	dim->displace = d;
@@ -304,7 +304,7 @@
 
 static void pcb_dimension_float_geo(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("dim: float geo %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
+	rnd_trace("dim: float geo %ld %ld role=%s\n", subc->ID, floater->ID, floater->extobj_role);
 
 	if (floater->extobj_role == NULL)
 		return;
@@ -318,19 +318,19 @@
 
 static pcb_extobj_new_t pcb_dimension_float_new(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("dim: float new %ld %ld\n", subc->ID, floater->ID);
+	rnd_trace("dim: float new %ld %ld\n", subc->ID, floater->ID);
 	return PCB_EXTONEW_SPAWN;
 }
 
 static pcb_extobj_del_t pcb_dimension_float_del(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("dim: float del %ld %ld\n", subc->ID, floater->ID);
+	rnd_trace("dim: float del %ld %ld\n", subc->ID, floater->ID);
 	return PCB_EXTODEL_SUBC;
 }
 
 static void pcb_dimension_chg_attr(pcb_subc_t *subc, const char *key, const char *value)
 {
-	pcb_trace("dim chg_attr\n");
+	rnd_trace("dim chg_attr\n");
 	if (strncmp(key, "extobj::", 8) == 0) {
 		dimension_clear(subc);
 		dimension_unpack(subc);
@@ -349,7 +349,7 @@
 		{NULL, 0, NULL, 0, 0}
 	};
 
-	pcb_trace("dim: conv_objs\n");
+	rnd_trace("dim: conv_objs\n");
 
 	if (objs->used != 1)
 		return NULL; /* there must be a single line */
@@ -404,13 +404,13 @@
 	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	dimension *dim;
 
-	pcb_trace("dim: gui propedit\n");
+	rnd_trace("dim: gui propedit\n");
 
 	if (subc->extobj_data == NULL)
 		dimension_unpack(subc);
 	dim = subc->extobj_data;
 
-	pcb_trace("dim: active=%d\n", dim->gui_active);
+	rnd_trace("dim: active=%d\n", dim->gui_active);
 	if (dim->gui_active)
 		return; /* do not open another */
 
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 30954)
+++ line_of_vias.c	(revision 30955)
@@ -40,7 +40,7 @@
 static void pcb_line_of_vias_del_pre(pcb_subc_t *subc)
 {
 	line_of_vias *lov = subc->extobj_data;
-	pcb_trace("LoV del_pre\n");
+	rnd_trace("LoV del_pre\n");
 
 	if ((lov != NULL) && (lov->gui_active))
 		PCB_DAD_FREE(lov->dlg);
@@ -135,7 +135,7 @@
 
 	lov = subc->extobj_data;
 	if (lov->pitch < PCB_MM_TO_COORD(0.001)) {
-		rnd_message(PCB_MSG_ERROR, "line_of_vias_gen(): can not generate line-of-vias, pitch value is too small\n");
+		rnd_message(RND_MSG_ERROR, "line_of_vias_gen(): can not generate line-of-vias, pitch value is too small\n");
 		return -1;
 	}
 
@@ -202,19 +202,19 @@
 
 static void pcb_line_of_vias_float_pre(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
-	pcb_trace("LoV: edit pre %ld %ld\n", subc->ID, edit_obj->ID);
+	rnd_trace("LoV: edit pre %ld %ld\n", subc->ID, edit_obj->ID);
 	line_of_vias_clear(subc);
 }
 
 static void pcb_line_of_vias_float_geo(pcb_subc_t *subc, pcb_any_obj_t *edit_obj)
 {
-	pcb_trace("LoV: edit geo %ld %ld\n", subc->ID, edit_obj == NULL ? -1 : edit_obj->ID);
+	rnd_trace("LoV: edit geo %ld %ld\n", subc->ID, edit_obj == NULL ? -1 : edit_obj->ID);
 	line_of_vias_gen(subc, edit_obj);
 }
 
 static pcb_extobj_new_t pcb_line_of_vias_float_new(pcb_subc_t *subc, pcb_any_obj_t *floater)
 {
-	pcb_trace("LoV: float new %ld %ld\n", subc->ID, floater->ID);
+	rnd_trace("LoV: float new %ld %ld\n", subc->ID, floater->ID);
 	return PCB_EXTONEW_FLOATER;
 }
 
@@ -223,7 +223,7 @@
 	pcb_layer_t *ly = &subc->data->Layer[LID_EDIT];
 	long len = linelist_length(&ly->Line);
 
-	pcb_trace("LoV: float del %ld %ld edit-objs=%ld\n", subc->ID, floater->ID, len);
+	rnd_trace("LoV: float del %ld %ld edit-objs=%ld\n", subc->ID, floater->ID, len);
 
 	return len == 1 ? PCB_EXTODEL_SUBC : PCB_EXTODEL_FLOATER; /* removing the last floater should remove the subc */
 }
@@ -231,7 +231,7 @@
 
 static void pcb_line_of_vias_chg_attr(pcb_subc_t *subc, const char *key, const char *value)
 {
-	pcb_trace("LoV chg_attr\n");
+	rnd_trace("LoV chg_attr\n");
 	if (strncmp(key, "extobj::", 8) == 0) {
 		line_of_vias_clear(subc);
 		line_of_vias_unpack(subc);
@@ -251,7 +251,7 @@
 		{NULL, 0, NULL, 0, 0}
 	};
 
-	pcb_trace("LoV: conv_objs\n");
+	rnd_trace("LoV: conv_objs\n");
 
 	/* refuse anything that's not a line */
 	for(n = 0; n < objs->used; n++) {
@@ -304,13 +304,13 @@
 	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	line_of_vias *lov;
 
-	pcb_trace("LoV: gui propedit\n");
+	rnd_trace("LoV: gui propedit\n");
 
 	if (subc->extobj_data == NULL)
 		line_of_vias_unpack(subc);
 	lov = subc->extobj_data;
 
-	pcb_trace("LoV: active=%d\n", lov->gui_active);
+	rnd_trace("LoV: active=%d\n", lov->gui_active);
 	if (lov->gui_active)
 		return; /* do not open another */