Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4774)
+++ trunk/src/global_typedefs.h	(revision 4775)
@@ -40,8 +40,8 @@
 typedef struct pcb_rat_line_s pcb_rat_t;
 
 typedef struct pcb_polygon_s pcb_polygon_t;
-typedef struct pad_st pcb_pad_t;
-typedef struct pin_st pcb_pin_t;
+typedef struct pcb_pad_s pcb_pad_t;
+typedef struct pcb_pin_s pcb_pin_t;
 typedef struct pcb_rtree_s pcb_rtree_t;
 typedef struct pcb_ratspatch_line_s pcb_ratspatch_line_t;
 typedef struct pcb_element_s pcb_element_t;
Index: trunk/src/obj_pad.h
===================================================================
--- trunk/src/obj_pad.h	(revision 4774)
+++ trunk/src/obj_pad.h	(revision 4775)
@@ -31,7 +31,7 @@
 
 #include "obj_common.h"
 
-struct pad_st {                  /* a SMD pad */
+struct pcb_pad_s {                  /* a SMD pad */
 	ANYLINEFIELDS;
 	Coord Mask;
 	char *Name, *Number;           /* 'Line' */
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 4774)
+++ trunk/src/obj_pinvia.h	(revision 4775)
@@ -31,7 +31,7 @@
 
 #include "obj_common.h"
 
-struct pin_st {
+struct pcb_pin_s {
 	ANYOBJECTFIELDS;
 	Coord Thickness, Clearance, Mask, DrillingHole;
 	Coord X, Y;                   /* center and diameter */