Index: propedit/Makefile
===================================================================
--- propedit/Makefile	(revision 33290)
+++ propedit/Makefile	(revision 33291)
@@ -7,9 +7,9 @@
 LHT=$(ROOT)/src_3rd
 SRC=$(ROOT)/src
 SRC_3RD=$(ROOT)/src_3rd
-LIBRND=$(SRC_3RD)/librnd
+LIBRND=$(SRC_3RD)/librnd-local/src/librnd
 
-CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd
+CFLAGS = $(PCB_RND_C89FLAGS) -I$(PED) -I$(LHT) -I$(SRC) -I$(ROOT) -I$(ROOT)/src_3rd -I$(ROOT)/src_3rd/librnd-local/src
 LDLIBS = -lm
 LIB_OBJS = \
 	$(SRC)/librnd-hid.a \
Index: strflags/Makefile
===================================================================
--- strflags/Makefile	(revision 33290)
+++ strflags/Makefile	(revision 33291)
@@ -2,7 +2,7 @@
 
 TRUNK=../..
 IO=$(TRUNK)/src_plugins/io_pcb
-CFLAGS = $(PCB_RND_C89FLAGS) -O3 -I$(TRUNK) -I$(TRUNK)/src -I$(IO) -I$(TRUNK)/src_3rd
+CFLAGS = $(PCB_RND_C89FLAGS) -O3 -I$(TRUNK) -I$(TRUNK)/src -I$(IO) -I$(TRUNK)/src_3rd/librnd-local/src  -I$(TRUNK)/src_3rd
 LDLIBS = -lm
 GDS= $(TRUNK)/src_3rd/genvector/gds_char.o
 
Index: uniq_name/Makefile
===================================================================
--- uniq_name/Makefile	(revision 33290)
+++ uniq_name/Makefile	(revision 33291)
@@ -7,7 +7,7 @@
 LHT=$(ROOT)/src_3rd
 SRC=$(ROOT)/src
 SRC_3RD=$(ROOT)/src_3rd
-LIBRND=$(SRC_3RD)/librnd
+LIBRND=$(SRC_3RD)/librnd-local/src/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