Index: extedit.c
===================================================================
--- extedit.c	(revision 31010)
+++ extedit.c	(revision 31011)
@@ -92,14 +92,14 @@
 
 	/* excess callbacks */
 	if (!ctx->stay)
-		return pcb_true;
+		return rnd_true;
 
 	res = fread(tmp, 1, sizeof(tmp), ctx->fc);
 	if (res <= 0) {
 		ctx->stay = 0;
-		return pcb_false; /* also disables/removes the watch */
+		return rnd_false; /* also disables/removes the watch */
 	}
-	return pcb_true;
+	return rnd_true;
 }
 
 /* Invoke the child process, display a "progress bar" or some other indication
@@ -200,7 +200,7 @@
 	else if ((argc > 1) && (rnd_strcasecmp(cmd, "selected") == 0)) {
 		pcb_buffer_set_number(bn);
 		pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
-		pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, pcb_crosshair.X, pcb_crosshair.Y, pcb_false, pcb_false);
+		pcb_buffer_add_selected(PCB, PCB_PASTEBUFFER, pcb_crosshair.X, pcb_crosshair.Y, rnd_false, rnd_false);
 		pastex = pcb_crosshair.X;
 		pastey = pcb_crosshair.Y;
 		del_selected = 1;
@@ -309,10 +309,10 @@
 				}
 
 				if (del_selected)
-					pcb_remove_selected(pcb_true);
+					pcb_remove_selected(rnd_true);
 				if (paste) {
 					pcb_undo_save_serial();
-					pcb_buffer_copy_to_layout(PCB, pastex, pastey, pcb_false);
+					pcb_buffer_copy_to_layout(PCB, pastex, pastey, rnd_false);
 					pcb_undo_restore_serial();
 					pcb_remove_object(type, ptr1, ptr2, ptr3);
 					pcb_undo_inc_serial();
Index: extedit_dad.c
===================================================================
--- extedit_dad.c	(revision 31010)
+++ extedit_dad.c	(revision 31011)
@@ -42,7 +42,7 @@
 	RND_DAD_SET_VALUE(ee->dlg_hid_ctx, ee->wcmd, str, rnd_strdup(methods[ee->mthi].command));
 
 	/* we have only one format, so disable the combo box for selecting it */
-	rnd_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, pcb_false);
+	rnd_gui->attr_dlg_widget_state(ee->dlg_hid_ctx, ee->wfmt, rnd_false);
 }
 
 static void ee_chg_method(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
@@ -117,7 +117,7 @@
 		RND_DAD_BUTTON_CLOSES(ee.dlg, clbtn);
 	RND_DAD_END(ee.dlg);
 
-	RND_DAD_NEW("extedit", ee.dlg, "External editor", &ee, pcb_true, NULL);
+	RND_DAD_NEW("extedit", ee.dlg, "External editor", &ee, rnd_true, NULL);
 
 	ee_data2dialog(&ee);
 	res = RND_DAD_RUN(ee.dlg);