Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31038)
+++ trunk/src/librnd/pcb_compat.h	(revision 31039)
@@ -1298,3 +1298,6 @@
 #define pcb_polyarea_no_holes_dicer rnd_polyarea_no_holes_dicer
 #define pcb_poly_frac_circle rnd_poly_frac_circle
 #define pcb_poly_frac_circle_end rnd_poly_frac_circle_end
+#define pcb_pline_is_selfint rnd_pline_is_selfint
+#define pcb_pline_split_selfint rnd_pline_split_selfint
+#define pcb_polyarea_split_selfint rnd_polyarea_split_selfint
Index: trunk/src/librnd/poly/offset.c
===================================================================
--- trunk/src/librnd/poly/offset.c	(revision 31038)
+++ trunk/src/librnd/poly/offset.c	(revision 31039)
@@ -176,8 +176,8 @@
 	free(pcsh);
 
 	from = dst->used;
-	if (pcb_pline_is_selfint(res)) {
-		pcb_pline_split_selfint(res, dst);
+	if (rnd_pline_is_selfint(res)) {
+		rnd_pline_split_selfint(res, dst);
 		rnd_poly_contour_del(&res);
 	}
 	else
Index: trunk/src/librnd/poly/self_isc.c
===================================================================
--- trunk/src/librnd/poly/self_isc.c	(revision 31038)
+++ trunk/src/librnd/poly/self_isc.c	(revision 31039)
@@ -211,7 +211,7 @@
 	return pline_split_off_loop_new(pl, out, h, start, cnt);
 }
 
-rnd_bool pcb_pline_is_selfint(rnd_pline_t *pl)
+rnd_bool rnd_pline_is_selfint(rnd_pline_t *pl)
 {
 	rnd_vnode_t *va, *vb;
 
@@ -228,7 +228,7 @@
 }
 
 
-void pcb_pline_split_selfint(const rnd_pline_t *pl_in, vtp0_t *out)
+void rnd_pline_split_selfint(const rnd_pline_t *pl_in, vtp0_t *out)
 {
 	int n;
 	vtp0_t hubs;
@@ -292,7 +292,7 @@
 	vtp0_uninit(&hubs);
 }
 
-rnd_cardinal_t pcb_polyarea_split_selfint(rnd_polyarea_t *pa)
+rnd_cardinal_t rnd_polyarea_split_selfint(rnd_polyarea_t *pa)
 {
 	rnd_pline_t *pl, *next, *pln, *prev = NULL;
 	rnd_cardinal_t cnt = 0;
@@ -299,12 +299,12 @@
 
 	for(pl = pa->contours; pl != NULL; pl = next) {
 		next = pl->next;
-		if (pcb_pline_is_selfint(pl)) {
+		if (rnd_pline_is_selfint(pl)) {
 			vtp0_t pls;
 			int n;
 			cnt++;
 			vtp0_init(&pls);
-			pcb_pline_split_selfint(pl, &pls);
+			rnd_pline_split_selfint(pl, &pls);
 
 
 			if (prev != NULL)
Index: trunk/src/librnd/poly/self_isc.h
===================================================================
--- trunk/src/librnd/poly/self_isc.h	(revision 31038)
+++ trunk/src/librnd/poly/self_isc.h	(revision 31039)
@@ -30,14 +30,14 @@
 #include <librnd/poly/polyarea.h>
 
 /* Returns whether a polyline is self-intersecting. O(n^2) */
-rnd_bool pcb_pline_is_selfint(rnd_pline_t *pl);
+rnd_bool rnd_pline_is_selfint(rnd_pline_t *pl);
 
 /* Assume pl is self-intersecting split it up into a list of freshly allocated
    plines in out. O(n^2) */
-void pcb_pline_split_selfint(const rnd_pline_t *pl, vtp0_t *out);
+void rnd_pline_split_selfint(const rnd_pline_t *pl, vtp0_t *out);
 
 
-rnd_cardinal_t pcb_polyarea_split_selfint(rnd_polyarea_t *pa);
+rnd_cardinal_t rnd_polyarea_split_selfint(rnd_polyarea_t *pa);
 
 
 
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 31038)
+++ trunk/src/polygon.c	(revision 31039)
@@ -266,7 +266,7 @@
 TODO("multiple plines within the returned polyarea np does not really work\n");
 #if 0
 			if (!rnd_poly_valid(np)) {
-				rnd_cardinal_t cnt = pcb_polyarea_split_selfint(np);
+				rnd_cardinal_t cnt = rnd_polyarea_split_selfint(np);
 				rnd_message(RND_MSG_ERROR, "Had to split up self-intersecting polygon into %ld parts\n", (long)cnt);
 				if (cnt > 1)
 					*need_full = rnd_true;