Index: obj_common.h
===================================================================
--- obj_common.h	(revision 30969)
+++ obj_common.h	(revision 30970)
@@ -83,8 +83,8 @@
 
 
 /* point and box type - they are so common everything depends on them */
-struct pcb_point_s {    /* a line/polygon point */
-	rnd_coord_t X, Y, X2, Y2;   /* so Point type can be cast as rnd_box_t */
+struct rnd_point_s {    /* a line/polygon point */
+	rnd_coord_t X, Y, X2, Y2;   /* so Point type can be cast as rnd_rnd_box_t */
 	long int ID;
 };
 
@@ -168,7 +168,7 @@
 pcb_flag_values_t pcb_obj_valid_flags(unsigned long int objtype);
 
 
-int pcb_obj_get_bbox_naked(int Type, void *Ptr1, void *Ptr2, void *Ptr3, rnd_box_t *res);
+int pcb_obj_get_bbox_naked(int Type, void *Ptr1, void *Ptr2, void *Ptr3, rnd_rnd_box_t *res);
 
 /* Host transformations: typically the transformations an object of a subc
    inherits from the subc */
@@ -213,13 +213,13 @@
 /* Any object that ends up in common use as pcb_any_obj_t, MUST be defined
    using this as the first fieldsusing the following macros.  */
 #define PCB_ANY_OBJ_FIELDS \
-	rnd_box_t            BoundingBox; \
+	rnd_rnd_box_t            BoundingBox; \
 	long int             ID; \
 	pcb_flag_t           Flags; \
 	pcb_objtype_t        type; \
 	pcb_parenttype_t     parent_type; \
 	pcb_parent_t         parent; \
-	rnd_box_t            bbox_naked; \
+	rnd_rnd_box_t            bbox_naked; \
 	rnd_attribute_list_t Attributes \
 
 #define PCB_ANY_PRIMITIVE_FIELDS \
@@ -237,7 +237,7 @@
 #define PCB_ANYLINEFIELDS \
 	PCB_ANY_PRIMITIVE_FIELDS; \
 	rnd_coord_t Thickness, Clearance; \
-	pcb_point_t Point1, Point2
+	rnd_point_t Point1, Point2
 
 /* All on-pcb objects (elements, lines, pads, vias, rats, etc) are
    based on this. */
@@ -276,7 +276,7 @@
 void pcb_obj_change_id(pcb_any_obj_t *o, long int new_id);
 
 /* sets the bounding box of a point */
-void pcb_set_point_bounding_box(pcb_point_t *Pnt);
+void pcb_set_point_bounding_box(rnd_point_t *Pnt);
 
 void pcb_obj_common_free(pcb_any_obj_t *o);