diff --git a/include/meson.build b/include/meson.build
index 1e486e2ffb..36af68b85c 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -200,7 +200,7 @@ if conf_data.get('HAVE_GETPEEREID').to_int() == 0 and conf_data.get('HAVE_GETPEE
     endif
 endif
 
-conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false)
+conf_data.set('UNIXCONN', '1')
 conf_data.set('IPv6', build_ipv6 ? '1' : false)
 
 # potentially tunable - needed also in places that cannot include misc.h
diff --git a/os/Xtranssock.c b/os/Xtranssock.c
index daa87cbb4d..0f13a45ca1 100644
--- a/os/Xtranssock.c
+++ b/os/Xtranssock.c
@@ -73,12 +73,14 @@ from the copyright holders.
 #ifdef XTHREADS
 #include <X11/Xthreads.h>
 #endif
+#include <sys/stat.h>
 
 #include "os/ossock.h"
 
 #ifndef WIN32
 
 #if defined(UNIXCONN)
+#include <sys/un.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -90,12 +92,6 @@ from the copyright holders.
 #include <X11/Xos_r.h>
 #endif
 
-#ifdef UNIXCONN
-#include <sys/un.h>
-#include <sys/stat.h>
-#endif
-
-
 #ifndef NO_TCP_H
 #if defined(linux) || defined(__GLIBC__)
 #include <sys/param.h>
@@ -120,6 +116,8 @@ from the copyright holders.
 #include <X11/Xwindows.h>
 #include <X11/Xw32defs.h>
 
+#include <afunix.h>
+
 #undef EADDRINUSE
 #define EADDRINUSE WSAEADDRINUSE
 #undef EWOULDBLOCK