diff --git a/dirmngr/http.c b/dirmngr/http.c
index 211d167bd..2345ce8c1 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -2052,7 +2052,7 @@ send_request (ctrl_t ctrl, http_t hd, const char *httphost, const char *auth,
       /* Until we support send/recv in estream under Windows we need
        * to use es_fopencookie.  */
 # ifdef HAVE_W32_SYSTEM
-      in = es_fopencookie ((void*)(unsigned int)hd->sock->fd, "rb",
+      in = es_fopencookie (hd->sock->fd, "rb",
                            simple_cookie_functions);
 # else
       in = es_fdopen_nc (hd->sock->fd, "rb");
@@ -2065,7 +2065,7 @@ send_request (ctrl_t ctrl, http_t hd, const char *httphost, const char *auth,
         }
 
 # ifdef HAVE_W32_SYSTEM
-      out = es_fopencookie ((void*)(unsigned int)hd->sock->fd, "wb",
+      out = es_fopencookie (hd->sock->fd, "wb",
                             simple_cookie_functions);
 # else
       out = es_fdopen_nc (hd->sock->fd, "wb");
diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c
index 9c7b57f2f..8cd6dc0f3 100644
--- a/kbx/kbx-client-util.c
+++ b/kbx/kbx-client-util.c
@@ -119,7 +119,7 @@ prepare_data_pipe (kbx_client_data_t kcd)
     }
 
 #ifdef HAVE_W32_SYSTEM
-  err = assuan_sendfd (kcd->ctx, INT2FD (_get_osfhandle (inpipe[1])));
+  err = assuan_sendfd (kcd->ctx, (HANDLE)_get_osfhandle (inpipe[1]));
 #else
   err = assuan_sendfd (kcd->ctx, inpipe[1]);
 #endif
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index 6be401c4f..ab96d3b02 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -1040,7 +1040,7 @@ do_open (char *line)
         HANDLE prochandle, handle, newhandle;
         char numbuf[35];
 
-        handle = (void*)_get_osfhandle (fd);
+        handle = (HANDLE)_get_osfhandle (fd);
 
         prochandle = OpenProcess (PROCESS_DUP_HANDLE, FALSE, server_pid);
         if (!prochandle)