diff --git a/lib/gtls.c b/lib/gtls.c
index 4cf78080b1e17d83d934ce7370500efdb2b89560..dc33dc600759c3cfe731a568fd5dc34d3addd37b 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -159,7 +159,7 @@ static CURLcode handshake(struct connectdata *conn,
       }
       else {
         /* anything that gets here is fatally bad */
-        failf(data, "select on SSL socket, errno: %d", Curl_ourerrno());
+        failf(data, "select on SSL socket, errno: %d", Curl_sockerrno());
         return CURLE_SSL_CONNECT_ERROR;
       }
     }
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 2168f255fb5d80c0285d1cf6b4ef871d018f20c0..07bb37ae033c700603ba8a030400d70dc19ebc1a 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -201,7 +201,7 @@ static void dump_addrinfo(struct connectdata *conn, const struct addrinfo *ai)
     if (Curl_printable_address(ai, buf, sizeof(buf)))
       printf("%s\n", buf);
     else
-      printf("failed; %s\n", Curl_strerror(conn, Curl_ourerrno()));
+      printf("failed; %s\n", Curl_strerror(conn, Curl_sockerrno()));
   }
 }
 #else
diff --git a/lib/select.c b/lib/select.c
index cf5f15a8f35bb22c30bd539c11b56edd0506c451..42a9a5c3587a92cf081e2d003a540b6c5d7427e8 100644
--- a/lib/select.c
+++ b/lib/select.c
@@ -152,7 +152,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms)
 
   do {
     r = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout);
-  } while((r == -1) && (Curl_ourerrno() == EINTR));
+  } while((r == -1) && (Curl_sockerrno() == EINTR));
 
   if (r < 0)
     return -1;
@@ -237,7 +237,7 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms)
 
   do {
     r = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, ptimeout);
-  } while((r == -1) && (Curl_ourerrno() == EINTR));
+  } while((r == -1) && (Curl_sockerrno() == EINTR));
 
   if (r < 0)
     return -1;
diff --git a/lib/sendf.c b/lib/sendf.c
index c922ce38e6f91b3620dcafd89755d4acf64b5ee7..d248c189a0a9de3536ebbc63b26dd55d8b6f57e6 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -43,7 +43,7 @@
 #include <curl/curl.h>
 #include "urldata.h"
 #include "sendf.h"
-#include "connect.h" /* for the Curl_ourerrno() proto */
+#include "connect.h" /* for the Curl_sockerrno() proto */
 #include "sslgen.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
diff --git a/lib/ssluse.c b/lib/ssluse.c
index ce1947bace8310e9061f3b25c17d84e234b3da8e..21346d30007547713b86b4cf6ce728e57938ca1c 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -49,7 +49,7 @@
 #include "url.h" /* for the ssl config check function */
 #include "inet_pton.h"
 #include "ssluse.h"
-#include "connect.h" /* Curl_ourerrno() proto */
+#include "connect.h" /* Curl_sockerrno() proto */
 #include "strequal.h"
 #include "select.h"
 #include "sslgen.h"