Index: conf/Makefile
===================================================================
--- conf/Makefile	(revision 34601)
+++ conf/Makefile	(revision 34602)
@@ -8,7 +8,7 @@
 HELPER_OBJS=conf_core.o
 LIBRND_OBJS= \
  $(ROOT)/src/librnd/plugins/diag_rnd/diag_rnd.o \
- $(ROOT)/src/librnd-hid.a $(ROOT)/src/librnd-3rd.a
+ $(ROOT)/src/librnd-hid.a $(ROOT)/src/librnd-core.a $(ROOT)/src/librnd-3rd.a
 
 DEPH = \
 	$(ROOT)/src/librnd/core/conf.h \
Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 34601)
+++ conf/conftest.c	(revision 34602)
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include <librnd/config.h>
 #include <librnd/core/hidlib.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/conf_hid.h>
 #include <librnd/core/hidlib_conf.h>
Index: librnd/Makefile
===================================================================
--- librnd/Makefile	(revision 34601)
+++ librnd/Makefile	(revision 34602)
@@ -8,7 +8,7 @@
 
 CFLAGS =  -I$(LIBRND_ROOT)/include/librnd4 -I$(LIBRND_ROOT)/include/librnd4/librnd/src_3rd $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND)
 LDFLAGS = $(LIBRND_RDYNAMIC) $(LDFLAGS_LIBRND)
-LIBRND_A = include/$(HL_LIBDIR)/librnd-font.a include/$(HL_LIBDIR)/librnd-poly.a include/$(HL_LIBDIR)/librnd-hid.a include/$(HL_LIBDIR)/librnd-3rd.a
+LIBRND_A = include/$(HL_LIBDIR)/librnd-font.a include/$(HL_LIBDIR)/librnd-poly.a include/$(HL_LIBDIR)/librnd-hid.a include/$(HL_LIBDIR)/librnd-core.a include/$(HL_LIBDIR)/librnd-3rd.a
 
 all: librnd_test librnd_includes
 
@@ -17,9 +17,10 @@
 	./librnd_includes
 
 librnd_objs: $(LIBRND_A)
-	$(SCCBX) mkdir -p obj obj/font obj/poly obj/hid obj/3rd
-	$(SCCBX) rm -f obj/font/*.o obj/poly/*.o obj/hid/*.o obj/3rd/*.o
+	$(SCCBX) mkdir -p obj obj/font obj/poly obj/hid obj/core obj/3rd
+	$(SCCBX) rm -f obj/font/*.o obj/poly/*.o obj/hid/*.o obj/core/*.o obj/3rd/*.o
 	cd obj/hid &&  ar x ../../include/$(HL_LIBDIR)/librnd-hid.a
+	cd obj/core &&  ar x ../../include/$(HL_LIBDIR)/librnd-core.a
 	cd obj/font && ar x ../../include/$(HL_LIBDIR)/librnd-font.a
 	cd obj/poly && ar x ../../include/$(HL_LIBDIR)/librnd-poly.a
 	cd obj/3rd &&  ar x ../../include/$(HL_LIBDIR)/librnd-3rd.a  
@@ -26,7 +27,7 @@
 
 
 librnd_test: librnd_test.o librnd_objs
-	$(CC) -o librnd_test librnd_test.o obj/hid/*.o obj/font/*.o obj/poly/*.o obj/3rd/*.o $(LDFLAGS)
+	$(CC) -o librnd_test librnd_test.o obj/hid/*.o obj/core/*.o obj/font/*.o obj/poly/*.o obj/3rd/*.o $(LDFLAGS)
 
 
 librnd_test.o: librnd_test.c includes
@@ -33,7 +34,7 @@
 	$(CC) $(CFLAGS) -c -o librnd_test.o librnd_test.c
 
 librnd_includes: librnd_includes.o librnd_objs
-	$(CC) -o librnd_includes librnd_includes.o  obj/hid/*.o obj/font/*.o obj/poly/*.o  obj/3rd/*.o $(LDFLAGS)
+	$(CC) -o librnd_includes librnd_includes.o  obj/hid/*.o obj/core/*.o obj/font/*.o obj/poly/*.o  obj/3rd/*.o $(LDFLAGS)
 
 librd_includes.o: librnd_includes.c includes
 
Index: librnd/inc_all.h.in
===================================================================
--- librnd/inc_all.h.in	(revision 34601)
+++ librnd/inc_all.h.in	(revision 34602)
@@ -1,4 +1,4 @@
-put /local/objs /local/librnd/HDRS_HIDLIB
+put /local/objs /local/librnd/HDRS_CORELIB
 gsub /local/objs { } {\n}
 
 foreach /local/h in /local/objs
Index: librnd/librnd_test.c
===================================================================
--- librnd/librnd_test.c	(revision 34601)
+++ librnd/librnd_test.c	(revision 34602)
@@ -1,8 +1,8 @@
 #define RND_APP_PREFIX(x)  rndtest_ ## x
 
 #include <librnd/core/unit.h>
-#include <librnd/core/hid_init.h>
-#include <librnd/core/hid.h>
+#include <librnd/hid/hid_init.h>
+#include <librnd/hid/hid.h>
 #include <librnd/core/conf.h>
 #include <librnd/core/buildin.hidlib.h>
 #include <librnd/core/compat_misc.h>
Index: rnd_printf/Makefile
===================================================================
--- rnd_printf/Makefile	(revision 34601)
+++ rnd_printf/Makefile	(revision 34602)
@@ -11,7 +11,7 @@
 CFLAGS = $(PCB_RND_C89FLAGS) -I$(TRUNK) -I$(SRC) -I$(TRUNK)/src_3rd -I$(TRUNK)/src_3rd/liblihata
 LDLIBS = -lm
 
-LIBPCB_BASE=$(SRC)/librnd-hid.a $(SRC)/librnd-3rd.a
+LIBPCB_BASE=$(SRC)/librnd-hid.a $(SRC)/librnd-core.a $(SRC)/librnd-3rd.a
 
 include $(LIBRND)/core/librnd.mak
 LDFLAGS = $(LDFLAGS_LIBRND)