Index: global_typedefs.h
===================================================================
--- global_typedefs.h	(revision 4501)
+++ global_typedefs.h	(revision 4502)
@@ -30,7 +30,10 @@
 	NUM_NETLISTS									/* so that we know how many netlists we are dealing with */
 };
 
-typedef struct pcb_st_t PCBType, *PCBTypePtr;
+typedef struct pcb_board_s PCBType, *PCBTypePtr;
+typedef struct pcb_layer_group_s  LayerGroupType, *LayerGroupTypePtr;
+typedef struct pcb_layer_s LayerType, *LayerTypePtr;
+
 typedef struct BoxType BoxType, *BoxTypePtr;
 typedef struct polygon_st PolygonType, *PolygonTypePtr;
 typedef struct pad_st PadType, *PadTypePtr;
@@ -39,11 +42,10 @@
 typedef struct rats_patch_line_s rats_patch_line_t;
 typedef struct element_st ElementType, *ElementTypePtr, **ElementTypeHandle;
 typedef struct net_st NetType, *NetTypePtr;
-typedef struct layer_st LayerType, *LayerTypePtr;
+
 typedef struct data_st  DataType, *DataTypePtr;
 typedef struct plug_io_s plug_io_t;
 
-
 typedef unsigned int pcb_cardinal_t;
 typedef unsigned char pcb_uint8_t;   /* Don't use in new code. */