Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 4755)
+++ trunk/src/board.h	(revision 4756)
@@ -95,7 +95,7 @@
 	  IsleArea,										/* minimum poly island to retain */
 	  ThermScale;									/* scale factor used with thermals */
 	FontType Font;
-	LayerGroupType LayerGroups;
+	pcb_layer_group_t LayerGroups;
 	vtroutestyle_t RouteStyle;
 	LibraryType NetlistLib[NUM_NETLISTS];
 	rats_patch_line_t *NetlistPatches, *NetlistPatchLast;
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4755)
+++ trunk/src/global_typedefs.h	(revision 4756)
@@ -26,7 +26,7 @@
 
 typedef struct pcb_board_s pcb_board_t;
 typedef struct pcb_data_s pcb_data_t;
-typedef struct pcb_layer_group_s  LayerGroupType, *LayerGroupTypePtr;
+typedef struct pcb_layer_group_s pcb_layer_group_t;
 typedef struct pcb_layer_s LayerType, *LayerTypePtr;
 typedef struct pcb_buffer_s BufferType, *BufferTypePtr;
 typedef struct pcb_net_s NetType, *NetTypePtr;
Index: trunk/src/layer.c
===================================================================
--- trunk/src/layer.c	(revision 4755)
+++ trunk/src/layer.c	(revision 4756)
@@ -69,7 +69,7 @@
  * parses the group definition string which is a colon separated list of
  * comma separated layer numbers (1,2,b:4,6,8,t)
  */
-int ParseGroupString(const char *s, LayerGroupTypePtr LayerGroup, int LayerN)
+int ParseGroupString(const char *s, pcb_layer_group_t *LayerGroup, int LayerN)
 {
 	int group, member, layer;
 	pcb_bool c_set = pcb_false,						/* flags for the two special layers to */
@@ -77,7 +77,7 @@
 	int groupnum[MAX_LAYER + 2];
 
 	/* clear struct */
-	memset(LayerGroup, 0, sizeof(LayerGroupType));
+	memset(LayerGroup, 0, sizeof(pcb_layer_group_t));
 
 	/* Clear assignments */
 	for (layer = 0; layer < MAX_LAYER + 2; layer++)
@@ -149,7 +149,7 @@
 
 	/* reset structure on error */
 error:
-	memset(LayerGroup, 0, sizeof(LayerGroupType));
+	memset(LayerGroup, 0, sizeof(pcb_layer_group_t));
 	return (1);
 }
 
@@ -496,7 +496,7 @@
 	return group;
 }
 
-char *LayerGroupsToString(LayerGroupTypePtr lg)
+char *LayerGroupsToString(pcb_layer_group_t *lg)
 {
 #if MAX_LAYER < 9998
 	/* Allows for layer numbers 0..9999 */
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 4755)
+++ trunk/src/layer.h	(revision 4756)
@@ -66,7 +66,7 @@
 
 /************ OLD API - new code should not use these **************/
 
-int ParseGroupString(const char *, LayerGroupTypePtr, int /* LayerN */ );
+int ParseGroupString(const char *, pcb_layer_group_t *, int /* LayerN */ );
 
 int GetLayerNumber(pcb_data_t *, LayerTypePtr);
 int GetLayerGroupNumberByPointer(LayerTypePtr);
@@ -87,7 +87,7 @@
 int MoveLayerToGroup(int layer, int group);
 
 /* Returns pointer to private buffer */
-char *LayerGroupsToString(LayerGroupTypePtr);
+char *LayerGroupsToString(pcb_layer_group_t *);
 
 #define	LAYER_ON_STACK(n)	(&PCB->Data->Layer[LayerStack[(n)]])
 #define LAYER_PTR(n)            (&PCB->Data->Layer[(n)])
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 4755)
+++ trunk/src_plugins/djopt/djopt.c	(revision 4756)
@@ -2463,7 +2463,7 @@
 static void grok_layer_groups()
 {
 	int i, j, f;
-	LayerGroupType *l = &(PCB->LayerGroups);
+	pcb_layer_group_t *l = &(PCB->LayerGroups);
 
 	solder_layer = component_layer = -1;
 	for (i = 0; i < max_copper_layer; i++) {
Index: trunk/src_plugins/hid_gtk/gui-config.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-config.c	(revision 4755)
+++ trunk/src_plugins/hid_gtk/gui-config.c	(revision 4756)
@@ -1189,7 +1189,7 @@
 
 static gint config_layer_group[MAX_LAYER + 2];
 
-static LayerGroupType layer_groups,	/* Working copy */
+static pcb_layer_group_t layer_groups,	/* Working copy */
  *lg_monitor;										/* Keep track if our working copy */
 										/* needs to be changed (new layout) */
 
@@ -1260,7 +1260,7 @@
 	/* Construct a layer group string.  Follow logic in WritePCBDataHeader(),
 	   |  but use g_string functions.
 	 */
-static gchar *make_layer_group_string(LayerGroupType * lg)
+static gchar *make_layer_group_string(pcb_layer_group_t * lg)
 {
 	GString *string;
 	gint group, entry, layer;
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 4755)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 4756)
@@ -1340,7 +1340,7 @@
 {
 	int sets[MAX_LAYER + 2][MAX_LAYER];
 	int i, j;
-	LayerGroupType *l = &(PCB->LayerGroups);
+	pcb_layer_group_t *l = &(PCB->LayerGroups);
 
 	if (!layer_groups_form)
 		return;