Index: act.c
===================================================================
--- act.c	(revision 30902)
+++ act.c	(revision 30903)
@@ -64,7 +64,7 @@
 			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
-				pcb_message(PCB_MSG_ERROR, "Can't zoom to selection: nothing selected\n");
+				rnd_message(PCB_MSG_ERROR, "Can't zoom to selection: nothing selected\n");
 			return 0;
 		}
 
@@ -73,7 +73,7 @@
 			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
-				pcb_message(PCB_MSG_ERROR, "Can't zoom to 'found': nothing found\n");
+				rnd_message(PCB_MSG_ERROR, "Can't zoom to 'found': nothing found\n");
 			return 0;
 		}
 	}
@@ -88,9 +88,9 @@
 {
 	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;
-	pcb_bool comp_on = pcb_false, solder_on = pcb_false;
+	rnd_bool comp_on = pcb_false, solder_on = pcb_false;
 	pcb_box_t vb;
-	pcb_coord_t x, y;
+	rnd_coord_t x, y;
 	double xcent, ycent, xoffs, yoffs;
 
 	PCB_GUI_NOGUI();
@@ -105,7 +105,7 @@
 	ycent = (double)(vb.Y1 + vb.Y2)/2.0;
 	xoffs = xcent - x;
 	yoffs = ycent - y;
-/*	pcb_trace("SwapSides: xy=%mm;%mm cent=%mm;%mm ofs=%mm;%mm\n", x, y, (pcb_coord_t)xcent, (pcb_coord_t)ycent, (pcb_coord_t)xoffs, (pcb_coord_t)yoffs);*/
+/*	pcb_trace("SwapSides: xy=%mm;%mm cent=%mm;%mm ofs=%mm;%mm\n", x, y, (rnd_coord_t)xcent, (rnd_coord_t)ycent, (rnd_coord_t)xoffs, (rnd_coord_t)yoffs);*/
 
 	if (pcb_layergrp_list(PCB, PCB_LYT_BOTTOM | PCB_LYT_COPPER, &solder_group, 1) > 0)
 		solder_on = pcb_get_layer(PCB->Data, PCB->LayerGroups.grp[solder_group].lid[0])->meta.real.vis;
@@ -164,7 +164,7 @@
 	conf_toggle_editor(show_solder_side);
 
 	if ((active_group == comp_group && comp_on && !solder_on) || (active_group == solder_group && solder_on && !comp_on)) {
-		pcb_bool new_solder_vis = conf_core.editor.show_solder_side;
+		rnd_bool new_solder_vis = conf_core.editor.show_solder_side;
 
 		if (comp_group >= 0)
 			pcb_layervis_change_group_vis(&PCB->hidlib, PCB->LayerGroups.grp[comp_group].lid[0], !new_solder_vis, !new_solder_vis);
@@ -174,7 +174,7 @@
 
 	pcb_draw_inhibit_dec();
 
-/*pcb_trace("-jump-> %mm;%mm -> %mm;%mm\n", x, y, (pcb_coord_t)(x + xoffs), (pcb_coord_t)(y + yoffs));*/
+/*pcb_trace("-jump-> %mm;%mm -> %mm;%mm\n", x, y, (rnd_coord_t)(x + xoffs), (rnd_coord_t)(y + yoffs));*/
 	pcb_gui->pan(pcb_gui, pcb_round(x + xoffs), pcb_round(y + yoffs), 0);
 	pcb_gui->set_crosshair(pcb_gui, x, y, HID_SC_PAN_VIEWPORT);
 
@@ -216,7 +216,7 @@
 		switch(ctx_sens) {
 			case CTX_OBJ_TYPE:
 				{
-					pcb_coord_t x, y;
+					rnd_coord_t x, y;
 					pcb_objtype_t type;
 					void *o1, *o2, *o3;
 					pcb_any_obj_t *o;
Index: layersel.c
===================================================================
--- layersel.c	(revision 30902)
+++ layersel.c	(revision 30903)
@@ -258,7 +258,7 @@
 
 static void layer_select(ls_layer_t *lys)
 {
-	pcb_bool *vis = NULL;
+	rnd_bool *vis = NULL;
 
 	if (lys->ly != NULL) {
 		if (lys->grp_vis) {
@@ -272,7 +272,7 @@
 		PCB->RatDraw = 0;
 	}
 	else if (lys->ml != NULL) {
-		vis = (pcb_bool *)((char *)PCB + lys->ml->vis_offs);
+		vis = (rnd_bool *)((char *)PCB + lys->ml->vis_offs);
 		*vis = 1;
 		rnd_actionva(&PCB->hidlib, "SelectLayer", lys->ml->select_name, NULL);
 	}
@@ -396,12 +396,12 @@
 static void layer_vis_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
 {
 	ls_layer_t *lys = attr->user_data;
-	pcb_bool *vis;
+	rnd_bool *vis;
 
 	if (lys->ly != NULL)
 		vis = &lys->ly->meta.real.vis;
 	else if (lys->ml != NULL)
-		vis = (pcb_bool *)((char *)PCB + lys->ml->vis_offs);
+		vis = (rnd_bool *)((char *)PCB + lys->ml->vis_offs);
 	else
 		return;
 
@@ -796,10 +796,10 @@
 
 	lys = (ls_layer_t **)ls->menu_layer.array;
 	for(ml = pcb_menu_layers; ml->name != NULL; ml++,lys++) {
-		pcb_bool *b;
+		rnd_bool *b;
 		if (*lys == NULL)
 			continue;
-		b = (pcb_bool *)((char *)PCB + ml->vis_offs);
+		b = (rnd_bool *)((char *)PCB + ml->vis_offs);
 		lys_update_vis(*lys, *b);
 	}
 
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30902)
+++ routest_dlg.c	(revision 30903)
@@ -44,7 +44,7 @@
 	{ /* can be safely removed when route style switches over to padstacks */
 		pcb_route_style_t *rst = vtroutestyle_get(&PCB->RouteStyle, ctx->curr, 0);
 		if (rst->Diameter <= rst->Hole) {
-			pcb_message(PCB_MSG_ERROR, "had to increase the via ring diameter - can not be smaller than the hole");
+			rnd_message(PCB_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);
 		}
 	}
@@ -121,7 +121,7 @@
 	pcb_hid_attr_val_t hv;
 
 	if (rst == NULL) {
-		pcb_message(PCB_MSG_ERROR, "route style does not exist");
+		rnd_message(PCB_MSG_ERROR, "route style does not exist");
 		return;
 	}
 
@@ -158,7 +158,7 @@
 
 	}
 	else {
-		pcb_message(PCB_MSG_ERROR, "Internal error: route style field does not exist");
+		rnd_message(PCB_MSG_ERROR, "Internal error: route style field does not exist");
 		return;
 	}
 
@@ -342,7 +342,7 @@
 	rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long);
 
 	if (idx >= (long)vtroutestyle_len(&PCB->RouteStyle)) {
-		pcb_message(PCB_MSG_ERROR, "Invalid route style %ld index; max value: %ld\n", idx, vtroutestyle_len(&PCB->RouteStyle)-1);
+		rnd_message(PCB_MSG_ERROR, "Invalid route style %ld index; max value: %ld\n", idx, vtroutestyle_len(&PCB->RouteStyle)-1);
 		RND_ACT_IRES(-1);
 		return 0;
 	}
@@ -350,7 +350,7 @@
 	if (idx < 0) {
 		idx = pcb_route_style_lookup(&PCB->RouteStyle, conf_core.design.line_thickness, conf_core.design.via_thickness, conf_core.design.via_drilling_hole, conf_core.design.clearance, NULL);
 		if (idx < 0) {
-			pcb_message(PCB_MSG_ERROR, "No style selected\n");
+			rnd_message(PCB_MSG_ERROR, "No style selected\n");
 			RND_ACT_IRES(-1);
 		}
 	}
Index: status.c
===================================================================
--- status.c	(revision 30902)
+++ status.c	(revision 30903)
@@ -196,9 +196,9 @@
 
 	status.buf.used = 0;
 	if (pcb_marked.status) {
-		pcb_coord_t dx = pcb_crosshair.X - pcb_marked.X;
-		pcb_coord_t dy = pcb_crosshair.Y - pcb_marked.Y;
-		pcb_coord_t r = pcb_distance(pcb_crosshair.X, pcb_crosshair.Y, pcb_marked.X, pcb_marked.Y);
+		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);
 		double a = atan2(dy, dx) * PCB_RAD_TO_DEG;
 
 		s1 = status.buf.array;
@@ -377,7 +377,7 @@
 const char pcb_acth_DescribeLocation[] = "Return a string constant (valud until the next call) containing a short description at x;y (object, net, etc.)";
 fgw_error_t pcb_act_DescribeLocation(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_coord_t x, y;
+	rnd_coord_t x, y;
 	void *ptr1, *ptr2, *ptr3;
 	pcb_any_obj_t *obj;
 	int type;