Index: polyhelp.c
===================================================================
--- polyhelp.c	(revision 30912)
+++ polyhelp.c	(revision 30913)
@@ -73,9 +73,9 @@
 }
 #endif
 
-pcb_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 pcb_pline_t *src, rnd_coord_t thickness, rnd_coord_t clearance, pcb_flag_t flags)
 {
-	pcb_cardinal_t cnt = 0;
+	rnd_cardinal_t cnt = 0;
 	vtp0_t tracks;
 	long i;
 
@@ -124,9 +124,9 @@
 	return pcb_pline_is_rectangle(p->Clipped->contours);
 }
 
-pcb_cardinal_t pcb_cpoly_num_corners(const pcb_poly_t *src)
+rnd_cardinal_t pcb_cpoly_num_corners(const pcb_poly_t *src)
 {
-	pcb_cardinal_t res = 0;
+	rnd_cardinal_t res = 0;
 	pcb_poly_it_t it;
 	pcb_polyarea_t *pa;
 
@@ -202,7 +202,7 @@
 	pcb_poly_it_t it;
 	pcb_polyarea_t *pa;
 	pcb_cpoly_edgetree_t *res;
-	pcb_cardinal_t alloced = pcb_cpoly_num_corners(src) * sizeof(pcb_cpoly_edge_t);
+	rnd_cardinal_t alloced = pcb_cpoly_num_corners(src) * sizeof(pcb_cpoly_edge_t);
 
 	res = malloc(sizeof(pcb_cpoly_edgetree_t) + alloced);
 
Index: polyhelp.h
===================================================================
--- polyhelp.h	(revision 30912)
+++ polyhelp.h	(revision 30913)
@@ -32,7 +32,7 @@
 /* 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 */
-pcb_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 pcb_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). */
@@ -51,7 +51,7 @@
 typedef struct {
 	pcb_rtree_t *edge_tree;
 	rnd_box_t bbox;
-	pcb_cardinal_t used, alloced;
+	rnd_cardinal_t used, alloced;
 	pcb_cpoly_edge_t edges[1];
 } pcb_cpoly_edgetree_t;