Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 31019)
+++ routest_dlg.c	(revision 31020)
@@ -45,7 +45,7 @@
 		pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, ctx->curr, 0);
 		if (rst->Diameter <= rst->Hole) {
 			rnd_message(RND_MSG_ERROR, "had to increase the via ring diameter - can not be smaller than the hole");
-			rst->Diameter = rst->Hole+PCB_MIL_TO_COORD(1);
+			rst->Diameter = rst->Hole+RND_MIL_TO_COORD(1);
 		}
 	}
 
Index: status.c
===================================================================
--- status.c	(revision 31019)
+++ status.c	(revision 31020)
@@ -108,8 +108,8 @@
 	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");
-		unit_mil = get_unit_struct("mil");
+		unit_mm  = rnd_get_unit_struct("mm");
+		unit_mil = rnd_get_unit_struct("mil");
 	}
 	if (rnd_conf.editor.grid_unit == unit_mm)
 		unit_inv = unit_mil;
@@ -241,7 +241,7 @@
 
 static void unit_change_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	if (rnd_conf.editor.grid_unit == get_unit_struct("mm"))
+	if (rnd_conf.editor.grid_unit == rnd_get_unit_struct("mm"))
 		rnd_actionva(&PCB->hidlib, "SetUnits", "mil", NULL);
 	else
 		rnd_actionva(&PCB->hidlib, "SetUnits", "mm", NULL);