Index: pstk_compat.c
===================================================================
--- pstk_compat.c	(revision 31010)
+++ pstk_compat.c	(revision 31011)
@@ -345,55 +345,55 @@
 
 	proto = pcb_pstk_get_proto_(ps->parent.data, ps->proto);
 	if ((proto == NULL) || (proto->tr.used < 1))
-		return pcb_false;
+		return rnd_false;
 
 	tshp = &proto->tr.array[0];
 
 	if ((tshp->len != 3) && (tshp->len != 5))
-		return pcb_false; /* allow only 3 coppers + optionally 2 masks */
+		return rnd_false; /* allow only 3 coppers + optionally 2 masks */
 
 	for(n = 0; n < tshp->len; n++) {
 		if (tshp->shape[n].shape != tshp->shape[0].shape)
-			return pcb_false; /* all shapes must be the same */
+			return rnd_false; /* all shapes must be the same */
 		if ((tshp->shape[n].layer_mask & PCB_LYT_ANYWHERE) == 0)
-			return pcb_false;
+			return rnd_false;
 		if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
 			coppern = n;
 			continue;
 		}
 		if (tshp->shape[n].layer_mask & PCB_LYT_INTERN)
-			return pcb_false; /* accept only copper as intern */
+			return rnd_false; /* accept only copper as intern */
 		if (tshp->shape[n].layer_mask & PCB_LYT_MASK) {
 			maskn = n;
 			continue;
 		}
-		return pcb_false; /* refuse anything else */
+		return rnd_false; /* refuse anything else */
 	}
 
 	/* we must have copper shapes */
 	if (coppern < 0)
-		return pcb_false;
+		return rnd_false;
 
 	if (tshp->shape[0].shape == PCB_PSSH_POLY)
 		for(n = 1; n < tshp->len; n++)
 			if (tshp->shape[n].data.poly.len != tshp->shape[0].data.poly.len)
-				return pcb_false; /* all polygons must have the same number of corners */
+				return rnd_false; /* all polygons must have the same number of corners */
 
 	for(n = 0; n < tshp->len; n++) {
 		old_shape[n] = get_old_shape(&old_dia[n], &tshp->shape[n]);
 		if (old_shape[n] == PCB_PSTK_COMPAT_INVALID)
-			return pcb_false;
+			return rnd_false;
 		if (old_shape[n] != old_shape[0])
-			return pcb_false;
+			return rnd_false;
 	}
 
 	/* all copper sizes must be the same, all mask sizes must be the same */
 	for(n = 0; n < tshp->len; n++) {
 		if ((tshp->shape[n].layer_mask & PCB_LYT_COPPER) && (RND_ABS(old_dia[n] - old_dia[coppern]) > 10))
-			return pcb_false;
+			return rnd_false;
 		if (maskn >= 0)
 			if ((tshp->shape[n].layer_mask & PCB_LYT_MASK) && (RND_ABS(old_dia[n] - old_dia[maskn]) > 10))
-				return pcb_false;
+				return rnd_false;
 	}
 
 	/* all went fine, collect and return data */
@@ -410,7 +410,7 @@
 	if (*pad_dia < *drill_dia)
 		*clearance -= (*drill_dia - *pad_dia)/2;
 
-	return pcb_true;
+	return rnd_true;
 }
 
 /* emulate the old 'square flag' pad */
@@ -535,29 +535,29 @@
 
 	proto = pcb_pstk_get_proto_(ps->parent.data, ps->proto);
 	if ((proto == NULL) || (proto->tr.used < 1))
-		return pcb_false;
+		return rnd_false;
 
 	tshp = &proto->tr.array[0];
 
 	if ((tshp->len < 2) || (tshp->len > 3))
-		return pcb_false; /* allow at most a copper, a mask and a paste */
+		return rnd_false; /* allow at most a copper, a mask and a paste */
 
 	/* determine whether we are on top or bottom */
 	side = tshp->shape[0].layer_mask & (PCB_LYT_TOP | PCB_LYT_BOTTOM);
 	if ((side == 0) || (side == (PCB_LYT_TOP | PCB_LYT_BOTTOM)))
