diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index b5d2dd2d0..2a4cd1588 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -184,8 +184,6 @@ krb5_auth_con_getaddrs(krb5_context context,
 		       krb5_address **local_addr,
 		       krb5_address **remote_addr)
 {
-    krb5_error_code ret;
-
     if(*local_addr)
 	krb5_free_address (context, *local_addr);
     *local_addr = malloc (sizeof(**local_addr));
diff --git a/lib/krb5/changepw.c b/lib/krb5/changepw.c
index 786444494..d2a282e80 100644
--- a/lib/krb5/changepw.c
+++ b/lib/krb5/changepw.c
@@ -167,8 +167,6 @@ str2data (krb5_data *d,
 	  char *fmt,
 	  ...)
 {
-    char *p;
-    size_t len;
     va_list args;
 
     va_start(args, fmt);
@@ -286,7 +284,6 @@ krb5_change_password (krb5_context	context,
 {
     krb5_error_code ret;
     krb5_auth_context auth_context = NULL;
-    krb5_creds cred;
     int sock;
     int i;
     char *buf;
diff --git a/lib/krb5/checksum.c b/lib/krb5/checksum.c
index daf28b76d..8a2875716 100644
--- a/lib/krb5/checksum.c
+++ b/lib/krb5/checksum.c
@@ -154,6 +154,7 @@ MD4_DES_verify (void *p, size_t len, const krb5_keyblock *keyblock,
     return memcmp (res, (u_char *)other + 8, 16);
 }
 
+#if 0
 static void
 MD4_DES_broken_checksum (void *p, size_t len, const krb5_keyblock *keyblock,
 			 void *result)
@@ -188,6 +189,7 @@ MD4_DES_broken_verify (void *p, size_t len, const krb5_keyblock *keyblock,
 
     return memcmp (res, (u_char *)other, 16);
 }
+#endif
 
 static void
 MD5_DES_checksum (void *p, size_t len, const krb5_keyblock *keyblock,
@@ -283,7 +285,6 @@ MD5_DES3_verify (void *p, size_t len, const krb5_keyblock *keyblock,
     des_cblock ivec;
     des_key_schedule sched[3];
     unsigned char res[16];
-    unsigned char *orig_key = (unsigned char *)keyblock->keyvalue.data;
     struct md5 md5;
     
     fix_des3_key(keyblock, sched);
diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c
index db715b222..3fa72d311 100644
--- a/lib/krb5/config_file.c
+++ b/lib/krb5/config_file.c
@@ -358,63 +358,6 @@ krb5_config_file_free (krb5_config_section *s)
     return 0;
 }
 
-static int print_list (FILE *f, krb5_config_binding *l, unsigned level);
-static int print_binding (FILE *f, krb5_config_binding *b, unsigned level);
-static int print_section (FILE *f, krb5_config_section *s, unsigned level);
-static int print_config (FILE *f, krb5_config_section *c);
-
-static void
-tab (FILE *f, unsigned count)
-{
-    while(count--)
-	fprintf (f, "\t");
-}
-
-static int
-print_list (FILE *f, krb5_config_binding *l, unsigned level)
-{
-    while(l) {
-	print_binding (f, l, level);
-	l = l->next;
-    }
-    return 0;
-}
-
-static int
-print_binding (FILE *f, krb5_config_binding *b, unsigned level)
-{
-    tab (f, level);
-    fprintf (f, "%s = ", b->name);
-    if (b->type == krb5_config_string)
-	fprintf (f, "%s\n", b->u.string);
-    else if (b->type == krb5_config_list) {
-	fprintf (f, "{\n");
-	print_list (f, b->u.list, level + 1);
-	tab (f, level);
-	fprintf (f, "}\n");
-    } else
-	abort ();
-    return 0;
-}
-
-static int
-print_section (FILE *f, krb5_config_section *s, unsigned level)
-{
-    fprintf (f, "[%s]\n", s->name);
-    print_list (f, s->u.list, level + 1);
-    return 0;
-}
-
-static int
-print_config (FILE *f, krb5_config_section *c)
-{
-    while (c) {
-	print_section (f, c, 0);
-	c = c->next;
-    }
-    return 0;
-}
-
 const void *
 krb5_config_get_next (krb5_config_section *c,
 		      krb5_config_binding **pointer,
@@ -676,6 +619,64 @@ krb5_config_get_int (krb5_config_section *c,
 
 #ifdef TEST
 
+static int print_list (FILE *f, krb5_config_binding *l, unsigned level);
+static int print_binding (FILE *f, krb5_config_binding *b, unsigned level);
+static int print_section (FILE *f, krb5_config_section *s, unsigned level);
+static int print_config (FILE *f, krb5_config_section *c);
+
+static void
+tab (FILE *f, unsigned count)
+{
+    while(count--)
+	fprintf (f, "\t");
+}
+
+static int
+print_list (FILE *f, krb5_config_binding *l, unsigned level)
+{
+    while(l) {
+	print_binding (f, l, level);
+	l = l->next;
+    }
+    return 0;
+}
+
+static int
+print_binding (FILE *f, krb5_config_binding *b, unsigned level)
+{
+    tab (f, level);
+    fprintf (f, "%s = ", b->name);
+    if (b->type == krb5_config_string)
+	fprintf (f, "%s\n", b->u.string);
+    else if (b->type == krb5_config_list) {
+	fprintf (f, "{\n");
+	print_list (f, b->u.list, level + 1);
+	tab (f, level);
+	fprintf (f, "}\n");
+    } else
+	abort ();
+    return 0;
+}
+
+static int
+print_section (FILE *f, krb5_config_section *s, unsigned level)
+{
+    fprintf (f, "[%s]\n", s->name);
+    print_list (f, s->u.list, level + 1);
+    return 0;
+}
+
+static int
+print_config (FILE *f, krb5_config_section *c)
+{
+    while (c) {
+	print_section (f, c, 0);
+	c = c->next;
+    }
+    return 0;
+}
+
+
 int
 main(void)
 {
diff --git a/lib/krb5/convert_creds.c b/lib/krb5/convert_creds.c
index 17f166494..880fbe12d 100644
--- a/lib/krb5/convert_creds.c
+++ b/lib/krb5/convert_creds.c
@@ -68,7 +68,7 @@ krb524_convert_creds_kdc(krb5_context context,
 			   &reply);
     sp = krb5_storage_from_mem(reply.data, reply.length);
     if(sp == NULL)
-	return ;
+	return ENOMEM;
     krb5_ret_int32(sp, &tmp);
     ret = tmp;
     if(ret == 0){
diff --git a/lib/krb5/get_for_creds.c b/lib/krb5/get_for_creds.c
index d6593933d..2b3962f29 100644
--- a/lib/krb5/get_for_creds.c
+++ b/lib/krb5/get_for_creds.c
@@ -51,7 +51,6 @@ krb5_get_forwarded_creds (krb5_context	    context,
 {
     krb5_error_code ret;
     krb5_creds *out_creds;
-    krb5_creds in_cred;
     krb5_addresses addrs;
     struct hostent *hostent;
     unsigned n;
@@ -61,7 +60,6 @@ krb5_get_forwarded_creds (krb5_context	    context,
     EncKrbCredPart enc_krb_cred_part;
     size_t len;
     u_char buf[1024];
-    krb5_data enc_data;
     int32_t sec, usec;
     krb5_kdc_flags kdc_flags;
     krb5_enctype enctype;
diff --git a/lib/krb5/get_host_realm.c b/lib/krb5/get_host_realm.c
index 94bfef0a3..31e68822c 100644
--- a/lib/krb5/get_host_realm.c
+++ b/lib/krb5/get_host_realm.c
@@ -62,7 +62,6 @@ krb5_get_host_realm(krb5_context context,
     krb5_error_code ret;
     char hostname[MAXHOSTNAMELEN];
     char *res = NULL;
-    const char *partial = NULL;
     const krb5_config_binding *l;
     struct in_addr addr;
     struct hostent *hostent;
diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index 80714695f..8973f7852 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -347,8 +347,8 @@ change_password (krb5_context context,
 	goto out;
     asprintf (&p, "%s: %.*s\n",
 	      result_code ? "Error" : "Success",
-	      result_string.length,
-	      result_string.data);
+	      (int)result_string.length,
+	      (char*)result_string.data);
 
     ret = (*prompter) (context, data, p, 0, NULL);
     free (p);
diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c
index 345a9d57a..9873cb972 100644
--- a/lib/krb5/keytab.c
+++ b/lib/krb5/keytab.c
@@ -184,7 +184,6 @@ krb5_kt_start_seq_get(krb5_context context,
 {
   int16_t tag;
   int ret;
-  krb5_storage *sp;
 
   cursor->fd = open (id->filename, O_RDONLY);
   if (cursor->fd < 0)
@@ -331,7 +330,6 @@ krb5_kt_store_principal(krb5_storage *sp,
 {
     int i;
     int ret;
-    int16_t tmp;
     
     ret = krb5_store_int16(sp, p->name.name_string.len);
     if(ret) return ret;
diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
index 0006a8c11..b031c014d 100644
--- a/lib/krb5/krbhst.c
+++ b/lib/krb5/krbhst.c
@@ -49,7 +49,6 @@ krb5_get_krbhst (krb5_context context,
     unsigned max, count;
     krb5_config_binding *pointer;
     char *r;
-    char *h;
     krb5_boolean done;
     char **tmp;
 
diff --git a/lib/krb5/mcache.c b/lib/krb5/mcache.c
index 3e4990bae..ade4caf77 100644
--- a/lib/krb5/mcache.c
+++ b/lib/krb5/mcache.c
@@ -174,7 +174,6 @@ mcc_get_next (krb5_context context,
 	      krb5_cc_cursor *cursor,
 	      krb5_creds *creds)
 {
-    krb5_error_code ret;
     struct link *l;
 
     l = (struct link *)cursor->u.v;
diff --git a/lib/krb5/mk_rep.c b/lib/krb5/mk_rep.c
index fb1bb0ef3..e8f17c6d9 100644
--- a/lib/krb5/mk_rep.c
+++ b/lib/krb5/mk_rep.c
@@ -48,10 +48,8 @@ krb5_mk_rep(krb5_context context,
   krb5_error_code ret;
   AP_REP ap;
   EncAPRepPart body;
-  u_char buf[1024], *p;
+  u_char buf[1024];
   size_t len;
-  des_cblock key;
-  des_key_schedule schedule;
 
   ap.pvno = 5;
   ap.msg_type = krb_ap_rep;
diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index 8c3f12c46..38f60386e 100644
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -316,7 +316,6 @@ build_principal(krb5_context context,
 		va_list ap)
 {
     krb5_principal p;
-    int n;
   
     p = calloc(1, sizeof(*p));
     if (p == NULL)
diff --git a/lib/krb5/rd_rep.c b/lib/krb5/rd_rep.c
index 215d3af52..54cc9fda4 100644
--- a/lib/krb5/rd_rep.c
+++ b/lib/krb5/rd_rep.c
@@ -49,8 +49,6 @@ krb5_rd_rep(krb5_context context,
   krb5_error_code ret;
   AP_REP ap_rep;
   size_t len;
-  des_key_schedule schedule;
-  char *buf;
   krb5_data data;
 
   krb5_data_zero (&data);
diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index 4a0b4f097..c02087cab 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -336,7 +336,6 @@ krb5_rd_req(krb5_context context,
 	    krb5_flags *ap_req_options,
 	    krb5_ticket **ticket)
 {
-    krb5_keytab_entry entry;
     krb5_error_code ret;
     krb5_keytab real_keytab;
 
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index aa226d3e7..67f05c7ef 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -65,7 +65,6 @@ send_and_recv (int fd,
 	 if (ret <= 0)
 	     return -1;
 	 else {
-	     int len;
 
 	     if (ioctl (fd, FIONREAD, &nbytes) < 0)
 		 return -1;
diff --git a/lib/krb5/verify_init.c b/lib/krb5/verify_init.c
index 71d88c54c..980d4e568 100644
--- a/lib/krb5/verify_init.c
+++ b/lib/krb5/verify_init.c
@@ -153,8 +153,6 @@ krb5_verify_init_creds(krb5_context context,
 			     KEYTYPE_DES,
 			     &entry);
     if (ret) {
-	const char *p;
-
 	if (((options->flags & KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL) && 
 	     options->ap_req_nofail == 1) || 
 	    krb5_config_get_bool (context->cf,