Index: trunk/src/flag.c
===================================================================
--- trunk/src/flag.c	(revision 4819)
+++ trunk/src/flag.c	(revision 4820)
@@ -78,7 +78,7 @@
 
 void EraseFlags(pcb_flag_t * f)
 {
-	unknown_flag_t *u, *next;
+	pcb_unknown_flag_t *u, *next;
 	for (u = f->unknowns; u != NULL; u = next) {
 		free(u->str);
 		next = u->next;
Index: trunk/src/flag.h
===================================================================
--- trunk/src/flag.h	(revision 4819)
+++ trunk/src/flag.h	(revision 4820)
@@ -32,10 +32,10 @@
 /* Nobody should know about the internals of this except the macros in
    macros.h that access it.  This structure must be simple-assignable
    for now.  */
-typedef struct pcb_unknown_flag_s unknown_flag_t;
+typedef struct pcb_unknown_flag_s pcb_unknown_flag_t;
 struct pcb_unknown_flag_s {
 	char *str;
-	unknown_flag_t *next;
+	pcb_unknown_flag_t *next;
 };
 
 typedef struct {
@@ -43,7 +43,7 @@
 	unsigned char t[(MAX_LAYER + 1) / 2];	/* thermals */
 	unsigned char q;							/* square geometry flag */
 	unsigned char int_conn_grp;
-	unknown_flag_t *unknowns;
+	pcb_unknown_flag_t *unknowns;
 } pcb_flag_t;
 
 extern pcb_flag_t no_flags;
Index: trunk/src/flag_str.c
===================================================================
--- trunk/src/flag_str.c	(revision 4819)
+++ trunk/src/flag_str.c	(revision 4820)
@@ -367,7 +367,7 @@
 				}
 			if (!found) {
 				const char *fmt = "Unknown flag: \"%.*s\" ignored";
-				unknown_flag_t *u;
+				pcb_unknown_flag_t *u;
 				char *msg;
 				const char *s;
 
@@ -386,12 +386,12 @@
 				sprintf(msg, fmt, flen, fp);
 				error(msg);
 
-				u = malloc(sizeof(unknown_flag_t));
+				u = malloc(sizeof(pcb_unknown_flag_t));
 				u->str = pcb_strndup(fp, flen);
 				u->next = NULL;
 				/* need to append, to keep order of flags */
 				if (rv.Flags.unknowns != NULL) {
-					unknown_flag_t *n;
+					pcb_unknown_flag_t *n;
 					for (n = rv.Flags.unknowns; n->next != NULL; n = n->next);
 					n->next = u;
 				}
@@ -427,7 +427,7 @@
 	int i;
 	FlagHolder fh, savef;
 	char *buf, *bp;
-	unknown_flag_t *u;
+	pcb_unknown_flag_t *u;
 
 	fh.Flags = flags;