diff --git a/appl/telnet/telnetd/Makefile.in b/appl/telnet/telnetd/Makefile.in
index 66cbd0626..1648b58e1 100644
--- a/appl/telnet/telnetd/Makefile.in
+++ b/appl/telnet/telnetd/Makefile.in
@@ -46,8 +46,7 @@ KLIB=$(LIBKAFS) $(LIBKRB) $(LIBDES) $(LIBROKEN)
 all: telnetd
 
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) \
-	-I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $<
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) -I../../../include -I.. -I../../.. -I$(srcdir)/.. -I. -I$(srcdir) $<
 
 telnetd: $(OBJECTS)
 	$(CC) $(LD_FLAGS) $(LDFLAGS) -o telnetd $(OBJECTS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
diff --git a/lib/roken/roken.h b/lib/roken/roken.h
index 5c07132f8..2b338bcbc 100644
--- a/lib/roken/roken.h
+++ b/lib/roken/roken.h
@@ -8,6 +8,8 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
+#include "protos.h"
+
 #ifndef HAVE_PUTENV
 int putenv(const char *string);
 #endif
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 5c07132f8..2b338bcbc 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -8,6 +8,8 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
+#include "protos.h"
+
 #ifndef HAVE_PUTENV
 int putenv(const char *string);
 #endif
diff --git a/lib/roken/verify.c b/lib/roken/verify.c
index 00cd84611..a42fe67f9 100644
--- a/lib/roken/verify.c
+++ b/lib/roken/verify.c
@@ -13,10 +13,6 @@ RCSID("$Id$");
 #endif
 #include "roken.h"
 
-#if defined(__ultrix) || defined(sun)
-char *crypt(const char*, const char*);
-#endif
-
 int
 verify_unix_user(char *user, char *password)
 {