Index: polyhelp.c
===================================================================
--- polyhelp.c	(revision 31036)
+++ polyhelp.c	(revision 31037)
@@ -50,9 +50,9 @@
 #include <librnd/core/hid_attrib.h>
 #include <librnd/core/actions.h>
 
-void pcb_pline_fprint_anim(FILE *f, const pcb_pline_t *pl)
+void pcb_pline_fprint_anim(FILE *f, const rnd_pline_t *pl)
 {
-	const pcb_vnode_t *v, *n;
+	const rnd_vnode_t *v, *n;
 	fprintf(f, "!pline start\n");
 	v = pl->head;
 	do {
@@ -73,7 +73,7 @@
 }
 #endif
 
-rnd_cardinal_t pcb_pline_to_lines(pcb_layer_t *dst, const pcb_pline_t *src, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
+rnd_cardinal_t pcb_pline_to_lines(pcb_layer_t *dst, const rnd_pline_t *src, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
 {
 	rnd_cardinal_t cnt = 0;
 	vtp0_t tracks;
@@ -83,8 +83,8 @@
 	rnd_pline_dup_offsets(&tracks, src, -((thickness/2)+1));
 
 	for(i = 0; i < tracks.used; i++) {
-		const pcb_vnode_t *v, *n;
-		pcb_pline_t *track = tracks.array[i];
+		const rnd_vnode_t *v, *n;
+		rnd_pline_t *track = tracks.array[i];
 
 		v = track->head;
 		do {
@@ -93,7 +93,7 @@
 			cnt++;
 		}
 		while((v = v->next) != track->head);
-		pcb_poly_contour_del(&track);
+		rnd_poly_contour_del(&track);
 	}
 
 	vtp0_uninit(&tracks);
@@ -100,9 +100,9 @@
 	return cnt;
 }
 
-rnd_bool pcb_pline_is_aligned(const pcb_pline_t *src)
+rnd_bool pcb_pline_is_aligned(const rnd_pline_t *src)
 {
-	const pcb_vnode_t *v, *n;
+	const rnd_vnode_t *v, *n;
 
 	v = src->head;
 	do {
@@ -132,7 +132,7 @@
 
 
 	for(pa = pcb_poly_island_first(src, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
-		pcb_pline_t *pl;
+		rnd_pline_t *pl;
 
 		pl = pcb_poly_contour(&it);
 		if (pl != NULL) { /* we have a contour */
@@ -176,7 +176,7 @@
 	pcb_r_insert_entry(dst->edge_tree, (rnd_rnd_box_t *)e);
 }
 
-static void add_track(pcb_cpoly_edgetree_t *dst, pcb_pline_t *track)
+static void add_track(pcb_cpoly_edgetree_t *dst, rnd_pline_t *track)
 {
 	int go, first = 1;
 	rnd_coord_t x, y, px, py;
@@ -213,18 +213,18 @@
 	res->bbox.X2 = res->bbox.Y2 = -RND_MAX_COORD;
 
 	for(pa = pcb_poly_island_first(src, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
-		pcb_pline_t *pl, *track;
+		rnd_pline_t *pl, *track;
 
 		pl = pcb_poly_contour(&it);
 		if (pl != NULL) { /* we have a contour */
 			track = rnd_pline_dup_offset(pl, -offs);
 			add_track(res, track);
-			pcb_poly_contour_del(&track);
+			rnd_poly_contour_del(&track);
 
 			for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it)) {
 				track = rnd_pline_dup_offset(pl, -offs);
 				add_track(res, track);
-				pcb_poly_contour_del(&track);
+				rnd_poly_contour_del(&track);
 			}
 		}
 	}
@@ -485,7 +485,7 @@
 			pcb_poly_it_t it;
 			rnd_polyarea_t *pa;
 			for(pa = pcb_poly_island_first(polygon, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
-				pcb_pline_t *pl = pcb_poly_contour(&it);
+				rnd_pline_t *pl = pcb_poly_contour(&it);
 				if (pl != NULL) { /* we have a contour */
 					pcb_pline_to_lines(PCB_CURRLAYER(PCB), pl, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg);
 					for(pl = pcb_poly_hole_first(&it); pl != NULL; pl = pcb_poly_hole_next(&it))
Index: polyhelp.h
===================================================================
--- polyhelp.h	(revision 31036)
+++ polyhelp.h	(revision 31037)
@@ -27,12 +27,12 @@
 #include "obj_poly.h"
 
 
-void pcb_pline_fprint_anim(FILE *f, const pcb_pline_t *pl);
+void pcb_pline_fprint_anim(FILE *f, const rnd_pline_t *pl);
 
 /* Add lines on dst tracing pline from the inner side (no line will extend
    outside of the original pline, except when the original polygon has a hair
    narrower than thickness). Returns number of lines created */
-rnd_cardinal_t pcb_pline_to_lines(pcb_layer_t *dst, const pcb_pline_t *src, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags);
+rnd_cardinal_t pcb_pline_to_lines(pcb_layer_t *dst, const rnd_pline_t *src, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags);
 
 /* Returns whether the clipped polygon is a simple rectangle (single island,
    no-hole rectangle). */
@@ -39,7 +39,7 @@
 rnd_bool pcb_cpoly_is_simple_rect(const pcb_poly_t *p);
 
 /* Returns whether all edges of a pline are axis aligned */
-rnd_bool pcb_pline_is_aligned(const pcb_pline_t *src);
+rnd_bool pcb_pline_is_aligned(const rnd_pline_t *src);
 
 /*** Generate an rtree of all edges if a polygon */