Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 4060)
+++ trunk/src/Makefile.dep	(revision 4061)
@@ -1381,7 +1381,7 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \
- ../src_3rd/genvector/vtp0.h list_conf.h
+ ../src_3rd/genvector/vtp0.h list_conf.h netlist.h rats_patch.h plug_io.h
 ../src_plugins/import_netlist/import_netlist.o: \
  ../src_plugins/import_netlist/import_netlist.c ../config.h global.h \
  const.h macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \
@@ -3223,7 +3223,7 @@
  ../src_3rd/liblihata/genht/ht.h ../src_3rd/genvector/vtp0.h list_conf.h \
  create.h data.h draw.h find.h misc.h mymem.h layer.h polygon.h rtree.h \
  rats.h search.h misc_util.h undo.h stub_mincut.h route_style.h \
- compat_misc.h
+ compat_misc.h netlist.h
 rats_act.o: rats_act.c ../config.h conf_core.h conf.h global.h const.h \
  macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \
  ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \
@@ -3472,7 +3472,7 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/liblihata/genht/htsp.h ../src_3rd/liblihata/genht/ht.h \
- ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h
+ ../src_3rd/genvector/vtp0.h list_conf.h compat_misc.h netlist.h
 undo_act.o: undo_act.c ../config.h conf_core.h conf.h global.h const.h \
  macro.h global_typedefs.h pcb_bool.h unit.h global_objs.h \
  ../src_3rd/genlist/gendlist.h globalconst.h polyarea.h list_common.h \
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 4060)
+++ trunk/src/rats.c	(revision 4061)
@@ -46,6 +46,7 @@
 #include "stub_mincut.h"
 #include "route_style.h"
 #include "compat_misc.h"
+#include "netlist.h"
 
 #define TRIEDFIRST 0x1
 #define BESTFOUND 0x2
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4060)
+++ trunk/src/undo.c	(revision 4061)
@@ -66,6 +66,7 @@
 #include "strflags.h"
 #include "conf_core.h"
 #include "compat_misc.h"
+#include "netlist.h"
 
 static pcb_bool between_increment_and_restore = pcb_false;
 static pcb_bool added_undo_between_increment_and_restore = pcb_false;
Index: trunk/src_plugins/import_edif/import_edif.c
===================================================================
--- trunk/src_plugins/import_edif/import_edif.c	(revision 4060)
+++ trunk/src_plugins/import_edif/import_edif.c	(revision 4061)
@@ -28,8 +28,13 @@
 #include "data.h"
 #include "plugins.h"
 #include "plug_import.h"
+#include "netlist.h"
+#include "rats_patch.h"
 
+/* for pcb_sort_library only */
+#include "plug_io.h"
 
+
 static plug_import_t import_edif;
 
 int edif_support_prio(plug_import_t *ctx, unsigned int aspects, FILE *fp, const char *filename)