Index: obj_common.h
===================================================================
--- obj_common.h	(revision 16170)
+++ 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.  */