diff --git a/common/call-gpg.c b/common/call-gpg.c
index 4a32c889f..cd865efde 100644
--- a/common/call-gpg.c
+++ b/common/call-gpg.c
@@ -47,7 +47,7 @@ start_gpg (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments,
   assuan_context_t ctx = NULL;
   const char *pgmname;
   const char **argv;
-  int no_close_list[5];
+  assuan_fd_t no_close_list[5];
   int i;
   char line[ASSUAN_LINELENGTH];
 
@@ -100,7 +100,7 @@ start_gpg (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments,
     no_close_list[i++] = assuan_fd_from_posix_fd (input_fd);
   if (output_fd != -1)
     no_close_list[i++] = assuan_fd_from_posix_fd (output_fd);
-  no_close_list[i] = -1;
+  no_close_list[i] = ASSUAN_INVALID_FD;
 
   /* Connect to GPG and perform initial handshaking.  */
   err = assuan_pipe_connect (ctx, gpg_program, argv, no_close_list,
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 536354c2f..32c265b18 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2126,8 +2126,8 @@ cmd_getinfo (assuan_context_t ctx, char *line)
 #if ASSUAN_VERSION_NUMBER >= 0x020402
           /* Check whether we can connect to the proxy.  We use a
              special feature introduced with libassuan 2.4.2.  */
-          int sock = assuan_sock_connect_byname (NULL, 0, 0, NULL,
-                                                 ASSUAN_SOCK_TOR);
+          assuan_fd_t sock = assuan_sock_connect_byname (NULL, 0, 0, NULL,
+                                                         ASSUAN_SOCK_TOR);
           if (sock == ASSUAN_INVALID_FD)
             {
               err = assuan_write_status