Index: strflags.c
===================================================================
--- strflags.c	(revision 2508)
+++ strflags.c	(revision 2509)
@@ -50,30 +50,30 @@
 
 #define N(x) x, sizeof(x)-1
 static FlagBitsType object_flagbits[] = {
-	{PINFLAG, N("pin"), PCB_TYPEMASK_ALL},
-	{VIAFLAG, N("via"), PCB_TYPEMASK_ALL},
-	{FOUNDFLAG, N("found"), PCB_TYPEMASK_ALL},
-	{HOLEFLAG, N("hole"), PCB_TYPEMASK_PIN},
-	{RATFLAG, N("rat"), PCB_TYPE_RATLINE},
-	{PININPOLYFLAG, N("pininpoly"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
-	{CLEARPOLYFLAG, N("clearpoly"), PCB_TYPE_POLYGON},
-	{HIDENAMEFLAG, N("hidename"), PCB_TYPE_ELEMENT},
-	{DISPLAYNAMEFLAG, N("showname"), PCB_TYPE_ELEMENT},
-	{CLEARLINEFLAG, N("clearline"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_TEXT},
-	{SELECTEDFLAG, N("selected"), PCB_TYPEMASK_ALL},
-	{ONSOLDERFLAG, N("onsolder"), PCB_TYPE_ELEMENT | PCB_TYPE_PAD | PCB_TYPE_TEXT},
-	{AUTOFLAG, N("auto"), PCB_TYPEMASK_ALL},
-	{SQUAREFLAG, N("square"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
-	{RUBBERENDFLAG, N("rubberend"), PCB_TYPE_LINE | PCB_TYPE_ARC},
-	{WARNFLAG, N("warn"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
-	{USETHERMALFLAG, N("usetherm"), PCB_TYPEMASK_PIN | PCB_TYPE_LINE | PCB_TYPE_ARC},
-	{OCTAGONFLAG, N("octagon"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
-	{DRCFLAG, N("drc"), PCB_TYPEMASK_ALL},
-	{LOCKFLAG, N("lock"), PCB_TYPEMASK_ALL},
-	{EDGE2FLAG, N("edge2"), PCB_TYPEMASK_ALL},
-	{FULLPOLYFLAG, N("fullpoly"), PCB_TYPE_POLYGON},
-	{NOPASTEFLAG, N("nopaste"), PCB_TYPE_PAD},
-	{NONETLISTFLAG, N("nonetlist"), PCB_TYPEMASK_ALL}
+	{PCB_FLAG_PIN, N("pin"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_VIA, N("via"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_FOUND, N("found"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_HOLE, N("hole"), PCB_TYPEMASK_PIN},
+	{PCB_FLAG_RAT, N("rat"), PCB_TYPE_RATLINE},
+	{PCB_FLAG_PININPOLY, N("pininpoly"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
+	{PCB_FLAG_CLEARPOLY, N("clearpoly"), PCB_TYPE_POLYGON},
+	{PCB_FLAG_HIDENAME, N("hidename"), PCB_TYPE_ELEMENT},
+	{PCB_FLAG_DISPLAYNAME, N("showname"), PCB_TYPE_ELEMENT},
+	{PCB_FLAG_CLEARLINE, N("clearline"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_TEXT},
+	{PCB_FLAG_SELECTED, N("selected"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_ONSOLDER, N("onsolder"), PCB_TYPE_ELEMENT | PCB_TYPE_PAD | PCB_TYPE_TEXT},
+	{PCB_FLAG_AUTO, N("auto"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_SQUARE, N("square"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
+	{PCB_FLAG_RUBBEREND, N("rubberend"), PCB_TYPE_LINE | PCB_TYPE_ARC},
+	{PCB_FLAG_WARN, N("warn"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
+	{PCB_FLAG_USETHERMAL, N("usetherm"), PCB_TYPEMASK_PIN | PCB_TYPE_LINE | PCB_TYPE_ARC},
+	{PCB_FLAG_OCTAGON, N("octagon"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD},
+	{PCB_FLAG_DRC, N("drc"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_LOCK, N("lock"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_EDGE2, N("edge2"), PCB_TYPEMASK_ALL},
+	{PCB_FLAG_FULLPOLY, N("fullpoly"), PCB_TYPE_POLYGON},
+	{PCB_FLAG_NOPASTE, N("nopaste"), PCB_TYPE_PAD},
+	{PCB_FLAG_NONETLIST, N("nonetlist"), PCB_TYPEMASK_ALL}
 };
 #undef N
 
@@ -429,13 +429,13 @@
 #ifndef FLAG_TEST
 	switch (object_type) {
 	case PCB_TYPE_VIA:
-		CLEAR_FLAG(VIAFLAG, &fh);
+		CLEAR_FLAG(PCB_FLAG_VIA, &fh);
 		break;
 	case PCB_TYPE_RATLINE:
-		CLEAR_FLAG(RATFLAG, &fh);
+		CLEAR_FLAG(PCB_FLAG_RAT, &fh);
 		break;
 	case PCB_TYPE_PIN:
-		CLEAR_FLAG(PINFLAG, &fh);
+		CLEAR_FLAG(PCB_FLAG_PIN, &fh);
 		break;
 	}
 #endif