Index: tests/strflags/Makefile
===================================================================
--- tests/strflags/Makefile	(revision 5800)
+++ tests/strflags/Makefile	(revision 5801)
@@ -1,6 +1,7 @@
 TRUNK=../..
 IO=$(TRUNK)/src_plugins/io_pcb
 CFLAGS = -O3 -I$(TRUNK) -I$(TRUNK)/src -I$(IO) -I$(TRUNK)/src_3rd
+LDFLAGS = -lm
 GDS= $(TRUNK)/src_3rd/genvector/gds_char.o
 
 all: tester
Index: tests/strflags/tester.c
===================================================================
--- tests/strflags/tester.c	(revision 5800)
+++ tests/strflags/tester.c	(revision 5801)
@@ -31,8 +31,8 @@
 #include "compat_misc.h"
 
 #define FLAG_TEST
-#include "strflags.c"
-#include "flags.c"
+#include "flag_str.c"
+#include "flag.c"
 #include "compat_misc.c"
 
 static void dump_flag(pcb_flag_t * f)
@@ -44,15 +44,6 @@
 	printf("]");
 }
 
-
-int pcb_mem_any_set(unsigned char *ptr, int bytes)
-{
-	while (bytes--)
-		if (*ptr++)
-			return 1;
-	return 0;
-}
-
 int main()
 {
 	time_t now;
@@ -87,16 +78,16 @@
 
 		otype = PCB_TYPEMASK_ALL;
 		fh.Flags = empty_flags;
-		for (i = 0; i < PCB_ENTRIES(object_flagbits); i++) {
-			if (PCB_FLAG_TEST(object_flagbits[i].mask, &fh))
+		for (i = 0; i < PCB_ENTRIES(pcb_object_flagbits); i++) {
+			if (PCB_FLAG_TEST(pcb_object_flagbits[i].mask, &fh))
 				continue;
-			if ((otype & object_flagbits[i].object_types) == 0)
+			if ((otype & pcb_object_flagbits[i].object_types) == 0)
 				continue;
 			if ((random() & 4) == 0)
 				continue;
 
-			otype &= object_flagbits[i].object_types;
-			PCB_FLAG_SET(object_flagbits[i].mask, &fh);
+			otype &= pcb_object_flagbits[i].object_types;
+			PCB_FLAG_SET(pcb_object_flagbits[i].mask, &fh);
 		}
 
 		if (otype & PCB_TYPEMASK_PIN)