Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4966)
+++ trunk/doc-rnd/hacking/renames	(revision 4967)
@@ -580,3 +580,8 @@
 ELEMENTLINE_LOOP -> PCB_ELEMENT_LINE_LOOP
 ELEMENTPCB_ARC_LOOP -> PCB_ELEMENT_ARC_LOOP
 ELEMENT_LOOP -> PCB_ELEMENT_LOOP
+ALLLINE_LOOP -> PCB_LINE_ALL_LOOP
+COPPERLINE_LOOP -> PCB_LINE_COPPER_LOOP
+SILKLINE_LOOP -> PCB_LINE_SILK_LOOP
+VISIBLELINE_LOOP -> PCB_LINE_VISIBLE_LOOP
+LINE_LOOP -> PCB_LINE_LOOP
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4966)
+++ trunk/src/action_helper.c	(revision 4967)
@@ -267,7 +267,7 @@
 		}
 	}
 	ENDALL_LOOP;
-	ALLLINE_LOOP(PCB->Data);
+	PCB_LINE_ALL_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_WARN, line)) {
 			PCB_FLAG_CLEAR(PCB_FLAG_WARN, line);
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4966)
+++ trunk/src/buffer.c	(revision 4967)
@@ -242,7 +242,7 @@
 	END_LOOP;
 
 	/* all layer related objects */
