Index: trunk/src/obj_padstack.h
===================================================================
--- trunk/src/obj_padstack.h	(revision 12218)
+++ trunk/src/obj_padstack.h	(revision 12219)
@@ -23,10 +23,27 @@
 #ifndef PCB_OBJ_PADSTACK_H
 #define PCB_OBJ_PADSTACK_H
 
+#define PCB_PADSTACK_MAX_SHAPES 31
+
+#define PCB_PADSTACK_INVALID ((pcb_cardinal_t)(-1))
+
+#include "obj_common.h"
+/* The actual padstack is just a reference to a padstack proto within the same data */
+struct pcb_padstack_s {
+	PCB_ANYOBJECTFIELDS;
+	pcb_cardinal_t proto;          /* reference to a pcb_padstack_proto_t within pcb_data_t */
+	pcb_coord_t x, y;
+	struct {
+		unsigned long used;
+		char *shape;                 /* indexed by layer ID */
+	} thermal;
+	gdl_elem_t link;               /* a padstack is in a list in pcb_data_t as a global object */
+};
+
+
 #include "obj_padstack_list.h"
 #include "layer.h"
 
-
 typedef struct pcb_padstack_poly_s {
 	unsigned int len;             /* number of points in polygon */
 	pcb_cheap_point_t *pt;        /* ordered list of points */
Index: trunk/src/obj_padstack_list.h
===================================================================
--- trunk/src/obj_padstack_list.h	(revision 12218)
+++ trunk/src/obj_padstack_list.h	(revision 12219)
@@ -23,25 +23,9 @@
 #ifndef PCB_OBJ_PADSTACK_LIST_H
 #define PCB_OBJ_PADSTACK_LIST_H
 
-#define PCB_PADSTACK_MAX_SHAPES 31
+#include "obj_padstack.h"
 
-#include "obj_common.h"
 
-#define PCB_PADSTACK_INVALID ((pcb_cardinal_t)(-1))
-
-/* The actual padstack is just a reference to a padstack proto within the same data */
-struct pcb_padstack_s {
-	PCB_ANYOBJECTFIELDS;
-	pcb_cardinal_t proto;          /* reference to a pcb_padstack_proto_t within pcb_data_t */
-	pcb_coord_t x, y;
-	struct {
-		unsigned long used;
-		char *shape;                 /* indexed by layer ID */
-	} thermal;
-	gdl_elem_t link;               /* a padstack is in a list in pcb_data_t as a global object */
-};
-
-
 /* List of padstatcks */
 #define TDL(x)      padstacklist_ ## x
 #define TDL_LIST_T  padstacklist_t