diff --git a/g10/photoid.c b/g10/photoid.c
index 3728cd076..132adca17 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -287,7 +287,12 @@ void
 show_photos(const struct user_attribute *attrs, int count,
             PKT_public_key *pk, PKT_user_id *uid)
 {
-#ifndef DISABLE_PHOTO_VIEWER
+#ifdef DISABLE_PHOTO_VIEWER
+  (void)attrs;
+  (void)count;
+  (void)pk;
+  (void)uid;
+#else /*!DISABLE_PHOTO_VIEWER*/
   int i;
   struct expando_args args;
   u32 len;
@@ -367,5 +372,5 @@ show_photos(const struct user_attribute *attrs, int count,
 
  fail:
   log_error(_("unable to display photo ID!\n"));
-#endif
+#endif /*!DISABLE_PHOTO_VIEWER*/
 }
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 024417ef5..dda4c9a3f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1230,8 +1230,11 @@ my_dgettext (const char *domain, const char *msgid)
       return text ? text : msgid;
     }
   else
-#endif
     return msgid;
+#else
+  (void)domain;
+  return msgid;
+#endif
 }