-	ALLLINE_LOOP(Buffer->Data);
+	PCB_LINE_ALL_LOOP(Buffer->Data);
 	{
 		r_delete_entry(layer->line_tree, (pcb_box_t *) line);
 		pcb_line_rotate90(line, Buffer->X, Buffer->Y, Number);
@@ -302,7 +302,7 @@
 	END_LOOP;
 
 	/* all layer related objects */
-	ALLLINE_LOOP(Buffer->Data);
+	PCB_LINE_ALL_LOOP(Buffer->Data);
 	{
 		r_delete_entry(layer->line_tree, (pcb_box_t *) line);
 		free_rotate(&line->Point1.X, &line->Point1.Y, Buffer->X, Buffer->Y, cosa, sina);
@@ -424,7 +424,7 @@
 		via->Y = PCB_SWAP_Y(via->Y);
 	}
 	END_LOOP;
-	ALLLINE_LOOP(Buffer->Data);
+	PCB_LINE_ALL_LOOP(Buffer->Data);
 	{
 		line->Point1.X = PCB_SWAP_X(line->Point1.X);
 		line->Point1.Y = PCB_SWAP_Y(line->Point1.Y);
@@ -483,7 +483,7 @@
 		r_insert_entry(Buffer->Data->via_tree, (pcb_box_t *) via, 0);
 	}
 	END_LOOP;
-	ALLLINE_LOOP(Buffer->Data);
+	PCB_LINE_ALL_LOOP(Buffer->Data);
 	{
 		r_delete_entry(layer->line_tree, (pcb_box_t *) line);
 		line->Point1.X = PCB_SWAP_X(line->Point1.X);
@@ -638,7 +638,7 @@
 
 		if (destlayer->On) {
 			changed = changed || (!LAYER_IS_PCB_EMPTY(sourcelayer));
-			LINE_LOOP(sourcelayer);
+			PCB_LINE_LOOP(sourcelayer);
 			{
 				CopyLine(&ctx, destlayer, line);
 			}
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4966)
+++ trunk/src/crosshair.c	(revision 4967)
@@ -225,7 +225,7 @@
 									 DY + Element->BoundingBox.Y1, DX + Element->BoundingBox.X1, DY + Element->BoundingBox.Y1);
 	}
 	else {
-		PCB_ELEMENT_LINE_LOOP(Element);
+		PCB_ELEMENT_PCB_LINE_LOOP(Element);
 		{
 			gui->draw_line(Crosshair.GC, DX + line->Point1.X, DY + line->Point1.Y, DX + line->Point2.X, DY + line->Point2.Y);
 		}
@@ -288,7 +288,7 @@
 		if (PCB->Data->Layer[i].On) {
 			pcb_layer_t *layer = &Buffer->Data->Layer[i];
 
-			LINE_LOOP(layer);
+			PCB_LINE_LOOP(layer);
 			{
 /*
 				XORDrawAttachedLine(x +line->Point1.X,
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4966)
+++ trunk/src/data.c	(revision 4967)
@@ -59,7 +59,7 @@
 				if (lacb(ctx, PCB, layer, 1))
 					continue;
 			if (lcb != NULL) {
-				LINE_LOOP(layer);
+				PCB_LINE_LOOP(layer);
 				{
 					lcb(ctx, PCB, layer, line);
 				}
@@ -106,7 +106,7 @@
 					continue;
 
 			if (elcb != NULL) {
-				PCB_ELEMENT_LINE_LOOP(element);
+				PCB_ELEMENT_PCB_LINE_LOOP(element);
 				{
 					elcb(ctx, PCB, element, line);
 				}
@@ -209,7 +209,7 @@
 		END_LOOP;
 		if (layer->Name)
 			free((char*)layer->Name);
-		LINE_LOOP(layer);
+		PCB_LINE_LOOP(layer);
 		{
 			if (line->Number)
 				free(line->Number);
@@ -304,7 +304,7 @@
 		};
 	}
 	END_LOOP;
-	ALLLINE_LOOP(Data);
+	PCB_LINE_ALL_LOOP(Data);
 	{
 		box.X1 = MIN(box.X1, line->Point1.X - line->Thickness / 2);
 		box.Y1 = MIN(box.Y1, line->Point1.Y - line->Thickness / 2);
Index: trunk/src/find_clear.c
===================================================================
--- trunk/src/find_clear.c	(revision 4966)
+++ trunk/src/find_clear.c	(revision 4967)
@@ -94,7 +94,7 @@
 		}
 	}
 	END_LOOP;
-	COPPERLINE_LOOP(PCB->Data);
+	PCB_LINE_COPPER_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(flag, line)) {
 			if (AndDraw)
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 4966)
+++ trunk/src/find_drc.c	(revision 4967)
@@ -394,7 +394,7 @@
 	TheFlag = PCB_FLAG_SELECTED;
 	/* check minimum widths and polygon clearances */
 	if (!IsBad) {
-		COPPERLINE_LOOP(PCB->Data);
+		PCB_LINE_COPPER_LOOP(PCB->Data);
 		{
 			/* check line clearances in polygons */
 			PlowsPolygon(PCB->Data, PCB_TYPE_LINE, layer, line, drc_callback);
@@ -604,7 +604,7 @@
 	/* XXX - need to check text and polygons too! */
 	TheFlag = PCB_FLAG_SELECTED;
 	if (!IsBad) {
-		SILKLINE_LOOP(PCB->Data);
+		PCB_LINE_SILK_LOOP(PCB->Data);
 		{
 			if (line->Thickness < PCB->minSlk) {
 				PCB_FLAG_SET(TheFlag, line);
@@ -636,7 +636,7 @@
 		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			tmpcnt = 0;
-			PCB_ELEMENT_LINE_LOOP(element);
+			PCB_ELEMENT_PCB_LINE_LOOP(element);
 			{
 				if (line->Thickness < PCB->minSlk)
 					tmpcnt++;
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 4966)
+++ trunk/src/find_misc.c	(revision 4967)
@@ -360,7 +360,7 @@
 		}
 	}
 	END_LOOP;
-	COPPERLINE_LOOP(PCB->Data);
+	PCB_LINE_COPPER_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(TheFlag, line)) {
 			if (AndDraw)
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4966)
+++ trunk/src/obj_elem.c	(revision 4967)
@@ -180,7 +180,7 @@
 	element = elementlist_first(&Buffer->Data->Element);
 	elementlist_remove(element);
 	pcb_buffer_clear(Buffer);
-	PCB_ELEMENT_LINE_LOOP(element);
+	PCB_ELEMENT_PCB_LINE_LOOP(element);
 	{
 		pcb_line_new(&Buffer->Data->SILKLAYER,
 												 line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0, pcb_no_flags());
@@ -317,7 +317,7 @@
 		GROUP_LOOP(Buffer->Data, group);
 		{
 			char num[8];
-			LINE_LOOP(layer);
+			PCB_LINE_LOOP(layer);
 			{
 				sprintf(num, "%d", pin_n++);
 				pcb_element_pad_new(Element, line->Point1.X,
@@ -359,7 +359,7 @@
 	}
 
 	/* now add the silkscreen. NOTE: elements must have pads or pins too */
-	LINE_LOOP(&Buffer->Data->SILKLAYER);
+	PCB_LINE_LOOP(&Buffer->Data->SILKLAYER);
 	{
 		if (line->Number && !NAMEONPCB_NAME(Element))
 			NAMEONPCB_NAME(Element) = pcb_strdup(line->Number);
@@ -407,7 +407,7 @@
 	}
 	END_LOOP;
 #endif
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		free_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina);
 		free_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina);
@@ -526,7 +526,7 @@
 	if (!Dest)
 		return (Dest);
 
-	PCB_ELEMENT_LINE_LOOP(Src);
+	PCB_ELEMENT_PCB_LINE_LOOP(Src);
 	{
 		pcb_element_line_new(Dest, line->Point1.X + dx,
 													 line->Point1.Y + dy, line->Point2.X + dx, line->Point2.Y + dy, line->Thickness);
@@ -665,7 +665,7 @@
 void pcb_element_mirror(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t yoff)
 {
 	r_delete_element(Data, Element);
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		line->Point1.X = PCB_SWAP_X(line->Point1.X);
 		line->Point1.Y = PCB_SWAP_Y(line->Point1.Y) + yoff;
@@ -742,7 +742,7 @@
 	vbox = &Element->VBox;
 	box->X1 = box->Y1 = MAX_COORD;
 	box->X2 = box->Y2 = 0;
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		pcb_line_bbox(line);
 		PCB_MAKE_MIN(box->X1, line->Point1.X - (line->Thickness + 1) / 2);
@@ -995,7 +995,7 @@
 {
 	if (Data)
 		r_delete_entry(Data->element_tree, (pcb_box_t *) Element);
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		pcb_line_move(line, DX, DY);
 	}
@@ -1073,7 +1073,7 @@
 		pcb_text_rotate90(text, X, Y, Number);
 	}
 	END_LOOP;
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		pcb_line_rotate90(line, X, Y, Number);
 	}
@@ -1314,7 +1314,7 @@
 		return (NULL);
 	if (PCB->ElementOn)
 		EraseElement(Element);
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : line->Thickness + ctx->chgsize.delta;
 		if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != line->Thickness) {
@@ -1723,7 +1723,7 @@
 		gui->set_color(Output.fgGC, PCB->InvisibleObjectsColor);
 
 	/* draw lines, arcs, text and pins */
-	PCB_ELEMENT_LINE_LOOP(element);
+	PCB_ELEMENT_PCB_LINE_LOOP(element);
 	{
 		_draw_line(line);
 	}
@@ -1800,7 +1800,7 @@
 
 void EraseElement(pcb_element_t *Element)
 {
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		EraseLine(line);
 	}
@@ -1853,7 +1853,7 @@
 
 void DrawElementPackage(pcb_element_t *Element)
 {
-	PCB_ELEMENT_LINE_LOOP(Element);
+	PCB_ELEMENT_PCB_LINE_LOOP(Element);
 	{
 		DrawLine(NULL, line);
 	}
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 4966)
+++ trunk/src/obj_elem.h	(revision 4967)
@@ -139,7 +139,7 @@
 	{							\
 		textstring = (element)->Name[n].TextString
 
-#define PCB_ELEMENT_LINE_LOOP(element) do {                              \
+#define PCB_ELEMENT_PCB_LINE_LOOP(element) do {                              \
   pcb_line_t *line;                                                   \
   gdl_iterator_t __it__;                                            \
   linelist_foreach(&(element)->Line, &__it__, line) {
Index: trunk/src/obj_line.h
===================================================================
--- trunk/src/obj_line.h	(revision 4966)
+++ trunk/src/obj_line.h	(revision 4967)
@@ -79,39 +79,39 @@
 	} while(0)
 
 
-#define LINE_LOOP(layer) do {                                       \
+#define PCB_LINE_LOOP(layer) do {                                       \
   pcb_line_t *line;                                                   \
   gdl_iterator_t __it__;                                            \
   linelist_foreach(&(layer)->Line, &__it__, line) {
 
-#define	ALLLINE_LOOP(top) do	{		\
+#define PCB_LINE_ALL_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
 	pcb_layer_t *layer = (top)->Layer;		\
 	for (l = 0; l < max_copper_layer + 2; l++, layer++)	\
 	{ \
-		LINE_LOOP(layer)
+		PCB_LINE_LOOP(layer)
 
-#define	COPPERLINE_LOOP(top) do	{		\
+#define PCB_LINE_COPPER_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
 	pcb_layer_t *layer = (top)->Layer;		\
 	for (l = 0; l < max_copper_layer; l++, layer++)	\
 	{ \
-		LINE_LOOP(layer)
+		PCB_LINE_LOOP(layer)
 
-#define	SILKLINE_LOOP(top) do	{		\
+#define PCB_LINE_SILK_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
 	pcb_layer_t *layer = (top)->Layer;		\
 	layer += max_copper_layer;			\
 	for (l = 0; l < 2; l++, layer++)		\
 	{ \
-		LINE_LOOP(layer)
+		PCB_LINE_LOOP(layer)
 
-#define	VISIBLELINE_LOOP(top) do	{		\
+#define PCB_LINE_VISIBLE_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
 	pcb_layer_t *layer = (top)->Layer;		\
 	for (l = 0; l < max_copper_layer + 2; l++, layer++)	\
 	{ \
 		if (layer->On)				\
-			LINE_LOOP(layer)
+			PCB_LINE_LOOP(layer)
 
 #endif
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 4966)
+++ trunk/src/object_act.c	(revision 4967)
@@ -731,7 +731,7 @@
 	if (function) {
 		switch (pcb_funchash_get(function, NULL)) {
 		case F_All:
-			ALLLINE_LOOP(PCB->Data);
+			PCB_LINE_ALL_LOOP(PCB->Data);
 			{
 				if (PCB_FLAG_TEST(PCB_FLAG_AUTO, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
 					RemoveObject(PCB_TYPE_LINE, layer, line, line);
@@ -762,7 +762,7 @@
 			}
 			break;
 		case F_Selected:
-			VISIBLELINE_LOOP(PCB->Data);
+			PCB_LINE_VISIBLE_LOOP(PCB->Data);
 			{
 				if (PCB_FLAGS_TEST(PCB_FLAG_AUTO | PCB_FLAG_SELECTED, line)
 						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
@@ -956,7 +956,7 @@
 		}
 	}
 	END_LOOP;
-	ALLLINE_LOOP(PCB->Data);
+	PCB_LINE_ALL_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAGS_TEST(flags, line))
 			continue;
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 4966)
+++ trunk/src/rats.c	(revision 4967)
@@ -420,7 +420,7 @@
 		/* now add other possible attachment points to the subnet */
 		/* e.g. line end-points and vias */
 		/* don't add non-manhattan lines, the auto-router can't route to them */
-		ALLLINE_LOOP(PCB->Data);
+		PCB_LINE_ALL_LOOP(PCB->Data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)
 					&& ((line->Point1.X == line->Point2.X)
Index: trunk/src/rubberband.c
===================================================================
--- trunk/src/rubberband.c	(revision 4966)
+++ trunk/src/rubberband.c	(revision 4967)
@@ -368,7 +368,7 @@
 			/* the following code just stupidly compares the endpoints
 			 * of the lines
 			 */
-			LINE_LOOP(layer);
+			PCB_LINE_LOOP(layer);
 			{
 				if (PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
 					continue;
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 4966)
+++ trunk/src/search.c	(revision 4967)
@@ -1131,7 +1131,7 @@
 int SearchObjectByID(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type)
 {
 	if (type == PCB_TYPE_LINE || type == PCB_TYPE_LINE_POINT) {
-		ALLLINE_LOOP(Base);
+		PCB_LINE_ALL_LOOP(Base);
 		{
 			if (line->ID == ID) {
 				*Result1 = (void *) layer;
@@ -1243,7 +1243,7 @@
 			return (PCB_TYPE_ELEMENT);
 		}
 		if (type == PCB_TYPE_ELEMENT_LINE)
-			PCB_ELEMENT_LINE_LOOP(element);
+			PCB_ELEMENT_PCB_LINE_LOOP(element);
 		{
 			if (line->ID == ID) {
 				*Result1 = (void *) element;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 4966)
+++ trunk/src/select.c	(revision 4967)
@@ -309,7 +309,7 @@
 		else if (!(layer->On || !Flag))
 			continue;
 
-		LINE_LOOP(layer);
+		PCB_LINE_LOOP(layer);
 		{
 			if (LINE_NEAR_BOX(line, Box)
 					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)
@@ -562,7 +562,7 @@
 
 	/* check lines */
 	if (type & PCB_TYPE_LINE && F->Line)
-		VISIBLELINE_LOOP(PCB->Data);
+		PCB_LINE_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, line)) {
 			if (Reset) {
@@ -740,7 +740,7 @@
 	}
 	END_LOOP;
 
-	VISIBLELINE_LOOP(PCB->Data);
+	PCB_LINE_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line)) {
 			AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line);
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4966)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4967)
@@ -149,7 +149,7 @@
 		AddObjectToMoveUndoList(PCB_TYPE_VIA, NULL, NULL, via, dx, dy);
 	}
 	END_LOOP;
-	ALLLINE_LOOP(PCB->Data);
+	PCB_LINE_ALL_LOOP(PCB->Data);
 	{
 		MyMoveLineLowLevel(PCB->Data, layer, line, dx, dy);
 		AddObjectToMoveUndoList(PCB_TYPE_LINE, NULL, NULL, line, dx, dy);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4966)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4967)
@@ -1070,7 +1070,7 @@
 	for (i = 0; i < max_copper_layer; i++) {
 		int layergroup = GetLayerGroupNumberByNumber(i);
 		/* add all (non-rat) lines */
-		LINE_LOOP(LAYER_PTR(i));
+		PCB_LINE_LOOP(LAYER_PTR(i));
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_DRC, line)) {
 				PCB_FLAG_CLEAR(PCB_FLAG_DRC, line);
Index: trunk/src_plugins/boardflip/boardflip.c
===================================================================
--- trunk/src_plugins/boardflip/boardflip.c	(revision 4966)
+++ trunk/src_plugins/boardflip/boardflip.c	(revision 4967)
@@ -68,7 +68,7 @@
 	printf("argc %d argv %s sides %d\n", argc, argc > 0 ? argv[0] : "", sides);
 	LAYER_LOOP(PCB->Data, max_copper_layer + 2);
 	{
-		LINE_LOOP(layer);
+		PCB_LINE_LOOP(layer);
 		{
 			FLIP(line->Point1.Y);
 			FLIP(line->Point2.Y);
@@ -125,7 +125,7 @@
 			PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text);
 		}
 		END_LOOP;
-		PCB_ELEMENT_LINE_LOOP(element);
+		PCB_ELEMENT_PCB_LINE_LOOP(element);
 		{
 			FLIP(line->Point1.Y);
 			FLIP(line->Point2.Y);
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 4966)
+++ trunk/src_plugins/djopt/djopt.c	(revision 4967)
@@ -2610,7 +2610,7 @@
 	for (layn = 0; layn < max_copper_layer; layn++) {
 		pcb_layer_t *layer = LAYER_PTR(layn);
 
-		LINE_LOOP(layer);
+		PCB_LINE_LOOP(layer);
 		{
 			line_s *ls;
 
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 4966)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 4967)
@@ -264,7 +264,7 @@
 	else {
 		pcb_layer_t *layer = LAYER_PTR(i);
 		gui->set_line_width(gc, PCB_MIL_TO_COORD(10));
-		LINE_LOOP(layer);
+		PCB_LINE_LOOP(layer);
 		{
 			gui->draw_line(gc, line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y);
 		}
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 4966)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 4967)
@@ -550,7 +550,7 @@
 		if (bboard_validate_layer(PCB->Data->Layer[i].Name, GetLayerGroupNumberByNumber(i), options[HA_skipsolder].int_value)) {
 			bboard_get_layer_color(&(PCB->Data->Layer[i]), &clr_r, &clr_g, &clr_b);
 			bboard_set_color_cairo(clr_r, clr_g, clr_b);
-			LINE_LOOP(&(PCB->Data->Layer[i]));
+			PCB_LINE_LOOP(&(PCB->Data->Layer[i]));
 			{
 				bboard_draw_line_cairo(line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness);
 			}
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 4966)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 4967)
@@ -458,7 +458,7 @@
 
 	for (iter = layerlist; iter; iter = g_list_next(iter)) {
 		lay = iter->data;
-		LINE_LOOP(lay);
+		PCB_LINE_LOOP(lay);
 		{
 			pcb_fprintf(fp,
 									"        (wire (path %s %.6mm %.6mm %.6mm %.6mm %.6mm)\n",
Index: trunk/src_plugins/hid_gtk/gui-drc-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 4966)
+++ trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 4967)
@@ -135,7 +135,7 @@
 		}
 	}
 	END_LOOP;
-	COPPERLINE_LOOP(PCB->Data);
+	PCB_LINE_COPPER_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(flag, line)) {
 			AddObjectToFlagUndoList(PCB_TYPE_LINE, layer, line, line);
Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 4966)
+++ trunk/src_plugins/hid_gtk/gui-netlist-window.c	(revision 4967)
@@ -533,7 +533,7 @@
 		return;
 	netlist_find_cb(widget, data);
 
-	VISIBLELINE_LOOP(PCB->Data);
+	PCB_LINE_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
 			RemoveObject(PCB_TYPE_LINE, layer, line, line);
Index: trunk/src_plugins/hid_gtk/gui-pinout-preview.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-pinout-preview.c	(revision 4966)
+++ trunk/src_plugins/hid_gtk/gui-pinout-preview.c	(revision 4967)
@@ -88,7 +88,7 @@
 
 	pinout_set_view(pinout);
 
-	PCB_ELEMENT_LINE_LOOP(&pinout->element);
+	PCB_ELEMENT_PCB_LINE_LOOP(&pinout->element);
 	{
 		line->Thickness = 0;
 	}
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 4966)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 4967)
@@ -173,7 +173,7 @@
 {
 	nbcb_std_callback(w, nbcb_find, cbs);
 
-	VISIBLELINE_LOOP(PCB->Data);
+	PCB_LINE_VISIBLE_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line))
 			RemoveObject(PCB_TYPE_LINE, layer, line, line);
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 4966)
+++ trunk/src_plugins/jostle/jostle.c	(revision 4967)
@@ -517,7 +517,7 @@
 	fprintf(stderr, "%d, %d, %f\n", (int) x, (int) y, value);
 	info.brush = CirclePoly(x, y, value / 2);
 	info.layer = CURRENT;
-	LINE_LOOP(info.layer);
+	PCB_LINE_LOOP(info.layer);
 	{
 		PCB_FLAG_CLEAR(PCB_FLAG_DRC, line);
 	}
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 4966)
+++ trunk/src_plugins/puller/puller.c	(revision 4967)
@@ -950,11 +950,11 @@
 		fix_arc_extra(arc, e);
 	} END_LOOP;
 
-	LINE_LOOP(CURRENT); {
+	PCB_LINE_LOOP(CURRENT); {
 		new_line_extra(line);
 	} END_LOOP;
 
-	LINE_LOOP(CURRENT); {
+	PCB_LINE_LOOP(CURRENT); {
 		Extra *e = LINE2EXTRA(line);
 		if (line->Point1.X >= 0) {
 			find_pairs_1(line, &e->start.next, line->Point1.X, line->Point1.Y);
@@ -1170,7 +1170,7 @@
 	Extra *e;
 
 	clear_found();
-	LINE_LOOP(CURRENT); {
+	PCB_LINE_LOOP(CURRENT); {
 		e = LINE2EXTRA(line);
 		trace_path(e);
 	} END_LOOP;
@@ -2317,7 +2317,7 @@
 			nloops++;
 			status();
 			did_something = 0;
-			LINE_LOOP(CURRENT); {
+			PCB_LINE_LOOP(CURRENT); {
 				Extra *e = LINE2EXTRA(line);
 				if (e->deleted)
 					continue;
@@ -2352,7 +2352,7 @@
 	printf("\nlines\n");
 #endif
 
-	LINE_LOOP(CURRENT);
+	PCB_LINE_LOOP(CURRENT);
 	{
 		if (LINE2EXTRA(line)->deleted)
 			pcb_line_destroy(CURRENT, line);
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 4966)
+++ trunk/src_plugins/report/report.c	(revision 4967)
@@ -517,7 +517,7 @@
 	 */
 	pcb_lookup_conn(x, y, pcb_false, PCB->Grid, PCB_FLAG_FOUND);
 
-	ALLLINE_LOOP(PCB->Data);
+	PCB_LINE_ALL_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line)) {
 			double l;
Index: trunk/src_plugins/toporouter/toporouter.c
===================================================================
--- trunk/src_plugins/toporouter/toporouter.c	(revision 4966)
+++ trunk/src_plugins/toporouter/toporouter.c	(revision 4967)
@@ -2064,7 +2064,7 @@
 
 	GtsVertexClass *vertex_class = GTS_VERTEX_CLASS(toporouter_vertex_class());
 
-	LINE_LOOP(layer);
+	PCB_LINE_LOOP(layer);
 	{
 		xs[0] = line->Point1.X;
 		xs[1] = line->Point2.X;