diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index f57fe2867..985ca0a52 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -210,7 +210,6 @@ as_rep(KDC_REQ *req,
     char *client_name, *server_name;
     krb5_error_code ret = 0;
     const char *e_text = NULL;
-    int i;
 
     Key *ckey, *skey;
 
@@ -838,7 +837,6 @@ tgs_make_reply(KDC_REQ_BODY *b,
     EncTicketPart et;
     KDCOptions f = b->kdc_options;
     krb5_error_code ret;
-    int i;
     krb5_enctype setype;
     Key *skey;
     EncryptionKey *ekey;
@@ -1055,7 +1053,6 @@ tgs_rep2(KDC_REQ_BODY *b,
 	 const char *from)
 {
     krb5_ap_req ap_req;
-    size_t len;
     krb5_error_code ret;
     krb5_principal princ;
     krb5_auth_context ac = NULL;
@@ -1152,7 +1149,6 @@ tgs_rep2(KDC_REQ_BODY *b,
 	Realm r;
 	char *spn = NULL, *cpn = NULL;
 	hdb_entry *server = NULL, *client = NULL;
-	TransitedEncoding tr;
 	int loop = 0;
 	EncTicketPart adtkt;
 	char opt_str[128];
diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 989e8d0d4..4b655c50b 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -45,9 +45,6 @@ static krb5_log_facility *log_facility;
 
 static sig_atomic_t exit_flag = 0;
 
-static krb5_data msater_key;
-static int master_key_set = 0;
-
 #define KPASSWDD_LOG_ERR  0
 #define KPASSWDD_LOG_INFO 1