Index: layersel.c
===================================================================
--- layersel.c	(revision 30912)
+++ layersel.c	(revision 30913)
@@ -603,7 +603,7 @@
 
 static void layersel_create_grp(layersel_ctx_t *ls, pcb_board_t *pcb, pcb_layergrp_t *g, ls_group_t *lgs, int is_open)
 {
-	pcb_cardinal_t n;
+	rnd_cardinal_t n;
 	const char *gname = g->name == NULL ? "" : g->name;
 
 	if (is_open)
@@ -647,7 +647,7 @@
 {
 	pcb_layergrp_id_t gid;
 	pcb_layergrp_t *g;
-	pcb_cardinal_t created = 0;
+	rnd_cardinal_t created = 0;
 
 	for(gid = 0, g = pcb->LayerGroups.grp; gid < pcb->LayerGroups.len; gid++,g++) {
 		ls_group_t *lgs;
@@ -668,7 +668,7 @@
 {
 	pcb_layergrp_id_t gid;
 	pcb_layergrp_t *g;
-	pcb_cardinal_t created = 0;
+	rnd_cardinal_t created = 0;
 
 	for(gid = 0, g = pcb->LayerGroups.grp; gid < pcb->LayerGroups.len; gid++,g++) {
 		ls_group_t *lgs;
@@ -782,7 +782,7 @@
 	ls_layer_t **lys = (ls_layer_t **)ls->real_layer.array;
 	ls_group_t **lgs = (ls_group_t **)ls->group.array;
 	const pcb_menu_layers_t *ml;
-	pcb_cardinal_t n;
+	rnd_cardinal_t n;
 
 	if (lys == NULL)
 		return;
Index: status.c
===================================================================
--- status.c	(revision 30912)
+++ status.c	(revision 30913)
@@ -198,7 +198,7 @@
 	if (pcb_marked.status) {
 		rnd_coord_t dx = pcb_crosshair.X - pcb_marked.X;
 		rnd_coord_t dy = pcb_crosshair.Y - pcb_marked.Y;
-		rnd_coord_t r = pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, pcb_marked.X, pcb_marked.Y);
+		rnd_coord_t r = rnd_distance(pcb_crosshair.X, pcb_crosshair.Y, pcb_marked.X, pcb_marked.Y);
 		double a = atan2(dy, dx) * PCB_RAD_TO_DEG;
 
 		s1 = status.buf.array;
Index: util.c
===================================================================
--- util.c	(revision 30912)
+++ util.c	(revision 30913)
@@ -30,11 +30,11 @@
 #include "data_it.h"
 #include "flag.h"
 
-static pcb_cardinal_t pcb_get_bbox_by_flag(rnd_box_t *dst, const pcb_data_t *data, pcb_flag_values_t flg)
+static rnd_cardinal_t pcb_get_bbox_by_flag(rnd_box_t *dst, const pcb_data_t *data, pcb_flag_values_t flg)
 {
 	pcb_any_obj_t *o;
 	pcb_data_it_t it;
-	pcb_cardinal_t cnt = 0;
+	rnd_cardinal_t cnt = 0;
 
 	dst->X1 = dst->Y1 = PCB_MAX_COORD;
 	dst->X2 = dst->Y2 = -PCB_MAX_COORD;
@@ -48,12 +48,12 @@
 	return cnt;
 }
 
-pcb_cardinal_t pcb_get_selection_bbox(rnd_box_t *dst, const pcb_data_t *data)
+rnd_cardinal_t pcb_get_selection_bbox(rnd_box_t *dst, const pcb_data_t *data)
 {
 	return pcb_get_bbox_by_flag(dst, data, PCB_FLAG_SELECTED);
 }
 
-pcb_cardinal_t pcb_get_found_bbox(rnd_box_t *dst, const pcb_data_t *data)
+rnd_cardinal_t pcb_get_found_bbox(rnd_box_t *dst, const pcb_data_t *data)
 {
 	return pcb_get_bbox_by_flag(dst, data, PCB_FLAG_FOUND);
 }
Index: util.h
===================================================================
--- util.h	(revision 30912)
+++ util.h	(revision 30913)
@@ -2,6 +2,6 @@
 
 /* calculate the bounding box of all selections/founds in data, return the number
    of selected objects. When returns 0, the dst box is infinitely large. */
-pcb_cardinal_t pcb_get_selection_bbox(rnd_box_t *dst, const pcb_data_t *data);
-pcb_cardinal_t pcb_get_found_bbox(rnd_box_t *dst, const pcb_data_t *data);
+rnd_cardinal_t pcb_get_selection_bbox(rnd_box_t *dst, const pcb_data_t *data);
+rnd_cardinal_t pcb_get_found_bbox(rnd_box_t *dst, const pcb_data_t *data);