Index: trunk/src/global_objs.h
===================================================================
--- trunk/src/global_objs.h	(revision 4578)
+++ trunk/src/global_objs.h	(revision 4579)
@@ -95,31 +95,6 @@
 	gdl_elem_t link;              /* a text is in a list of a layer */
 };
 
-struct pcb_rat_line_s {          /* a rat-line */
-	ANYLINEFIELDS;
-	pcb_cardinal_t group1, group2; /* the layer group each point is on */
-	gdl_elem_t link;               /* an arc is in a list on a design */
-};
-
-struct pad_st {									/* a SMD pad */
-	ANYLINEFIELDS;
-	Coord Mask;
-	char *Name, *Number;					/* 'Line' */
-	void *Element;
-	void *Spare;
-	gdl_elem_t link;              /* a pad is in a list (element) */
-};
-
-struct pin_st {
-	ANYOBJECTFIELDS;
-	Coord Thickness, Clearance, Mask, DrillingHole;
-	Coord X, Y;										/* center and diameter */
-	char *Name, *Number;
-	void *Element;
-	void *Spare;
-	gdl_elem_t link;              /* a pin is in a list (element) */
-};
-
 /* This is the extents of a Pin or Via, depending on whether it's a
    hole or not.  */
 #define PIN_SIZE(pinptr) (TEST_FLAG(PCB_FLAG_HOLE, (pinptr)) \
Index: trunk/src/hid_draw_helpers.c
===================================================================
--- trunk/src/hid_draw_helpers.c	(revision 4578)
+++ trunk/src/hid_draw_helpers.c	(revision 4579)
@@ -4,6 +4,9 @@
 #include "polygon.h"
 #include "macro.h"
 
+#include "obj_pinvia.h"
+#include "obj_pad.h"
+
 static void fill_contour(hidGC gc, PLINE * pl)
 {
 	Coord *x, *y, n, i = 0;
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 4578)
+++ trunk/src/obj_pad.c	(revision 4579)
@@ -24,7 +24,7 @@
  *
  */
 
-/* Drawing primitive: pins and vias */
+/* Drawing primitive: smd pads */
 
 #include "config.h"
 #include "global_objs.h"
Index: trunk/src/obj_pad.h
===================================================================
--- trunk/src/obj_pad.h	(revision 4578)
+++ trunk/src/obj_pad.h	(revision 4579)
@@ -24,11 +24,21 @@
  *
  */
 
-/* Drawing primitive: pins and vias */
+/* Drawing primitive: smd pads */
 
 #ifndef PCB_OBJ_PAD_H
 #define PCB_OBJ_PAD_H
 
+struct pad_st {                  /* a SMD pad */
+	ANYLINEFIELDS;
+	Coord Mask;
+	char *Name, *Number;           /* 'Line' */
+	void *Element;
+	void *Spare;
+	gdl_elem_t link;               /* a pad is in a list (element) */
+};
+
+
 PadType *GetPadMemory(ElementType * element);
 void RemoveFreePad(PadType * data);
 
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 4578)
+++ trunk/src/obj_pinvia.h	(revision 4579)
@@ -29,6 +29,17 @@
 #ifndef PCB_OBJ_PINVIA_H
 #define PCB_OBJ_PINVIA_H
 
+struct pin_st {
+	ANYOBJECTFIELDS;
+	Coord Thickness, Clearance, Mask, DrillingHole;
+	Coord X, Y;                   /* center and diameter */
+	char *Name, *Number;
+	void *Element;
+	void *Spare;
+	gdl_elem_t link;              /* a pin is in a list (element) */
+};
+
+
 PinType *GetViaMemory(DataType * data);
 void RemoveFreeVia(PinType * data);
 PinType *GetPinMemory(ElementType * element);
Index: trunk/src/obj_rat.h
===================================================================
--- trunk/src/obj_rat.h	(revision 4578)
+++ trunk/src/obj_rat.h	(revision 4579)
@@ -29,6 +29,13 @@
 #ifndef PCB_OBJ_RAT_H
 #define PCB_OBJ_RAT_H
 
+struct pcb_rat_line_s {          /* a rat-line */
+	ANYLINEFIELDS;
+	pcb_cardinal_t group1, group2; /* the layer group each point is on */
+	gdl_elem_t link;               /* an arc is in a list on a design */
+};
+
+
 RatType *GetRatMemory(DataType *data);
 void RemoveFreeRat(RatType *data);
 
Index: trunk/src/obj_rat_list.h
===================================================================
--- trunk/src/obj_rat_list.h	(revision 4578)
+++ trunk/src/obj_rat_list.h	(revision 4579)
@@ -23,6 +23,8 @@
 #ifndef PCB_OBJ_RAT_LIST_H
 #define PCB_OBJ_RAT_LIST_H
 
+#include "obj_rat.h"
+
 /* List of Rats */
 #define TDL(x)      ratlist_ ## x
 #define TDL_LIST_T  ratlist_t
Index: trunk/src/stub_mincut.c
===================================================================
--- trunk/src/stub_mincut.c	(revision 4578)
+++ trunk/src/stub_mincut.c	(revision 4579)
@@ -24,6 +24,8 @@
 #include <stdlib.h>
 #include "global_objs.h"
 #include "stub_mincut.h"
+#include "obj_pinvia.h"
+#include "obj_pad.h"
 
 static void stub_rat_proc_shorts_dummy(void)
 {