Index: Makefile.in
===================================================================
--- Makefile.in	(revision 36985)
+++ Makefile.in	(revision 36986)
@@ -16,7 +16,7 @@
 
 CFLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@ @?/local/pcb/librnd_extra_inc@ $(CFLAGS_LIBRND_FUNGW)
 LDFLAGS=-lm @?/local/pcb/librnd_extra_ldf@ @/local/pcb/LDFLAGS@ $(LDFLAGS_LIBRND_FUNGW)
-LDF_LIBRND=-lrnd-hid -lrnd-3rd
+LDF_LIBRND=-lrnd-hid -lrnd-core -lrnd-3rd
 CC=@cc/cc@
 @]
 
Index: gsch2pcb.c
===================================================================
--- gsch2pcb.c	(revision 36985)
+++ gsch2pcb.c	(revision 36986)
@@ -46,7 +46,7 @@
 #include <librnd/core/misc_util.h>
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/file_loaded.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 #include "method.h"
 #include "help.h"
 #include "gsch2pcb_rnd_conf.h"
Index: method_import.c
===================================================================
--- method_import.c	(revision 36985)
+++ method_import.c	(revision 36986)
@@ -33,7 +33,7 @@
 #include <librnd/core/compat_misc.h>
 #include <librnd/core/compat_fs.h>
 #include <librnd/core/misc_util.h>
-#include <librnd/core/hid_init.h>
+#include <librnd/hid/hid_init.h>
 
 char *cmd_file_name;
 char *pcb_file_name;