-		return pcb_false;
+		return rnd_false;
 
 	for(n = 0; n < tshp->len; n++) {
 		if (tshp->shape[n].shape != tshp->shape[0].shape)
-			return pcb_false; /* all shapes must be the same */
+			return rnd_false; /* all shapes must be the same */
 		if ((tshp->shape[n].layer_mask & PCB_LYT_ANYWHERE) != side)
-			return pcb_false; /* all shapes must be the same side */
+			return rnd_false; /* all shapes must be the same side */
 		if (tshp->shape[n].layer_mask & PCB_LYT_COPPER) {
 			coppern = n;
 			continue;
 		}
 		if (tshp->shape[n].layer_mask & PCB_LYT_INTERN)
-			return pcb_false; /* accept only copper as intern */
+			return rnd_false; /* accept only copper as intern */
 		if (tshp->shape[n].layer_mask & PCB_LYT_MASK) {
 			maskn = n;
 			continue;
@@ -566,12 +566,12 @@
 			pasten = n;
 			continue;
 		}
-		return pcb_false; /* refuse anything else */
+		return rnd_false; /* refuse anything else */
 	}
 
 	/* require copper and mask shapes */
 	if ((coppern < 0) || (maskn < 0))
-		return pcb_false;
+		return rnd_false;
 
 	/* if the shape is poly, convert to line to make the rest of the code simpler */
 	if (tshp->shape[0].shape == PCB_PSSH_POLY) {
@@ -584,13 +584,13 @@
 				continue;
 
 			if (tshp->shape[n].data.poly.len != 4)
-				return pcb_false;
+				return rnd_false;
 
 			stepd = ps->rot / 90.0;
 			step = stepd;
 			step2 = (double)step * 90.0;
 			if (fabs(ps->rot - step2) > 0.01)
-				return pcb_false;
+				return rnd_false;
 
 			x1 = tshp->shape[n].data.poly.x[0];
 			x2 = tshp->shape[n].data.poly.x[2];
@@ -624,32 +624,32 @@
 	for(n = 1; n < tshp->len; n++) {
 		switch(tshp->shape[0].shape) {
 			case PCB_PSSH_HSHADOW:
-				return pcb_false;
+				return rnd_false;
 			case PCB_PSSH_LINE:
 				if (tshp->shape[0].data.line.x1 != tshp->shape[n].data.line.x1)
-					return pcb_false;
+					return rnd_false;
 				if (tshp->shape[0].data.line.y1 != tshp->shape[n].data.line.y1)
-					return pcb_false;
+					return rnd_false;
 				if (tshp->shape[0].data.line.x2 != tshp->shape[n].data.line.x2)
-					return pcb_false;
+					return rnd_false;
 				if (tshp->shape[0].data.line.y2 != tshp->shape[n].data.line.y2)
-					return pcb_false;
+					return rnd_false;
 				break;
 			case PCB_PSSH_CIRC:
 				if (tshp->shape[0].data.circ.x != tshp->shape[n].data.circ.x)
-					return pcb_false;
+					return rnd_false;
 				if (tshp->shape[0].data.circ.y != tshp->shape[n].data.circ.y)
-					return pcb_false;
+					return rnd_false;
 				break;
 			case PCB_PSSH_POLY:
 				if (lx1[0] != lx1[n])
-					return pcb_false;
+					return rnd_false;
 				if (ly1[0] != ly1[n])
-					return pcb_false;
+					return rnd_false;
 				if (lx2[0] != lx2[n])
-					return pcb_false;
+					return rnd_false;
 				if (ly2[0] != ly2[n])
-					return pcb_false;
+					return rnd_false;
 				break;
 		}
 	}
@@ -688,7 +688,7 @@
 	*clearance = (ps->Clearance > 0 ? ps->Clearance : tshp->shape[0].clearance) * 2;
 	*nopaste = pasten < 0;
 
-	return pcb_true;
+	return rnd_true;
 }
 
 pcb_flag_t pcb_pstk_compat_pinvia_flag(pcb_pstk_t *ps, pcb_pstk_compshape_t cshape, pcb_pstk_compat_t compat)
