Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 8990)
+++ trunk/src/data.h	(revision 8991)
@@ -29,6 +29,7 @@
 #ifndef	PCB_DATA_H
 #define	PCB_DATA_H
 
+#include <genht/htsp.h>
 #include "globalconst.h"
 #include "global_typedefs.h"
 #include "layer.h"
@@ -43,6 +44,7 @@
 	int LayerN;                        /* number of layers in this board */
 	pinlist_t Via;
 	elementlist_t Element;
+	htsp_t subc;                       /* refdes -> pcb_subc_t* */
 /**/
 	pcb_rtree_t *via_tree, *element_tree, *pin_tree, *pad_tree, *name_tree[3],	/* for element names */
 	 *rat_tree;
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 8990)
+++ trunk/src/layer.h	(revision 8991)
@@ -100,6 +100,7 @@
 	polylist_t Polygon;
 	arclist_t Arc;
 	pcb_rtree_t *line_tree, *text_tree, *polygon_tree, *arc_tree;
+	pcb_rtree_t *subc_tree;        /* TODO: decide whether this lists subcircuits or parts of subcircuits */
 	pcb_bool On;                   /* visible flag */
 	const char *Color;             /* color */
 	const char *SelectedColor;