diff --git a/src/select.hpp b/src/select.hpp
index 0a75bcda..050889bb 100644
--- a/src/select.hpp
+++ b/src/select.hpp
@@ -30,7 +30,7 @@
 #include <vector>
 
 #ifdef ZMQ_HAVE_WINDOWS
-#include "winsock2.h"
+#include <winsock2.h>
 #elif defined ZMQ_HAVE_OPENVMS
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 94728147..d6ac22d1 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -842,7 +842,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
 
     //  If we have the message, return immediately.
     if (rc == 0) {
-        if (file_desc >= 0)
+        if (file_desc != retired_fd)
             msg_->set_fd(file_desc);
         extract_flags (msg_);
         return 0;
@@ -860,7 +860,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
         rc = xrecv (msg_);
         if (rc < 0)
             return rc;
-        if (file_desc >= 0)
+        if (file_desc != retired_fd)
             msg_->set_fd(file_desc);
         extract_flags (msg_);
         return 0;
@@ -894,7 +894,7 @@ int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
         }
     }
 
-    if (file_desc >= 0)
+    if (file_desc != retired_fd)
         msg_->set_fd(file_desc);
     extract_flags (msg_);
     return 0;