Index: polygon.h
===================================================================
--- polygon.h	(revision 4756)
+++ polygon.h	(revision 4757)
@@ -57,13 +57,13 @@
 pcb_cardinal_t prev_contour_point(PolygonTypePtr polygon, pcb_cardinal_t point);
 pcb_cardinal_t next_contour_point(PolygonTypePtr polygon, pcb_cardinal_t point);
 pcb_cardinal_t GetLowestDistancePolygonPoint(PolygonTypePtr, Coord, Coord);
-pcb_bool RemoveExcessPolygonPoints(LayerTypePtr, PolygonTypePtr);
+pcb_bool RemoveExcessPolygonPoints(pcb_layer_t *, PolygonTypePtr);
 void GoToPreviousPoint(void);
 void ClosePolygon(void);
 void CopyAttachedPolygonToLayer(void);
 int PolygonHoles(PolygonType * ptr, const BoxType * range, int (*callback) (PLINE *, void *user_data), void *user_data);
 int PlowsPolygon(pcb_data_t *, int, void *, void *,
-								 r_dir_t (*callback) (pcb_data_t *, LayerTypePtr, PolygonTypePtr, int, void *, void *));
+								 r_dir_t (*callback) (pcb_data_t *, pcb_layer_t *, PolygonTypePtr, int, void *, void *));
 void ComputeNoHoles(PolygonType * poly);
 POLYAREA *ContourToPoly(PLINE *);
 POLYAREA *PolygonToPoly(PolygonType *);
@@ -75,7 +75,7 @@
 POLYAREA *PinPoly(PinType * l, Coord thick, Coord clear);
 POLYAREA *BoxPolyBloated(BoxType * box, Coord radius);
 void frac_circle(PLINE *, Coord, Coord, Vector, int);
-int InitClip(pcb_data_t * d, LayerType * l, PolygonType * p);
+int InitClip(pcb_data_t * d, pcb_layer_t * l, PolygonType * p);
 void RestoreToPolygon(pcb_data_t *, int, void *, void *);
 void ClearFromPolygon(pcb_data_t *, int, void *, void *);
 
@@ -83,9 +83,9 @@
 pcb_bool IsPointInPolygonIgnoreHoles(Coord, Coord, PolygonTypePtr);
 pcb_bool IsRectangleInPolygon(Coord, Coord, Coord, Coord, PolygonTypePtr);
 pcb_bool isects(POLYAREA *, PolygonTypePtr, pcb_bool);
-pcb_bool MorphPolygon(LayerTypePtr, PolygonTypePtr);
+pcb_bool MorphPolygon(pcb_layer_t *, PolygonTypePtr);
 void NoHolesPolygonDicer(PolygonType * p, const BoxType * clip, void (*emit) (PLINE *, void *), void *user_data);
-void PolyToPolygonsOnLayer(pcb_data_t *, LayerType *, POLYAREA *, FlagType);
+void PolyToPolygonsOnLayer(pcb_data_t *, pcb_layer_t *, POLYAREA *, FlagType);
 
 void square_pin_factors(int style, double *xm, double *ym);