Index: trunk/src/obj_arc.h
===================================================================
--- trunk/src/obj_arc.h	(revision 16170)
+++ trunk/src/obj_arc.h	(revision 16171)
@@ -35,7 +35,7 @@
 #include "obj_common.h"
 
 struct pcb_arc_s {       /* holds information about arcs */
-	PCB_ANYOBJECTFIELDS;
+	PCB_ANY_PRIMITIVE_FIELDS;
 	pcb_coord_t Thickness, Clearance;
 	pcb_coord_t Width, Height,					/* length of axis */
 	  X, Y;												/* center coordinates */
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 16170)
+++ trunk/src/obj_common.h	(revision 16171)
@@ -139,7 +139,7 @@
 /* Any object that uses the "object flags" defined in const.h, or
    exists as an object on the pcb, MUST be defined using this as the
    first fields, either directly or through PCB_ANYLINEFIELDS.  */
-#define PCB_ANYOBJECTFIELDS \
+#define PCB_ANY_PRIMITIVE_FIELDS \
 	pcb_box_t            BoundingBox; \
 	long int             ID; \
 	pcb_flag_t           Flags; \
@@ -155,7 +155,7 @@
 
 /* Lines, pads, and rats all use this so they can be cross-cast.  */
 #define PCB_ANYLINEFIELDS \
-	PCB_ANYOBJECTFIELDS; \
+	PCB_ANY_PRIMITIVE_FIELDS; \
 	pcb_coord_t Thickness, Clearance; \
 	pcb_point_t Point1, Point2
 
@@ -162,7 +162,7 @@
 /* All on-pcb objects (elements, lines, pads, vias, rats, etc) are
    based on this. */
 struct pcb_any_obj_s {
-	PCB_ANYOBJECTFIELDS;
+	PCB_ANY_PRIMITIVE_FIELDS;
 };
 
 /* Lines, rats, pads, etc.  */
Index: trunk/src/obj_poly.h
===================================================================
--- trunk/src/obj_poly.h	(revision 16170)
+++ trunk/src/obj_poly.h	(revision 16171)
@@ -36,7 +36,7 @@
 #include "polyarea.h"
 
 struct pcb_poly_s  {           /* holds information about a polygon */
-	PCB_ANYOBJECTFIELDS;
+	PCB_ANY_PRIMITIVE_FIELDS;
 	pcb_coord_t Clearance;
 	pcb_cardinal_t PointN;       /* number of points in polygon */
 	pcb_cardinal_t PointMax;     /* max number from malloc() */
Index: trunk/src/obj_pstk.h
===================================================================
--- trunk/src/obj_pstk.h	(revision 16170)
+++ trunk/src/obj_pstk.h	(revision 16171)
@@ -34,7 +34,7 @@
 /* The actual padstack is just a reference to a padstack proto within the same data */
 struct pcb_pstk_s {
 #define thermal thermal_dont_use
-	PCB_ANYOBJECTFIELDS;
+	PCB_ANY_PRIMITIVE_FIELDS;
 #undef thermal
 	pcb_cardinal_t proto;          /* reference to a pcb_pstk_proto_t within pcb_data_t */
 	int protoi;                    /* index of the transformed proto; -1 means invalid; local cache, not saved */
Index: trunk/src/obj_subc.h
===================================================================
--- trunk/src/obj_subc.h	(revision 16170)
+++ trunk/src/obj_subc.h	(revision 16171)
@@ -42,7 +42,7 @@
 } pcb_subc_cached_t;
 
 struct pcb_subc_s {
-	PCB_ANYOBJECTFIELDS;
+	PCB_ANY_PRIMITIVE_FIELDS;
 	minuid_bin_t uid;
 	pcb_data_t *data;
 	htsp_t terminals;
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 16170)
+++ trunk/src/obj_text.h	(revision 16171)
@@ -36,7 +36,7 @@
 #include <genvector/gds_char.h>
 
 struct pcb_text_s {
-	PCB_ANYOBJECTFIELDS;
+	PCB_ANY_PRIMITIVE_FIELDS;
 	int Scale;                    /* text scaling in percent */
 	pcb_coord_t X, Y;                   /* origin */
 	pcb_uint8_t Direction;