Index: read.c
===================================================================
--- read.c	(revision 30912)
+++ read.c	(revision 30913)
@@ -1251,7 +1251,7 @@
 		pcb_angle_t start_angle;
 		rnd_coord_t width, height;
 
-		width = height = pcb_distance(cx, cy, endx, endy); /* calculate radius of arc */
+		width = height = rnd_distance(cx, cy, endx, endy); /* calculate radius of arc */
 		deltax = endx - cx;
 		deltay = endy - cy;
 		if (width < 1) { /* degenerate case */
@@ -1376,7 +1376,7 @@
 	if (blind_cnt == 2) { /* change the prototype of the padstack to be blind or buried */
 		const pcb_pstk_proto_t *orig_proto;
 		pcb_pstk_proto_t *new_proto;
-		pcb_cardinal_t new_pid;
+		rnd_cardinal_t new_pid;
 		int ot1, ot2, ob1, ob2, err;
 		pcb_layergrp_id_t gtop = pcb_layergrp_get_top_copper();
 		pcb_layergrp_id_t gbot = pcb_layergrp_get_bottom_copper();
Index: write.c
===================================================================
--- write.c	(revision 30912)
+++ write.c	(revision 30913)
@@ -706,7 +706,7 @@
 	kicad_print_pstks(ctx, data, ind, dx, dy);
 }
 
-static int kicad_print_subc(wctx_t *ctx, pcb_subc_t *subc, pcb_cardinal_t ind, rnd_coord_t dx, rnd_coord_t dy, unm_t *group1)
+static int kicad_print_subc(wctx_t *ctx, pcb_subc_t *subc, rnd_cardinal_t ind, rnd_coord_t dx, rnd_coord_t dy, unm_t *group1)
 {
 	rnd_coord_t xPos, yPos, sox, soy;
 	int on_bottom;
@@ -804,7 +804,7 @@
 }
 
 
-static int kicad_print_subcs(wctx_t *ctx, pcb_data_t *Data, pcb_cardinal_t ind, rnd_coord_t dx, rnd_coord_t dy, long subc_idx)
+static int kicad_print_subcs(wctx_t *ctx, pcb_data_t *Data, rnd_cardinal_t ind, rnd_coord_t dx, rnd_coord_t dy, long subc_idx)
 {
 	gdl_iterator_t sit;
 	pcb_subc_t *subc;
@@ -837,7 +837,7 @@
 	return 0;
 }
 
-static int write_kicad_layout_via_drill_size(FILE *FP, pcb_cardinal_t indentation)
+static int write_kicad_layout_via_drill_size(FILE *FP, rnd_cardinal_t indentation)
 {
 TODO(": do not hardwire the drill size here - does kicad support only one size, or what?")
 	fprintf(FP, "%*s", indentation, "");
@@ -878,9 +878,9 @@
 }
 
 
-static int write_kicad_equipotential_netlists(FILE *FP, pcb_board_t *Layout, pcb_cardinal_t indentation)
+static int write_kicad_equipotential_netlists(FILE *FP, pcb_board_t *Layout, rnd_cardinal_t indentation)
 {
-	pcb_cardinal_t netNumber = 0;
+	rnd_cardinal_t netNumber = 0;
 	htsp_entry_t *e;
 
 	/* first we write a default netlist for the 0 net, which is for unconnected pads in pcbnew */