Index: obj_arc.h
===================================================================
--- obj_arc.h	(revision 4756)
+++ obj_arc.h	(revision 4757)
@@ -42,7 +42,7 @@
 
 
 /*** Memory ***/
-ArcTypePtr GetArcMemory(LayerTypePtr);
+ArcTypePtr GetArcMemory(pcb_layer_t *);
 ArcType *GetElementArcMemory(ElementType *Element);
 void RemoveFreeArc(ArcType *data);
 
@@ -49,13 +49,13 @@
 /*** Utility ***/
 void SetArcBoundingBox(ArcTypePtr Arc);
 BoxTypePtr GetArcEnds(ArcTypePtr Arc);
-void ChangeArcAngles(LayerTypePtr Layer, ArcTypePtr a, Angle new_sa, Angle new_da);
-void ChangeArcRadii(LayerTypePtr Layer, ArcTypePtr a, Coord new_width, Coord new_height);
-void *RemoveArc(LayerTypePtr Layer, ArcTypePtr Arc);
-ArcType *CreateNewArcOnLayer(LayerTypePtr Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags);
+void ChangeArcAngles(pcb_layer_t *Layer, ArcTypePtr a, Angle new_sa, Angle new_da);
+void ChangeArcRadii(pcb_layer_t *Layer, ArcTypePtr a, Coord new_width, Coord new_height);
+void *RemoveArc(pcb_layer_t *Layer, ArcTypePtr Arc);
+ArcType *CreateNewArcOnLayer(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord width, Coord height, Angle sa, Angle dir, Coord Thickness, Coord Clearance, FlagType Flags);
 
 /* Add objects without creating them or making any "sanity modifications" to them */
-void pcb_add_arc_on_layer(LayerType *Layer, ArcType *Arc);
+void pcb_add_arc_on_layer(pcb_layer_t *Layer, ArcType *Arc);
 
 void RotateArcLowLevel(ArcTypePtr Arc, Coord X, Coord Y, unsigned Number);
 
@@ -72,7 +72,7 @@
 
 #define ALLARC_LOOP(top) do {		\
 	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
+	pcb_layer_t *layer = (top)->Layer;		\
 	for (l =0; l < max_copper_layer + 2; l++, layer++)		\
 	{ \
 		ARC_LOOP(layer)
@@ -79,7 +79,7 @@
 
 #define COPPERARC_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
+	pcb_layer_t *layer = (top)->Layer;		\
 	for (l =0; l < max_copper_layer; l++, layer++)		\
 	{ \
 		ARC_LOOP(layer)
@@ -86,7 +86,7 @@
 
 #define SILKARC_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
+	pcb_layer_t *layer = (top)->Layer;		\
 	layer += max_copper_layer;			\
 	for (l = 0; l < 2; l++, layer++)		\
 	{ \
@@ -94,7 +94,7 @@
 
 #define	VISIBLEARC_LOOP(top) do	{		\
 	pcb_cardinal_t		l;			\
-	LayerTypePtr	layer = (top)->Layer;		\
+	pcb_layer_t *layer = (top)->Layer;		\
 	for (l = 0; l < max_copper_layer + 2; l++, layer++)	\
 	{ \
 		if (layer->On)				\