Index: trunk/src/macro.h
===================================================================
--- trunk/src/macro.h	(revision 4563)
+++ trunk/src/macro.h	(revision 4564)
@@ -190,13 +190,6 @@
 	{ \
 		LINE_LOOP(layer)
 
-#define ALLARC_LOOP(top) do {		\
-	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
-	for (l =0; l < max_copper_layer + 2; l++, layer++)		\
-	{ \
-		ARC_LOOP(layer)
-
 #define	ALLPOLYGON_LOOP(top)	do {		\
 	pcb_cardinal_t		l;			\
 	LayerTypePtr	layer = (top)->Layer;		\
@@ -211,13 +204,6 @@
 	{ \
 		LINE_LOOP(layer)
 
-#define COPPERARC_LOOP(top) do	{		\
-	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
-	for (l =0; l < max_copper_layer; l++, layer++)		\
-	{ \
-		ARC_LOOP(layer)
-
 #define	COPPERPOLYGON_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
 	LayerTypePtr	layer = (top)->Layer;		\
@@ -233,14 +219,6 @@
 	{ \
 		LINE_LOOP(layer)
 
-#define SILKARC_LOOP(top) do	{		\
-	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
-	layer += max_copper_layer;			\
-	for (l = 0; l < 2; l++, layer++)		\
-	{ \
-		ARC_LOOP(layer)
-
 #define	SILKPOLYGON_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
 	LayerTypePtr	layer = (top)->Layer;		\
@@ -264,14 +242,6 @@
 		if (layer->On)				\
 			LINE_LOOP(layer)
 
-#define	VISIBLEARC_LOOP(top) do	{		\
-	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
-	for (l = 0; l < max_copper_layer + 2; l++, layer++)	\
-	{ \
-		if (layer->On)				\
-			ARC_LOOP(layer)
-
 #define	VISIBLETEXT_LOOP(board) do	{		\
 	pcb_cardinal_t		l;			\
 	LayerTypePtr	layer = (board)->Data->Layer;		\
Index: trunk/src/obj_arc.h
===================================================================
--- trunk/src/obj_arc.h	(revision 4563)
+++ trunk/src/obj_arc.h	(revision 4564)
@@ -72,3 +72,34 @@
   ArcType *arc;                                                     \
   gdl_iterator_t __it__;                                            \
   linelist_foreach(&(element)->Arc, &__it__, arc) {
+
+#define ALLARC_LOOP(top) do {		\
+	pcb_cardinal_t		l;			\
+	LayerTypePtr	layer = (top)->Layer;		\
+	for (l =0; l < max_copper_layer + 2; l++, layer++)		\
+	{ \
+		ARC_LOOP(layer)
+
+#define COPPERARC_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	LayerTypePtr	layer = (top)->Layer;		\
+	for (l =0; l < max_copper_layer; l++, layer++)		\
+	{ \
+		ARC_LOOP(layer)
+
+#define SILKARC_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	LayerTypePtr	layer = (top)->Layer;		\
+	layer += max_copper_layer;			\
+	for (l = 0; l < 2; l++, layer++)		\
+	{ \
+		ARC_LOOP(layer)
+
+#define	VISIBLEARC_LOOP(top) do	{		\
+	pcb_cardinal_t		l;			\
+	LayerTypePtr	layer = (top)->Layer;		\
+	for (l = 0; l < max_copper_layer + 2; l++, layer++)	\
+	{ \
+		if (layer->On)				\
+			ARC_LOOP(layer)
+