Index: hid_draw_helpers.c
===================================================================
--- hid_draw_helpers.c	(revision 2508)
+++ hid_draw_helpers.c	(revision 2509)
@@ -154,7 +154,7 @@
 
 	/* Draw other parts of the polygon if fullpoly flag is set */
 	/* NB: No "NoHoles" cache for these */
-	if (TEST_FLAG(FULLPOLYFLAG, poly)) {
+	if (TEST_FLAG(PCB_FLAG_FULLPOLY, poly)) {
 		PolygonType p = *poly;
 
 		for (p.Clipped = poly->Clipped->f; p.Clipped != poly->Clipped; p.Clipped = p.Clipped->f)
@@ -195,7 +195,7 @@
 	}
 	gui->set_line_cap(gc, Round_Cap);
 	gui->set_line_width(gc, 0);
-	if (TEST_FLAG(SQUAREFLAG, pad)) {
+	if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) {
 		/* slanted square pad */
 		double tx, ty, theta;
 
@@ -245,7 +245,7 @@
 		: pad->Thickness;
 
 	if (pad->Point1.X == pad->Point2.X && pad->Point1.Y == pad->Point2.Y) {
-		if (TEST_FLAG(SQUAREFLAG, pad)) {
+		if (TEST_FLAG(PCB_FLAG_SQUARE, pad)) {
 			Coord l, r, t, b;
 			l = pad->Point1.X - w / 2;
 			b = pad->Point1.Y - w / 2;
@@ -258,7 +258,7 @@
 		}
 	}
 	else {
-		gui->set_line_cap(gc, TEST_FLAG(SQUAREFLAG, pad) ? Square_Cap : Round_Cap);
+		gui->set_line_cap(gc, TEST_FLAG(PCB_FLAG_SQUARE, pad) ? Square_Cap : Round_Cap);
 		gui->set_line_width(gc, w);
 
 		gui->draw_line(gc, pad->Point1.X, pad->Point1.Y, pad->Point2.X, pad->Point2.Y);
@@ -342,7 +342,7 @@
 	Coord w = mask ? pv->Mask : pv->Thickness;
 	Coord r = w / 2;
 
-	if (TEST_FLAG(HOLEFLAG, pv)) {
+	if (TEST_FLAG(PCB_FLAG_HOLE, pv)) {
 		if (mask)
 			gui->fill_circle(bg_gc, pv->X, pv->Y, r);
 		if (drawHole) {
@@ -354,7 +354,7 @@
 		return;
 	}
 
-	if (TEST_FLAG(SQUAREFLAG, pv)) {
+	if (TEST_FLAG(PCB_FLAG_SQUARE, pv)) {
 		/* use the original code for now */
 		if ((GET_SQUARE(pv) == 0) || (GET_SQUARE(pv) == 1)) {
 			Coord l = pv->X - r;
@@ -366,7 +366,7 @@
 		else
 			draw_square_pin_poly(fg_gc, pv->X, pv->Y, w, false, GET_SQUARE(pv));
 	}
-	else if (TEST_FLAG(OCTAGONFLAG, pv))
+	else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv))
 		draw_octagon_poly(fg_gc, pv->X, pv->Y, w, false);
 	else													/* draw a round pin or via */
 		gui->fill_circle(fg_gc, pv->X, pv->Y, r);
@@ -381,7 +381,7 @@
 	Coord w = mask ? pv->Mask : pv->Thickness;
 	Coord r = w / 2;
 
-	if (TEST_FLAG(HOLEFLAG, pv)) {
+	if (TEST_FLAG(PCB_FLAG_HOLE, pv)) {
 		if (mask)
 			gui->draw_arc(fg_gc, pv->X, pv->Y, r, r, 0, 360);
 		if (drawHole) {
@@ -393,7 +393,7 @@
 		return;
 	}
 
-	if (TEST_FLAG(SQUAREFLAG, pv)) {
+	if (TEST_FLAG(PCB_FLAG_SQUARE, pv)) {
 		Coord l = pv->X - r;
 		Coord b = pv->Y - r;
 		Coord r = l + w;
@@ -407,7 +407,7 @@
 		gui->draw_line(fg_gc, r, b, l, b);
 
 	}
-	else if (TEST_FLAG(OCTAGONFLAG, pv)) {
+	else if (TEST_FLAG(PCB_FLAG_OCTAGON, pv)) {
 		draw_octagon_poly(fg_gc, pv->X, pv->Y, w, true);
 	}
 	else {												/* draw a round pin or via */