Index: obj_poly.h
===================================================================
--- obj_poly.h	(revision 4756)
+++ obj_poly.h	(revision 4757)
@@ -48,7 +48,7 @@
 
 
 
-PolygonType *GetPolygonMemory(LayerType * layer);
+PolygonType *GetPolygonMemory(pcb_layer_t * layer);
 void RemoveFreePolygon(PolygonType * data);
 PointTypePtr GetPointMemoryInPolygon(PolygonTypePtr Polygon);
 pcb_cardinal_t *GetHoleIndexMemoryInPolygon(PolygonTypePtr Polygon);
@@ -55,11 +55,11 @@
 void FreePolygonMemory(PolygonType * polygon);
 
 void SetPolygonBoundingBox(PolygonTypePtr Polygon);
-PolygonTypePtr CreateNewPolygonFromRectangle(LayerTypePtr Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, FlagType Flags);
-PolygonTypePtr CreateNewPolygon(LayerTypePtr Layer, FlagType Flags);
+PolygonTypePtr CreateNewPolygonFromRectangle(pcb_layer_t *Layer, Coord X1, Coord Y1, Coord X2, Coord Y2, FlagType Flags);
+PolygonTypePtr CreateNewPolygon(pcb_layer_t *Layer, FlagType Flags);
 PointTypePtr CreateNewPointInPolygon(PolygonTypePtr Polygon, Coord X, Coord Y);
 PolygonType *CreateNewHoleInPolygon(PolygonType * Polygon);
-void *RemovePolygon(LayerTypePtr Layer, PolygonTypePtr Polygon);
+void *RemovePolygon(pcb_layer_t *Layer, PolygonTypePtr Polygon);
 
 void MovePolygonLowLevel(PolygonTypePtr Polygon, Coord DX, Coord DY);
 void RotatePolygonLowLevel(PolygonTypePtr Polygon, Coord X, Coord Y, unsigned Number);
@@ -66,7 +66,7 @@
 PolygonTypePtr CopyPolygonLowLevel(PolygonTypePtr Dest, PolygonTypePtr Src);
 
 /* Add objects without creating them or making any "sanity modifications" to them */
-void pcb_add_polygon_on_layer(LayerType *Layer, PolygonType *polygon);
+void pcb_add_polygon_on_layer(pcb_layer_t *Layer, PolygonType *polygon);
 
 #define POLYGON_LOOP(layer) do {                                    \
   PolygonType *polygon;                                             \
@@ -82,7 +82,7 @@
 
 #define	ALLPOLYGON_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++)	\
 	{ \
 		POLYGON_LOOP(layer)
@@ -89,7 +89,7 @@
 
 #define	COPPERPOLYGON_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++)	\
 	{ \
 		POLYGON_LOOP(layer)
@@ -96,7 +96,7 @@
 
 #define	SILKPOLYGON_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++)		\
 	{ \
@@ -104,7 +104,7 @@
 
 #define	VISIBLEPOLYGON_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)				\