Index: pcb-printf/prcli.c
===================================================================
--- pcb-printf/prcli.c	(revision 31004)
+++ pcb-printf/prcli.c	(revision 31005)
@@ -16,7 +16,7 @@
 
 	for(n = 2; n < argc; n++) {
 		rnd_bool success;
-		double val = pcb_get_value_ex(argv[n], NULL, NULL, NULL, "", &success);
+		double val = rnd_get_value_ex(argv[n], NULL, NULL, NULL, "", &success);
 		if (!success) {
 			fprintf(stderr, "Unable to convert '%s' to rnd_coord_t\n", argv[n]);
 			return 1;
Index: strflags/tester.c
===================================================================
--- strflags/tester.c	(revision 31004)
+++ strflags/tester.c	(revision 31005)
@@ -82,7 +82,7 @@
 
 		otype = PCB_OBJ_ANY;
 		fh.Flags = empty_flags;
-		for (i = 0; i < PCB_ENTRIES(pcb_object_flagbits); i++) {
+		for (i = 0; i < RND_ENTRIES(pcb_object_flagbits); i++) {
 			if (PCB_FLAG_TEST(pcb_object_flagbits[i].mask, &fh))
 				continue;
 			if ((otype & pcb_object_flagbits[i].object_types) == 0)
@@ -122,7 +122,7 @@
 
 		otype = PCB_OBJ_ANY;
 		fh.Flags = empty_flags;
-		for (i = 0; i < PCB_ENTRIES(pcb_flagbits); i++) {
+		for (i = 0; i < RND_ENTRIES(pcb_flagbits); i++) {
 			if (PCB_FLAG_TEST(pcb_flagbits[i].mask, &fh))
 				continue;
 			if ((random() & 4) == 0)