Index: agent/gpg-agent.c
===================================================================
--- agent/gpg-agent.c.orig
+++ agent/gpg-agent.c
@@ -1621,7 +1621,7 @@ check_for_running_agent (int mode)
   int rc;
   char *infostr, *p;
   assuan_context_t ctx;
-  int prot, pid;
+  int prot=0, pid=0;
 
   if (!mode)
     {
Index: g10/pubkey-enc.c
===================================================================
--- g10/pubkey-enc.c.orig
+++ g10/pubkey-enc.c
@@ -154,7 +154,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, P
   int rc;
   gcry_mpi_t plain_dek  = NULL;
   byte *frame = NULL;
-  unsigned n, nframe;
+  size_t n, nframe;
   u16 csum, csum2;
   
   int card = 0;
@@ -166,7 +166,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, P
       size_t rbuflen;
       char *snbuf;
       unsigned char *indata = NULL;
-      unsigned int indatalen;
+      size_t int indatalen;
 
       snbuf = serialno_and_fpr_from_sk (sk->protect.iv, sk->protect.ivlen, sk);
 
Index: g10/seckey-cert.c
===================================================================
--- g10/seckey-cert.c.orig
+++ g10/seckey-cert.c
@@ -107,7 +107,7 @@ do_check( PKT_secret_key *sk, const char
 
 	csum = 0;
 	if( sk->version >= 4 ) {
-            int ndata;
+            size_t ndata;
 	    unsigned int ndatabits;
 	    byte *p, *data;
             u16 csumc = 0;
@@ -337,7 +337,7 @@ protect_secret_key( PKT_secret_key *sk, 
 {
     int i,j, rc = 0;
     byte *buffer;
-    unsigned nbytes;
+    size_t nbytes;
     u16 csum;
 
     if( !dek )
@@ -370,7 +370,7 @@ protect_secret_key( PKT_secret_key *sk, 
 	    gcry_cipher_setiv (cipher_hd, sk->protect.iv, sk->protect.ivlen);
 	    if( sk->version >= 4 ) {
                 byte *bufarr[PUBKEY_MAX_NSKEY];
-		unsigned narr[PUBKEY_MAX_NSKEY];
+		size_t narr[PUBKEY_MAX_NSKEY];
 		unsigned nbits[PUBKEY_MAX_NSKEY];
 		int ndata=0;
 		byte *p, *data;