diff --git a/ChangeLog.txt b/ChangeLog.txt
index 174768f4..6fc83e67 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -30,6 +30,7 @@
 - Fix test when nbuilding with WITH_EDITLINE=no. Closes #3484.
 - Fix tests when building with WITH_WEBSOCKETS=no. Closes #3502.
 - Fix libmosquitto_static cmake build.
+- Enable WITH_UNIX_SOCKETS on Windows.
 
 
 2.1.2 - 2026-02-09
diff --git a/lib/connect.c b/lib/connect.c
index 59d5a496..b9c94e2d 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -187,7 +187,7 @@ int mosquitto_reconnect(struct mosquitto *mosq)
 }
 
 
-int get_address(int sock, char *buf, size_t len, uint16_t *remote_port)
+int get_address(mosq_sock_t sock, char *buf, size_t len, uint16_t *remote_port)
 {
 	struct sockaddr_storage addr;
 	socklen_t addrlen;
diff --git a/src/net.c b/src/net.c
index 98e74703..20e922ab 100644
--- a/src/net.c
+++ b/src/net.c
@@ -938,7 +938,7 @@ static int net__socket_listen_tcp(struct mosquitto__listener *listener)
 static int net__socket_listen_unix(struct mosquitto__listener *listener)
 {
 	struct sockaddr_un addr;
-	int sock;
+	mosq_sock_t sock = INVALID_SOCKET;
 	int rc;
 #ifndef WIN32
 	mode_t old_mask;