diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c
index 165bb2601..620e2b64a 100644
--- a/appl/telnet/libtelnet/auth.c
+++ b/appl/telnet/libtelnet/auth.c
@@ -70,6 +70,7 @@ RCSID("$Id$");
 #endif
 #include <stdlib.h>
 #include <string.h>
+#include <roken.h>
 
 #include "encrypt.h"
 #include "auth.h"
diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c
index a2c3a0564..3eeb45a5b 100644
--- a/appl/telnet/libtelnet/enc_des.c
+++ b/appl/telnet/libtelnet/enc_des.c
@@ -48,6 +48,7 @@ RCSID("$Id$");
 
 #include "encrypt.h"
 #include "misc-proto.h"
+#include <roken.h>
 
 #include <des.h>
 
diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
index 88d0875d7..c15ab5b9a 100644
--- a/appl/telnet/libtelnet/encrypt.c
+++ b/appl/telnet/libtelnet/encrypt.c
@@ -69,6 +69,7 @@ RCSID("$Id$");
 
 #include <stdlib.h>
 #include <string.h>
+#include <roken.h>
 
 /*
  * These functions pointers point to the current routines
diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c
index b10780c83..4dfcc1033 100644
--- a/appl/telnet/libtelnet/kerberos.c
+++ b/appl/telnet/libtelnet/kerberos.c
@@ -307,7 +307,10 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
 	    struct passwd *pw = getpwnam(UserNameRequested);
 
 	    if(pw){
-		snprintf(ts, sizeof(ts), "%s%u", TKT_ROOT, pw->pw_uid);
+		snprintf(ts, sizeof(ts),
+			 "%s%u",
+			 TKT_ROOT,
+			 (unsigned)pw->pw_uid);
 		setenv("KRBTKFILE", ts, 1);
 	    }
 	    Data(ap, KRB_ACCEPT, NULL, 0);
diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index c0047e322..0c04d5608 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -57,7 +57,7 @@ RCSID("$Id$");
 #include "externs.h"
 #include "types.h"
 #include "general.h"
-
+#include <roken.h>
 
 #define	strip(x) ((my_want_state_is_wont(TELOPT_BINARY)) ? ((x)&0x7f) : (x))
 
diff --git a/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c
index 66067d274..8fa685c24 100644
--- a/appl/telnet/telnet/utilities.c
+++ b/appl/telnet/telnet/utilities.c
@@ -59,6 +59,7 @@ RCSID("$Id$");
 #endif
 
 #include <ctype.h>
+#include <roken.h>
 
 #include "general.h"