Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 23171)
+++ trunk/src/board.c	(revision 23172)
@@ -40,8 +40,8 @@
 #include "safe_fs.h"
 #include "tool.h"
 #include "layer.h"
+#include "netlist2.h"
 
-
 pcb_board_t *PCB;
 
 void pcb_board_free(pcb_board_t * pcb)
Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 23171)
+++ trunk/src/board.h	(revision 23172)
@@ -45,6 +45,7 @@
 #include <stdarg.h>
 #include <math.h>
 #include <ctype.h>
+#include <genht/htsp.h>
 
 #include "global_typedefs.h"
 #include "vtroutestyle.h"
@@ -51,11 +52,12 @@
 #include "layer.h"
 #include "layer_grp.h"
 #include "library.h"
-#include "netlist2.h"
 #include "attrib.h"
 #include "rats_patch.h"
 #include "font.h"
 
+typedef htsp_t pcb_netlist_t;
+
 	/* The pcb_board_t struct holds information about board layout most of which is
 	   |  saved with the layout.  A new PCB layout struct is first initialized
 	   |  with values from the user configurable Settings struct and then reset
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 23171)
+++ trunk/src/file_act.c	(revision 23172)
@@ -52,7 +52,9 @@
 #include "layer_vis.h"
 #include "safe_fs.h"
 #include "tool.h"
+#include "netlist2.h"
 
+
 static const char pcb_acts_LoadFrom[] = "LoadFrom(Layout|LayoutToBuffer|SubcToBuffer|Netlist|Revert,filename[,format])";
 static const char pcb_acth_LoadFrom[] = "Load layout data from a file.";
 /* DOC: loadfrom.html */
Index: trunk/src/netlist2.c
===================================================================
--- trunk/src/netlist2.c	(revision 23171)
+++ trunk/src/netlist2.c	(revision 23172)
@@ -29,12 +29,6 @@
 #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"
@@ -41,6 +35,10 @@
 #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 23171)
+++ trunk/src/netlist2.h	(revision 23172)
@@ -29,10 +29,9 @@
 
 #include <genht/htsp.h>
 #include <genlist/gendlist.h>
+#include "board.h"
 #include "obj_common.h"
 
-typedef htsp_t pcb_netlist_t;
-
 struct pcb_net_term_s {
 	PCB_ANY_OBJ_FIELDS;
 	char *refdes;