Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 23168)
+++ trunk/src/board.h	(revision 23169)
@@ -51,6 +51,7 @@
 #include "layer.h"
 #include "layer_grp.h"
 #include "library.h"
+#include "netlist2.h"
 #include "attrib.h"
 #include "rats_patch.h"
 #include "font.h"
@@ -85,6 +86,8 @@
 	pcb_layer_stack_t LayerGroups;
 	vtroutestyle_t RouteStyle;
 	pcb_lib_t NetlistLib[PCB_NUM_NETLISTS];
+	pcb_netlist_t netlist[PCB_NUM_NETLISTS];
+	/* htsp_t netlist_subc[PCB_NUM_NETLISTS]; hierarchic netlists */
 	pcb_ratspatch_line_t *NetlistPatches, *NetlistPatchLast;
 	pcb_attribute_list_t Attributes;
 
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 23168)
+++ trunk/src/global_typedefs.h	(revision 23169)
@@ -37,6 +37,7 @@
 typedef struct pcb_polyarea_s pcb_polyarea_t;
 typedef struct pcb_buffer_s pcb_buffer_t;
 typedef struct pcb_net_s pcb_net_t;
+typedef struct pcb_net_term_s pcb_net_term_t;
 typedef struct pcb_oldnet_s pcb_oldnet_t;
 typedef struct pcb_connection_s pcb_connection_t;
 typedef struct pcb_box_s pcb_box_t;
Index: trunk/src/netlist2.c
===================================================================
--- trunk/src/netlist2.c	(revision 23168)
+++ trunk/src/netlist2.c	(revision 23169)
@@ -28,6 +28,13 @@
 #include <genht/htsp.h>
 #include <genht/hash.h>
 #include <ctype.h>
+
+#define TDL_DONT_UNDEF
+#include "netlist2.h"
+#include <genlist/gentdlist_impl.c>
+#undef TDL_DONT_UNDEF
+#include <genlist/gentdlist_undef.h>
+
 #include "board.h"
 #include "data.h"
 #include "compat_misc.h"
@@ -34,11 +41,6 @@
 #include "find.h"
 #include "obj_term.h"
 
-#define TDL_DONT_UNDEF
-#include "netlist2.h"
-
-#include <genlist/gentdlist_impl.c>
-
 void pcb_net_term_free_fields(pcb_net_term_t *term)
 {
 	pcb_attribute_free(&term->Attributes);
Index: trunk/src/netlist2.h
===================================================================
--- trunk/src/netlist2.h	(revision 23168)
+++ trunk/src/netlist2.h	(revision 23169)
@@ -24,6 +24,9 @@
  *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
  */
 
+#ifndef PCB_NETLIST2_H
+#define PCB_NETLIST2_H
+
 #include <genht/htsp.h>
 #include <genlist/gendlist.h>
 #include "obj_common.h"
@@ -30,9 +33,6 @@
 
 typedef htsp_t pcb_netlist_t;
 
-typedef struct pcb_net_term_s pcb_net_term_t;
-
-
 struct pcb_net_term_s {
 	PCB_ANY_OBJ_FIELDS;
 	char *refdes;
@@ -133,3 +133,5 @@
 void pcb_net_free(pcb_net_t *net);
 void pcb_net_term_free_fields(pcb_net_term_t *term);
 void pcb_net_term_free(pcb_net_term_t *term);
+
+#endif