Index: shape.c
===================================================================
--- shape.c	(revision 31010)
+++ shape.c	(revision 31011)
@@ -329,7 +329,7 @@
 	if (end != NULL) {
 		char *sx, *sy, *tmp;
 		int offs = end - dst;
-		*have_coords = pcb_true;
+		*have_coords = rnd_true;
 		a = 1;
 		
 		tmp = rnd_strdup(dst);
@@ -355,7 +355,7 @@
 	rnd_bool succ;
 
 	if (arg == NULL)
-		return pcb_false;
+		return rnd_false;
 
 	dst = arg;
 	end = strchr(dst, ';');
@@ -382,7 +382,7 @@
 	const char *args[6];
 	double rot = 0;
 	rnd_coord_t x = 0, y = 0, rx, ry = 0;
-	rnd_bool succ, have_coords = pcb_false;
+	rnd_bool succ, have_coords = rnd_false;
 	int corners = 0, a, n;
 	pcb_data_t *data;
 	char *end;
@@ -452,7 +452,7 @@
 	const char *args[8];
 	int n, a;
 	pcb_data_t *data;
-	rnd_bool succ, have_coords = pcb_false;
+	rnd_bool succ, have_coords = rnd_false;
 	rnd_coord_t x = 0, y = 0, w, h, rx, ry;
 	double rot = 0.0, roundres = 1.0;
 	char *end;
@@ -567,7 +567,7 @@
 	const char *args[6];
 	int n, a;
 	pcb_data_t *data;
-	rnd_bool succ, have_coords = pcb_false;
+	rnd_bool succ, have_coords = rnd_false;
 	rnd_coord_t x = 0, y = 0, dia;
 
 	if (argc < 2) {
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 31010)
+++ shape_dialog.c	(revision 31011)
@@ -49,11 +49,11 @@
 
 	/* elliptical logics */
 	if (!shp->dlg[shp->pell].val.lng) {
-		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_false);
+		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->pry, rnd_false);
 		RND_DAD_SET_VALUE(hid_ctx, shp->pry, crd, shp->dlg[shp->prx].val.crd);
 	}
 	else
-		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->pry, pcb_true);
+		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->pry, rnd_true);
 
 	del_obj(shp);
 	shp->obj = (pcb_any_obj_t *)regpoly_place(
@@ -71,19 +71,19 @@
 
 	/* elliptical logics */
 	if (!shp->dlg[shp->rell].val.lng) {
-		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_false);
+		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->ry, rnd_false);
 		RND_DAD_SET_VALUE(hid_ctx, shp->ry, crd, shp->dlg[shp->rx].val.crd);
 	}
 	else
-		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->ry, pcb_true);
+		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->ry, rnd_true);
 
 	/* rectangular logics */
 	if (!shp->dlg[shp->rrect].val.lng) {
-		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_false);
+		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->h, rnd_false);
 		RND_DAD_SET_VALUE(hid_ctx, shp->h, crd, shp->dlg[shp->w].val.crd);
 	}
 	else
-		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->h, pcb_true);
+		rnd_gui->attr_dlg_widget_state(hid_ctx, shp->h, rnd_true);
 
 	for(n = 0; n < 4; n++)
 		corner[n] = shp->dlg[shp->corner[n]].val.lng;
@@ -399,7 +399,7 @@
 static const char pcb_acth_shape[] = "Interactive shape generator.";
 fgw_error_t pcb_act_shape(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
-	pcb_shape_dialog(PCB, PCB_PASTEBUFFER->Data, pcb_shape_current_layer, pcb_false);
+	pcb_shape_dialog(PCB, PCB_PASTEBUFFER->Data, pcb_shape_current_layer, rnd_false);
 	RND_ACT_IRES(0);
 	return 0;
 }