Index: pstk_help.c
===================================================================
--- pstk_help.c	(revision 31010)
+++ pstk_help.c	(revision 31011)
@@ -67,7 +67,7 @@
 #define NUM_LYTS (sizeof(lyts) / sizeof(lyts[0]))
 
 
-static int vect2pstk_conv_cand(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet, pcb_any_obj_t **cand, int *num_cand, rnd_coord_t cx, rnd_coord_t cy, int plated, pcb_any_obj_t *extrao)
+static int vect2pstk_conv_cand(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet, pcb_any_obj_t **cand, int *num_cand, rnd_coord_t cx, rnd_coord_t cy, int plated, pcb_any_obj_t *extrao)
 {
 	pcb_pstk_proto_t proto;
 	int l, ci, res = -1;
@@ -117,7 +117,7 @@
 	return res;
 }
 
-int pcb_pstk_vect2pstk_thr(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet)
+int pcb_pstk_vect2pstk_thr(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet)
 {
 	int l, n, plated, done = 0, ci;
 	pcb_pstk_proto_t *p;
@@ -203,7 +203,7 @@
 	return done;
 }
 
-int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet)
+int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet)
 {
 	int l, n, done = 0, ci;
 	rnd_coord_t cx, cy;
@@ -271,7 +271,7 @@
 	return done;
 }
 
-int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet)
+int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet)
 {
 	int t = pcb_pstk_vect2pstk_thr(data, objs, quiet);
 	int s = pcb_pstk_vect2pstk_smd(data, objs, quiet);
Index: pstk_help.h
===================================================================
--- pstk_help.h	(revision 31010)
+++ pstk_help.h	(revision 31011)
@@ -16,11 +16,11 @@
    placed back in objs. Quiet controls log messages. Return the number
    of padstacks created. Return -1 on error.
    WARNING: O(n^2) loops, assuming there are only a dozen of objects passed. */
-int pcb_pstk_vect2pstk_thr(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet); /* thru-hole pins only */
-int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet); /* smd pads only */
+int pcb_pstk_vect2pstk_thr(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet); /* thru-hole pins only */
+int pcb_pstk_vect2pstk_smd(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet); /* smd pads only */
 
 /* Same as above, but convert both; returns -1 only if both failed */
-int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, pcb_bool_t quiet);
+int pcb_pstk_vect2pstk(pcb_data_t *data, vtp0_t *objs, rnd_bool_t quiet);
 
 /*** shape generators ***/
 void pcb_shape_rect(pcb_pstk_shape_t *shape, rnd_coord_t width, rnd_coord_t height);
Index: subc_help.c
===================================================================
--- subc_help.c	(revision 31010)
+++ subc_help.c	(revision 31011)
@@ -29,7 +29,7 @@
 pcb_text_t *pcb_subc_add_dyntex(pcb_subc_t *sc, rnd_coord_t x, rnd_coord_t y, unsigned direction, int scale, rnd_bool bottom, const char *pattern)
 {
 	pcb_layer_type_t side = bottom ? PCB_LYT_BOTTOM : PCB_LYT_TOP;
-	pcb_layer_t *ly = pcb_subc_get_layer(sc, side | PCB_LYT_SILK, 0, pcb_true, "top-silk", pcb_false);
+	pcb_layer_t *ly = pcb_subc_get_layer(sc, side | PCB_LYT_SILK, 0, rnd_true, "top-silk", rnd_false);
 	if (ly != NULL)
 		return pcb_text_new(ly, pcb_font(PCB, 0, 0), x, y, 90.0 * direction, scale, 0, pattern, pcb_flag_make(PCB_FLAG_DYNTEXT | PCB_FLAG_FLOATER | (bottom ? PCB_FLAG_ONSOLDER : 0)));
 	return 0;