diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
index f2b0145f0..5ac213c41 100644
--- a/appl/telnet/libtelnet/kerberos5.c
+++ b/appl/telnet/libtelnet/kerberos5.c
@@ -59,6 +59,9 @@ RCSID("$Id$");
 
 #include <arpa/telnet.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <netdb.h>
 #include <ctype.h>
 #include <pwd.h>
@@ -69,6 +72,8 @@ RCSID("$Id$");
 #include <socks.h>
 #endif
 
+#include <roken.h>
+
 #include "encrypt.h"
 #include "auth.h"
 #include "misc.h"
diff --git a/kdc/headers.h b/kdc/headers.h
index 09dfbc1e5..3797d7e6f 100644
--- a/kdc/headers.h
+++ b/kdc/headers.h
@@ -82,8 +82,11 @@
 #include <err.h>
 #include <roken.h>
 #include <getarg.h>
+#include <base64.h>
+#include <parse_units.h>
 #include <krb5.h>
 #include <hdb_err.h>
+#include <der.h>
 
 #ifdef KRB4
 #include <krb.h>