Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/Makefile.in	(revision 29258)
@@ -1,5 +1,5 @@
 put /local/pcb/CFLAGS cc/cflags
-append /local/pcb/CFLAGS {-I../.. -I../../src_3rd -I../../src_3rd/liblihata -DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
+append /local/pcb/CFLAGS {-I../.. -I../../src_3rd -I../../src -I../../src_3rd/liblihata -DSCMDIR="\\"$(LIBDIR_INSTALLED)\\""}
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS ?/target/libs/ldl
 include {../scconfig/template/debug.tmpasm}
@@ -38,8 +38,9 @@
 
 print [@
 
+LIBRND=../../src/librnd
 FP_OBJS    = @/local/pcb/OBJS@ ../../src/plug_footprint.o
-CONF_OBJS  = ../../src/vtlibrary.o ../../src/compat_fs.o ../../src/paths.o ../../src/conf.o ../../src/conf_core.o ../../src/hid_cfg.o ../../src/hidlib_conf.o ../../src/misc_util.o ../../src/unit.o ../../src/conf_internal.o ../../src/list_conf.o ../../src/conf_hid.o ../../src/pcb-printf.o ../../src/compat_misc.o ../../src/safe_fs.o
+CONF_OBJS  = ../../src/vtlibrary.o $(LIBRND)/core/compat_fs.o $(LIBRND)/core/paths.o $(LIBRND)/core/conf.o ../../src/conf_core.o $(LIBRND)/core/hid_cfg.o $(LIBRND)/core/hidlib_conf.o $(LIBRND)/core/misc_util.o $(LIBRND)/core/unit.o ../../src/conf_internal.o $(LIBRND)/core/list_conf.o $(LIBRND)/core/conf_hid.o $(LIBRND)/core/pcb-printf.o $(LIBRND)/core/compat_misc.o $(LIBRND)/core/safe_fs.o
 FP_LDFLAGS = @/local/pcb/LDFLAGS@
 FP_CFLAGS  = @/local/pcb/CFLAGS@
 OBJS = \
Index: trunk/util/gsch2pcb-rnd/glue.c
===================================================================
--- trunk/util/gsch2pcb-rnd/glue.c	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/glue.c	(revision 29258)
@@ -19,11 +19,11 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
-#include "../src/error.h"
-#include "../src/event.h"
-#include "../src/plugins.h"
-#include "../src/hid.h"
-#include "../src/hidlib_conf.h"
+#include <librnd/core/error.h>
+#include <librnd/core/event.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/hid.h>
+#include <librnd/core/hidlib_conf.h>
 #include "gsch2pcb_rnd_conf.h"
 #include <libfungw/fungw.h>
 
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 29258)
@@ -34,18 +34,18 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "../src/plug_footprint.h"
-#include "../src/conf.h"
+#include <librnd/core/conf.h>
 #include "../src/conf_core.h"
-#include "../src/hidlib_conf.h"
+#include <librnd/core/hidlib_conf.h>
 #include "../src_3rd/qparse/qparse.h"
 #include "../config.h"
-#include "../src/error.h"
-#include "../src/plugins.h"
-#include "../src/compat_misc.h"
-#include "../src/compat_fs.h"
-#include "../src/misc_util.h"
-#include "../src/safe_fs.h"
-#include "../src/file_loaded.h"
+#include <librnd/core/error.h>
+#include <librnd/core/plugins.h>
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/misc_util.h>
+#include <librnd/core/safe_fs.h>
+#include <librnd/core/file_loaded.h>
 #include "method.h"
 #include "help.h"
 #include "gsch2pcb_rnd_conf.h"
Index: trunk/util/gsch2pcb-rnd/gsch2pcb_rnd_conf.h
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb_rnd_conf.h	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb_rnd_conf.h	(revision 29258)
@@ -1,7 +1,7 @@
 #ifndef PCB_MINCUT_CONF_H
 #define PCB_MINCUT_CONF_H
 
-#include "../src/conf.h"
+#include <librnd/core/conf.h>
 
 typedef struct {
 	const struct utils {
Index: trunk/util/gsch2pcb-rnd/method_import.c
===================================================================
--- trunk/util/gsch2pcb-rnd/method_import.c	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/method_import.c	(revision 29258)
@@ -27,11 +27,11 @@
 #include "run.h"
 #include "netlister.h"
 #include "method.h"
-#include "../src/conf.h"
+#include <librnd/core/conf.h>
 #include "../src/conf_core.h"
-#include "../src/compat_misc.h"
-#include "../src/compat_fs.h"
-#include "../src/misc_util.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/compat_fs.h>
+#include <librnd/core/misc_util.h>
 
 char *cmd_file_name;
 char *pcb_file_name;
Index: trunk/util/gsch2pcb-rnd/netlister.c
===================================================================
--- trunk/util/gsch2pcb-rnd/netlister.c	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/netlister.c	(revision 29258)
@@ -29,14 +29,14 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include "../src/plug_footprint.h"
-#include "../src/paths.h"
-#include "../src/conf.h"
+#include <librnd/core/paths.h>
+#include <librnd/core/conf.h>
 #include "../src/conf_core.h"
 #include "../config.h"
-#include "../src/compat_misc.h"
+#include <librnd/core/compat_misc.h>
 #include "gsch2pcb_rnd_conf.h"
 #include "gsch2pcb.h"
-#include "../src/misc_util.h"
+#include <librnd/core/misc_util.h>
 #include "run.h"
 
 const char *gnetlist_name(void)
Index: trunk/util/gsch2pcb-rnd/run.c
===================================================================
--- trunk/util/gsch2pcb-rnd/run.c	(revision 29257)
+++ trunk/util/gsch2pcb-rnd/run.c	(revision 29258)
@@ -25,8 +25,8 @@
 #include <ctype.h>
 #include "gsch2pcb.h"
 #include "../src_3rd/genvector/vts0.h"
-#include "../src/compat_misc.h"
-#include "../src/safe_fs.h"
+#include <librnd/core/compat_misc.h>
+#include <librnd/core/safe_fs.h>
 #include "gsch2pcb_rnd_conf.h"