diff --git a/inc/lektor/internal/os.h b/inc/lektor/internal/os.h
index 158f023ed926f0c3fe873e42d13b5c1ceab1353d..d0f565ce3ba354bad41a73f38af7371da9ccb131 100644
--- a/inc/lektor/internal/os.h
+++ b/inc/lektor/internal/os.h
@@ -88,9 +88,9 @@ enum {
 #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
 /* LKT_OS_TOASTER | APPLE */
 typedef int SOCKET;
-#define closesocket(fd) close(fd)
-#define INVALID_SOCKET  (-1)
-#define to_file_mode_t(perm) (perm)
+#define closesocket(fd)        close(fd)
+#define INVALID_SOCKET         ((SOCKET)(-1))
+#define to_file_mode_t(perm)   (perm)
 #define to_socket_size_t(size) (size)
 
 #else
@@ -102,8 +102,8 @@ typedef int SOCKET;
 #define mkdir(str, perm)           _mkdir(str)
 #define socket(dom, type, proto__) WSASocket(dom, type, 0, 0, 0, 0)
 #define get_nprocs_conf()          2
-#define to_file_mode_t(perm) ((int)(perm))
-#define to_socket_size_t(size) ((ULONG)(size))
+#define to_file_mode_t(perm)       ((int)(perm))
+#define to_socket_size_t(size)     ((ULONG)(size))
 
 #endif
 
diff --git a/src/net/listen.c b/src/net/listen.c
index 64420e763a93ad38028d9419cfd1fba950a876ef..38a7fe492b12e8173aa8669e983f68ee25cea992 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -528,7 +528,7 @@ failure:
     return -1;
 }
 
-static int
+PRIVATE_FUNCTION SOCKET
 init_listening_socket_unix(const char UNUSED *file, const char UNUSED *type /* == "unix" */)
 {
 #if !(defined(LKT_OS_WIN) && (LKT_OS_WIN == 1))
@@ -569,15 +569,17 @@ init_listening_socket_unix(const char UNUSED *file, const char UNUSED *type /* =
     }
 
     return fd;
-#else
-    goto failure;
-#endif
+
 failure:
     close(fd);
-    return -1;
+    return INVALID_SOCKET;
+
+#else
+    return INVALID_SOCKET;
+#endif
 }
 
-static SOCKET
+PRIVATE_FUNCTION SOCKET
 init_listening_socket_net(const char *host, const char *port)
 {
     errno                      = 0;
@@ -641,7 +643,7 @@ init_listening_socket_net(const char *host, const char *port)
     return fd;
 }
 
-static int
+PRIVATE_FUNCTION int
 accept_all(SOCKET listen_fd, struct pollfd *fds, size_t fds_max, size_t *fds_len)
 {
     SOCKET fd;