Index: trunk/src/find_geo.c
===================================================================
--- trunk/src/find_geo.c	(revision 34784)
+++ trunk/src/find_geo.c	(revision 34785)
@@ -839,11 +839,11 @@
 
 	/* single-point line - check only one circle*/
 	if ((x1 == x2) && (y1 == y2))
-		return pcb_pline_overlaps_circ(pl, x1, y1, thick/2);
+		return rnd_pline_overlaps_circ(pl, x1, y1, thick/2);
 
 	/* long line - check ends */
-	if (pcb_pline_overlaps_circ(pl, x1, y1, thick/2)) return rnd_true;
-	if (pcb_pline_overlaps_circ(pl, x2, y2, thick/2)) return rnd_true;
+	if (rnd_pline_overlaps_circ(pl, x1, y1, thick/2)) return rnd_true;
+	if (rnd_pline_overlaps_circ(pl, x2, y2, thick/2)) return rnd_true;
 
 	dx = x2 - x1;
 	dy = y2 - y1;
@@ -855,8 +855,8 @@
 	vy = (double)dy / -l * ((double)Bloat/2.0);
 
 	/* long line - consider edge intersection */
-	if (pcb_pline_isect_line(pl, x1 + ox + vx, y1 + oy + vy, x2 + ox - vx, y2 + oy - vy, NULL, NULL)) return rnd_true;
-	if (pcb_pline_isect_line(pl, x1 - ox + vx, y1 - oy + vy, x2 - ox - vx, y2 - oy - vy, NULL, NULL)) return rnd_true;
+	if (rnd_pline_isect_line(pl, x1 + ox + vx, y1 + oy + vy, x2 + ox - vx, y2 + oy - vy, NULL, NULL)) return rnd_true;
+	if (rnd_pline_isect_line(pl, x1 - ox + vx, y1 - oy + vy, x2 - ox - vx, y2 - oy - vy, NULL, NULL)) return rnd_true;
 
 	/* A corner case is when the polyline is fully within the line. By now we
 	   are sure there's no contour intersection, so if any of the polyline points
@@ -869,7 +869,7 @@
 		q[2][0] = x1 - ox; q[2][1] = y1 - oy;
 		q[3][0] = x2 - ox; q[3][1] = y2 - oy;
 
-		return pcb_is_point_in_convex_quad(pl->head->point, q);
+		return rnd_is_point_in_convex_quad(pl->head->point, q);
 	}
 }
 
Index: trunk/src/polygon.h
===================================================================
--- trunk/src/polygon.h	(revision 34784)
+++ trunk/src/polygon.h	(revision 34785)
@@ -89,7 +89,7 @@
 
 rnd_bool pcb_poly_is_point_in_p(rnd_coord_t, rnd_coord_t, rnd_coord_t, pcb_poly_t *);
 rnd_bool pcb_poly_is_point_in_p_ignore_holes(rnd_coord_t, rnd_coord_t, pcb_poly_t *);
-rnd_bool_t pcb_is_point_in_convex_quad(rnd_vector_t p, rnd_vector_t *q);
+rnd_bool_t rnd_is_point_in_convex_quad(rnd_vector_t p, rnd_vector_t *q);
 rnd_bool pcb_poly_is_rect_in_p(rnd_coord_t, rnd_coord_t, rnd_coord_t, rnd_coord_t, pcb_poly_t *);
 rnd_bool pcb_poly_isects_poly(rnd_polyarea_t *, pcb_poly_t *, rnd_bool);
 rnd_bool pcb_pline_isect_line(rnd_pline_t *pl, rnd_coord_t lx1, rnd_coord_t ly1, rnd_coord_t lx2, rnd_coord_t ly2, rnd_coord_t *cx, rnd_coord_t *cy);
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 34784)
+++ trunk/src_plugins/puller/puller.c	(revision 34785)
@@ -703,7 +703,7 @@
 		case PCB_PSSH_POLY:
 			if (shape->data.poly.pa == NULL)
 				pcb_pstk_shape_update_pa(&shape->data.poly);
-			return pcb_pline_embraces_circ(shape->data.poly.pa->contours, x - ps->x, y - ps->y, 1);
+			return rnd_pline_embraces_circ(shape->data.poly.pa->contours, x - ps->x, y - ps->y, 1);
 		case PCB_PSSH_LINE:
 		{
 			pcb_any_line_t tmp;