Index: trunk/tests/conf/Makefile
===================================================================
--- trunk/tests/conf/Makefile	(revision 32609)
+++ trunk/tests/conf/Makefile	(revision 32610)
@@ -1,5 +1,5 @@
 ROOT=../..
-include $(ROOT)/src/librnd/core/librnd.mak
+include $(ROOT)/src_3rd/librnd/core/librnd.mak
 include $(ROOT)/Makefile.conf
 
 CFLAGS = $(PCB_RND_C89FLAGS) -I../.. -I../../src_3rd -I../../src $(CFLAGS_LIBRND_FUNGW)
@@ -22,9 +22,9 @@
 	../../src/conf_internal.o
 
 DEPH = \
-	../../src/librnd/core/conf.h \
-	../../src/librnd/core/conf_hid.h \
-	../../src/librnd/core/compat_misc.h \
+	../../src_3rd/librnd/core/conf.h \
+	../../src_3rd/librnd/core/conf_hid.h \
+	../../src_3rd/librnd/core/compat_misc.h \
 	../../src/conf_core.h \
 	../../src_plugins/diag/diag_conf.h \
 
Index: trunk/tests/librnd/Makefile
===================================================================
--- trunk/tests/librnd/Makefile	(revision 32609)
+++ trunk/tests/librnd/Makefile	(revision 32610)
@@ -2,7 +2,7 @@
 LIBRND_ROOT=include/$(HL_LIBDIR)/..
 
 include $(TRUNK)/Makefile.conf
-include $(TRUNK)/src/librnd/core/librnd.mak
+include $(TRUNK)/src_3rd/librnd/core/librnd.mak
 
 CFLAGS = $(PCB_RND_C89FLAGS) $(CFLAGS_LIBRND)
 LDFLAGS = $(LDFLAGS_LIBRND)
Index: trunk/tests/pcb-printf/Makefile
===================================================================
--- trunk/tests/pcb-printf/Makefile	(revision 32609)
+++ trunk/tests/pcb-printf/Makefile	(revision 32610)
@@ -6,7 +6,8 @@
 include $(ROOT)/Makefile.conf
 
 SRC=$(TRUNK)/src
-LIBRND=$(SRC)/librnd
+SRC_3RD=$(TRUNK)/src_3rd
+LIBRND=$(SRC_3RD)/librnd
 CFLAGS_OP = -O3
 CFLAGS = $(PCB_RND_C89FLAGS) -I$(TRUNK) -I$(SRC) -I$(TRUNK)/src_3rd -I$(TRUNK)/src_3rd/liblihata
 LDLIBS = -lm
Index: trunk/tests/propedit/Makefile
===================================================================
--- trunk/tests/propedit/Makefile	(revision 32609)
+++ trunk/tests/propedit/Makefile	(revision 32610)
@@ -6,7 +6,8 @@
 PED=$(ROOT)/src_plugins/propedit
 LHT=$(ROOT)/src_3rd
 SRC=$(ROOT)/src
-LIBRND=$(SRC)/librnd
+SRC_3RD=$(ROOT)/src_3rd
+LIBRND=$(SRC_3RD)/librnd
 
 CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd
 LDLIBS = -lm
Index: trunk/tests/remote/Makefile
===================================================================
--- trunk/tests/remote/Makefile	(revision 32609)
+++ trunk/tests/remote/Makefile	(revision 32610)
@@ -3,7 +3,7 @@
 ROOT=../..
 include $(ROOT)/Makefile.conf
 REM=$(ROOT)/src_plugins/hid_remote
-CFLAGS = $(PCB_RND_C89FLAGS) -g -I$(REM) -I$(ROOT)/src -I$(ROOT)
+CFLAGS = $(PCB_RND_C89FLAGS) -g -I$(REM) -I$(ROOT)/src -I$(ROOT)/src_3rd -I$(ROOT)
 
 
 test_parse: test_parse.o
Index: trunk/tests/uniq_name/Makefile
===================================================================
--- trunk/tests/uniq_name/Makefile	(revision 32609)
+++ trunk/tests/uniq_name/Makefile	(revision 32610)
@@ -6,7 +6,8 @@
 UNM=$(ROOT)/src_plugins/io_kicad
 LHT=$(ROOT)/src_3rd
 SRC=$(ROOT)/src
-LIBRND=$(SRC)/librnd
+SRC_3RD=$(ROOT)/src_3rd
+LIBRND=$(SRC_3RD)/librnd
 CFLAGS = $(PCB_RND_C89FLAGS) -I$(UNM) -I$(LHT) -I$(SRC) -I$(ROOT)
 LDLIBS = -lm
 LIB_OBJS=$(LHT)/genht/htsp.o $(LHT)/genht/hash.o $(LIBRND)/core/compat_misc.o $(LHT)/genvector/gds_char.o