diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index a94d3fc98..3dae135c3 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -11,7 +11,7 @@ CC = @CC@
 AR = ar
 LN_S = @LN_S@
 RANLIB = @RANLIB@
-DEFS = @DEFS@
+DEFS = @DEFS@ -DROKEN_RENAME
 CFLAGS = @CFLAGS@
 
 INSTALL = @INSTALL@
@@ -37,7 +37,11 @@ install_symlink_command = @install_symlink_command@
 
 SOURCES = edit_compat.c editline.c complete.c sysunix.c
 
-OBJECTS = @editline_OBJS@
+EXTRA_SOURCES = strdup.c 
+EXTRA_OBJECTS = strdup.o
+
+OBJECTS = @editline_OBJS@ $(EXTRA_OBJECTS)
+
 
 all: $(LIB)
 
@@ -45,7 +49,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I. $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
@@ -66,7 +70,7 @@ clean:
 mostlyclean: clean
 
 distclean: clean
-	rm -f Makefile *.tab.c *~
+	rm -f Makefile *.tab.c *~ roken_rename.h
 
 realclean: distclean
 	rm -f TAGS
@@ -90,4 +94,7 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 
 $(OBJECTS): ../../include/config.h
 
+strdup.c: $(srcdir)/../roken/strdup.c
+	$(LN_S) $(srcdir)/../roken/strdup.c .
+
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index 24e6d73b2..3643cbde0 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -11,7 +11,7 @@ CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
-DEFS = @DEFS@ -DLIBDIR='"$(libdir)"' @AFS_EXTRA_DEFS@
+DEFS = @DEFS@ -DROKEN_RENAME -DLIBDIR='"$(libdir)"' @AFS_EXTRA_DEFS@
 CFLAGS = @CFLAGS@
 
 INSTALL = @INSTALL@
@@ -49,7 +49,7 @@ Wall:
 	make CFLAGS="-g -Wall -Wno-comment -Wmissing-prototypes -Wmissing-declarations -D__USE_FIXED_PROTOTYPES__"
 
 .c.o:
-	$(CC) -c $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
+	$(CC) -c $(DEFS) -I../../include -I$(srcdir) -I. $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
 
 install: all
 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
@@ -74,7 +74,7 @@ clean:
 mostlyclean: clean
 
 distclean: clean
-	rm -f Makefile *.tab.c *~
+	rm -f Makefile *.tab.c *~ roken_rename.h
 
 realclean: distclean
 	rm -f TAGS
@@ -101,7 +101,10 @@ $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 afslib.so: afslib.o
 	ld -o $@ -bM:SRE -bI:$(srcdir)/afsl.exp -bE:$(srcdir)/afslib.exp @AFS_EXTRA_LD@ afslib.o -lc
 
-$(OBJECTS): ../../include/config.h
+$(OBJECTS): ../../include/config.h roken_rename.h
+
+roken_rename.h: $(srcdir)/../krb/roken_rename.h
+	$(LN_S) $(srcdir)/../krb/roken_rename.h .
 
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean dist
 
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index 0d02b59ef..3c0945d22 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -11,7 +11,7 @@ CC = @CC@
 AR = ar
 RANLIB = @RANLIB@
 LN_S = @LN_S@
-DEFS = @DEFS@
+DEFS = @DEFS@ -DROKEN_RENAME
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 LD_FLAGS = @LD_FLAGS@
@@ -44,16 +44,23 @@ PROGS = otptest$(EXECSUFFIX)
 LIB_SOURCES = otp.c otp_challenge.c otp_db.c otp_md.c \
 	  otp_parse.c otp_print.c otp_verify.c
 
+EXTRA_LIB_SOURCES = snprintf.c strlwr.c strcasecmp.c
+
 OTPTEST_SOURCES = otptest.c
 
-SOURCES = $(LIB_SOURCES) $(OTPTEST_SOURCES)
+SOURCES = $(LIB_SOURCES) $(EXTRA_LIB_SOURCES) $(OTPTEST_SOURCES)
 
 LIB_OBJECTS = otp.o otp_challenge.o otp_db.o otp_md.o \
 	  otp_parse.o otp_print.o otp_verify.o
 
+LIBADD = \
+	snprintf.o \
+	strcasecmp.o \
+	strlwr.o
+
 OTPTEST_OBJECTS = otptest.o
 
-OBJECTS = $(LIB_OBJECTS) $(OTPTEST_OBJECTS)
+OBJECTS = $(LIB_OBJECTS) $(LIBADD) $(OTPTEST_OBJECTS)
 LIBROKEN=-L../../lib/roken -lroken
 
 all: $(LIB) $(PROGS)
@@ -87,21 +94,28 @@ distclean: clean
 	rm -f Makefile *~
 
 realclean: distclean
-	rm -f TAGS
+	rm -f TAGS $(EXTRA_LIB_SOURCES)
 
 otptest$(EXECSUFFIX): $(OTPTEST_OBJECTS) $(LIB)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o $@ $(OTPTEST_OBJECTS) -L. -lotp -L../des -ldes $(LIBROKEN) $(LIB_DBM) $(LIBS) $(LIBROKEN)
 
-$(LIBNAME).a: $(LIB_OBJECTS)
+$(LIBNAME).a: $(LIB_OBJECTS) $(LIBADD)
 	rm -f $@
-	$(AR) cr $@ $(LIB_OBJECTS)
+	$(AR) cr $@ $(LIB_OBJECTS) $(LIBADD)
 	-$(RANLIB) $@
 
-$(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
+$(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS) $(LIBADD)
 	rm -f $@
-	$(LDSHARED) -o $@ $(LIB_OBJECTS) $(LIB_DEPS)
+	$(LDSHARED) -o $@ $(LIB_OBJECTS) $(LIBADD) $(LIB_DEPS)
 	@build_symlink_command@
 
 $(OBJECTS): ../../include/config.h
 
+snprintf.c:
+	$(LN_S) $(srcdir)/../roken/snprintf.c .
+strcasecmp.c:
+	$(LN_S) $(srcdir)/../roken/strcasecmp.c .
+strlwr.c:
+	$(LN_S) $(srcdir)/../roken/strlwr.c .
+
 .PHONY: all Wall install uninstall check clean mostlyclean distclean realclean