Index: fgeometry.c
===================================================================
--- fgeometry.c	(revision 30954)
+++ fgeometry.c	(revision 30955)
@@ -161,7 +161,7 @@
 /* Can we remove this? */
 		{
 			double s = (d2y * (p2x - p1x) + d2x * (p1y - p2y)) / (d2y * d1x - d2x * d1y);
-			pcb_trace("Intersection t=%f, s=%f\n", t, s);
+			rnd_trace("Intersection t=%f, s=%f\n", t, s);
 
 			ret.x = p1x + s * d1x;
 			ret.y = p1y + s * d1y;
@@ -171,7 +171,7 @@
 		ret.x = p2x + t * d2x;
 		ret.y = p2y + t * d2y;
 
-		/*pcb_trace("Intersection x=%f, y=%f\n", ret.x, ret.y); */
+		/*rnd_trace("Intersection x=%f, y=%f\n", ret.x, ret.y); */
 	}
 	return ret;
 }
Index: rubberband.c
===================================================================
--- rubberband.c	(revision 30954)
+++ rubberband.c	(revision 30955)
@@ -381,7 +381,7 @@
 				pcb_rubber_band_create(rbnd, NULL, (pcb_line_t *) rat, 1, i->delta_index);
 			break;
 		default:
-			rnd_message(PCB_MSG_ERROR, "hace: bad rubber-rat lookup callback\n");
+			rnd_message(RND_MSG_ERROR, "hace: bad rubber-rat lookup callback\n");
 	}
 	return PCB_R_DIR_NOT_FOUND;
 }