diff --git a/agent/protect.c b/agent/protect.c
index bc44fe107..1084ee208 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -1632,6 +1632,7 @@ agent_get_shadow_info_type (const unsigned char *shadowkey,
   size_t n, saved_n;
   int depth = 0;
 
+  (void)depth;
   s = shadowkey;
   if (*s != '(')
     return gpg_error (GPG_ERR_INV_SEXP);
diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c
index 2e0859861..a591a2b5a 100644
--- a/dirmngr/crlfetch.c
+++ b/dirmngr/crlfetch.c
@@ -366,8 +366,8 @@ gpg_error_t
 fetch_next_ksba_cert (cert_fetch_context_t context, ksba_cert_t *r_cert)
 {
   gpg_error_t err;
-  unsigned char *value;
-  size_t valuelen;
+  unsigned char *value = NULL;
+  size_t valuelen = 0;
   ksba_cert_t cert;
 
   *r_cert = NULL;
diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
index 57cf04a7e..45d0b0b13 100644
--- a/dirmngr/ks-action.c
+++ b/dirmngr/ks-action.c
@@ -67,8 +67,6 @@ ks_action_help (ctrl_t ctrl, const char *url)
 {
   gpg_error_t err;
   parsed_uri_t parsed_uri;  /* The broken down URI.  */
-  char *tmpstr;
-  const char *s;
 
   if (!url || !*url)
     {
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 1d9cb7fb4..2928a2596 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2126,7 +2126,6 @@ make_keyserver_item (const char *uri, uri_item_t *r_item)
 {
   gpg_error_t err;
   uri_item_t item;
-  const char *s;
   char *tmpstr = NULL;
 
   *r_item = NULL;
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 55cf9b1e7..231600ff6 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -950,7 +950,8 @@ check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
   int algo;
   ksba_sexp_t p;
   size_t n;
-  gcry_sexp_t s_sig, s_hash, s_pkey;
+  gcry_sexp_t s_sig, s_pkey;
+  gcry_sexp_t s_hash = NULL;
   const char *algo_name; /* hash algorithm name converted to lower case. */
   int digestlen;
   unsigned char *digest;
diff --git a/g10/key-check.c b/g10/key-check.c
index b370cc11b..a2d8029cc 100644
--- a/g10/key-check.c
+++ b/g10/key-check.c
@@ -261,6 +261,7 @@ key_check_all_keysigs (ctrl_t ctrl, int mode, kbnode_t kb,
   int modified = 0;
   PKT_signature *sig;
 
+  (void)missing_selfsig;
   log_assert (kb->pkt->pkttype == PKT_PUBLIC_KEY);
   pk = kb->pkt->pkt.public_key;
 
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 2f7263ec6..04538011f 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -4069,6 +4069,7 @@ show_basic_key_info (ctrl_t ctrl, kbnode_t keyblock, int print_sec)
     }
 
   /* The user IDs. */
+  (void)i; /* Counting User IDs */
   for (i = 0, node = keyblock; node; node = node->next)
     {
       if (node->pkt->pkttype == PKT_USER_ID)
@@ -4768,6 +4769,7 @@ menu_expire (ctrl_t ctrl, kbnode_t pub_keyblock,
   kbnode_t node;
   u32 keyid[2];
 
+  (void)signumber;
   if (unattended)
     {
       only_mainkey = (unattended == 1);
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 5310af84d..0e92edf56 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -708,7 +708,7 @@ select_and_read_record (app_t app, unsigned short efid, int recno,
                         unsigned char **buffer, size_t *buflen, int *r_sw)
 {
   gpg_error_t err;
-  int sw;
+  int sw = 0;
 
   if (r_sw)
     *r_sw = 0x9000;
diff --git a/scd/app-sc-hsm.c b/scd/app-sc-hsm.c
index 1ca709f72..c57ba345e 100644
--- a/scd/app-sc-hsm.c
+++ b/scd/app-sc-hsm.c
@@ -666,6 +666,7 @@ read_ef_prkd (app_t app, unsigned short fid, prkdf_object_t *prkdresult,
       {
         /* Yep, this is the keyReference.
            Note: UL is currently not used. */
+        (void)ul;
         for (ul=0; objlen; objlen--)
           {
             ul <<= 8;
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index a8191657d..bde39fcd0 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -5569,7 +5569,7 @@ static const struct scheme_interface vtbl = {
 };
 #endif
 
-scheme *scheme_init_new() {
+scheme *scheme_init_new(void) {
   scheme *sc=(scheme*)malloc(sizeof(scheme));
   if(!scheme_init(sc)) {
     free(sc);