Index: act.c
===================================================================
--- act.c	(revision 30969)
+++ act.c	(revision 30970)
@@ -60,7 +60,7 @@
 		RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str);
 
 		if (rnd_strcasecmp(vp, "selected") == 0) {
-			rnd_box_t sb;
+			rnd_rnd_box_t sb;
 			if (pcb_get_selection_bbox(&sb, PCB->Data) > 0)
 				pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
 			else
@@ -69,7 +69,7 @@
 		}
 
 		if (rnd_strcasecmp(vp, "found") == 0) {
-			rnd_box_t sb;
+			rnd_rnd_box_t sb;
 			if (pcb_get_found_bbox(&sb, PCB->Data) > 0)
 				pcb_gui->zoom_win(pcb_gui, sb.X1, sb.Y1, sb.X2, sb.Y2, 1);
 			else
@@ -89,7 +89,7 @@
 	pcb_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]);
 	pcb_layergrp_id_t comp_group = -1, solder_group = -1;
 	rnd_bool comp_on = pcb_false, solder_on = pcb_false;
-	rnd_box_t vb;
+	rnd_rnd_box_t vb;
 	rnd_coord_t x, y;
 	double xcent, ycent, xoffs, yoffs;
 
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 30969)
+++ layer_menu.c	(revision 30970)
@@ -48,7 +48,7 @@
 	int view;
 } ly_ctx_t;
 
-static void layer_install_menu1(void *ctx_, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
+static void layer_install_menu1(void *ctx_, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path)
 {
 	ly_ctx_t *ctx = ctx_;
 	int plen = strlen(path);
@@ -181,7 +181,7 @@
 }
 
 
-static void layer_install_menu_key(void *ctx_, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
+static void layer_install_menu_key(void *ctx_, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path)
 {
 	ly_ctx_t *ctx = ctx_;
 	int plen = strlen(path);
Index: routest.c
===================================================================
--- routest.c	(revision 30969)
+++ routest.c	(revision 30970)
@@ -51,7 +51,7 @@
 
 #include "routest_dlg.c"
 
-static void rst_install_menu(void *ctx, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
+static void rst_install_menu(void *ctx, rnd_hid_cfg_t *cfg, lht_node_t *node, char *path)
 {
 	pcb_menu_prop_t props;
 	char *end = path + strlen(path);
Index: status.c
===================================================================
--- status.c	(revision 30969)
+++ status.c	(revision 30970)
@@ -52,7 +52,7 @@
 	int wrdunit, wrd1[3], wrd2[2];
 	gds_t buf; /* save on allocation */
 	int lock;
-	const pcb_unit_t *last_unit;
+	const rnd_unit_t *last_unit;
 } status_ctx_t;
 
 static status_ctx_t status;
@@ -104,8 +104,8 @@
 
 static void build_st_help(void)
 {
-	static const pcb_unit_t *unit_mm = NULL, *unit_mil;
-	const pcb_unit_t *unit_inv;
+	static const rnd_unit_t *unit_mm = NULL, *unit_mil;
+	const rnd_unit_t *unit_inv;
 
 	if (unit_mm == NULL) { /* cache mm and mil units to save on the lookups */
 		unit_mm  = get_unit_struct("mm");
Index: util.c
===================================================================
--- util.c	(revision 30969)
+++ util.c	(revision 30970)
@@ -30,7 +30,7 @@
 #include "data_it.h"
 #include "flag.h"
 
-static rnd_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_rnd_box_t *dst, const pcb_data_t *data, pcb_flag_values_t flg)
 {
 	pcb_any_obj_t *o;
 	pcb_data_it_t it;
@@ -48,12 +48,12 @@
 	return cnt;
 }
 
-rnd_cardinal_t pcb_get_selection_bbox(rnd_box_t *dst, const pcb_data_t *data)
+rnd_cardinal_t pcb_get_selection_bbox(rnd_rnd_box_t *dst, const pcb_data_t *data)
 {
 	return pcb_get_bbox_by_flag(dst, data, PCB_FLAG_SELECTED);
 }
 
-rnd_cardinal_t pcb_get_found_bbox(rnd_box_t *dst, const pcb_data_t *data)
+rnd_cardinal_t pcb_get_found_bbox(rnd_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 30969)
+++ util.h	(revision 30970)
@@ -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. */
-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);
+rnd_cardinal_t pcb_get_selection_bbox(rnd_rnd_box_t *dst, const pcb_data_t *data);
+rnd_cardinal_t pcb_get_found_bbox(rnd_rnd_box_t *dst, const pcb_data_t *data);