Index: act.c
===================================================================
--- act.c	(revision 31010)
+++ act.c	(revision 31011)
@@ -88,7 +88,7 @@
 {
 	rnd_layergrp_id_t active_group = pcb_layer_get_group(PCB, pcb_layer_stack[0]);
 	rnd_layergrp_id_t comp_group = -1, solder_group = -1;
-	rnd_bool comp_on = pcb_false, solder_on = pcb_false;
+	rnd_bool comp_on = rnd_false, solder_on = rnd_false;
 	rnd_rnd_box_t vb;
 	rnd_coord_t x, y;
 	double xcent, ycent, xoffs, yoffs;
Index: layersel.c
===================================================================
--- layersel.c	(revision 31010)
+++ layersel.c	(revision 31011)
@@ -248,7 +248,7 @@
 	ls->lock_vis--;
 }
 
-static void lys_update_vis(ls_layer_t *lys, pcb_bool_t vis)
+static void lys_update_vis(ls_layer_t *lys, rnd_bool_t vis)
 {
 	rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_open, !vis);
 	rnd_gui->attr_dlg_widget_hide(lys->ls->sub.dlg_hid_ctx, lys->wvis_on_closed, !vis);
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 31010)
+++ routest_dlg.c	(revision 31011)
@@ -187,7 +187,7 @@
 		RND_DAD_BUTTON_CLOSES(dlg, clbtn);
 	RND_DAD_END(dlg);
 
-	RND_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, pcb_true, NULL);
+	RND_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, rnd_true, NULL);
 	res = RND_DAD_RUN(dlg);
 	if (res == 0) {
 		*key = rnd_strdup(dlg[wkey].val.str);
@@ -322,7 +322,7 @@
 	/* set up the context */
 	rstdlg_ctx.active = 1;
 
-	RND_DAD_NEW("route_style", rstdlg_ctx.dlg, "Edit route style", &rstdlg_ctx, pcb_false, rstdlg_close_cb);
+	RND_DAD_NEW("route_style", rstdlg_ctx.dlg, "Edit route style", &rstdlg_ctx, rnd_false, rstdlg_close_cb);
 
 	rstdlg_pcb2dlg(rst_idx);
 	return 0;