@@ -1391,17 +1391,17 @@
 	AC_CHECK_HEADER(netinet/tcp.h, [
 		AC_DEFINE(OF_HAVE_NETINET_TCP_H, 1,
 			[Whether we have netinet/tcp.h])
 	])
 	AC_CHECK_HEADERS([arpa/inet.h netdb.h])
+	AC_CHECK_HEADER(sys/un.h, [
+		AC_DEFINE(OF_HAVE_SYS_UN_H, 1, [Whether we have sys/un.h])
+	])
 	AC_CHECK_HEADER(netipx/ipx.h, [
 		AC_DEFINE(OF_HAVE_NETIPX_IPX_H, 1,
 			[Whether we have netipx/ipx.h])
 	])
-	AC_CHECK_HEADER(sys/un.h, [
-		AC_DEFINE(OF_HAVE_SYS_UN_H, 1, [Whether we have sys/un.h])
-	])
 
 	AC_CHECK_MEMBER([struct sockaddr_in6.sin6_addr], [
 		AC_EGREP_CPP(egrep_cpp_yes, [
 			#ifdef _WIN32
 			typedef int BOOL;
@@ -1450,10 +1450,44 @@
 		# endif
 		# include <windows.h>
 		# include <ws2tcpip.h>
 		#endif
 	])
+
+	AC_CHECK_HEADERS(afunix.h, [
+		AC_DEFINE(OF_HAVE_AFUNIX_H, 1, [Whether we have afunix.h])
+	], [], [
+		#ifdef _WIN32
+		# include <winsock2.h>
+		#endif
+	])
+	AC_CHECK_MEMBER(struct sockaddr_un.sun_path, [
+		AC_DEFINE(OF_HAVE_UNIX_SOCKETS, 1,
+			[Whether we have UNIX sockets])
+		AC_SUBST(USE_SRCS_UNIX_SOCKETS, '${SRCS_UNIX_SOCKETS}')
+	], [], [
+		#ifdef OF_HAVE_SYS_TYPES_H
+		# include <sys/types.h>
+		#endif
+		#ifdef OF_HAVE_SYS_UN_H
+		# include <sys/un.h>
+		#endif
+		#ifdef _WIN32
+		# include <winsock2.h>
+		#endif
+		#ifdef HAVE_AFUNIX_H
+		# include <afunix.h>
+		#endif
+
+		#ifdef __morphos__
+		# error MorphOS has the struct but does not support it
+		#endif
+
+		#ifdef __MINT__
+		# error Gives invalid argument at runtime
+		#endif
+	])
 
 	AC_CHECK_MEMBER(struct sockaddr_ipx.sipx_network, [], [
 		AC_CHECK_MEMBER(struct sockaddr_ipx.sa_netnum, [], [], [
 			#ifdef _WIN32
 			typedef int BOOL;
@@ -1523,44 +1557,10 @@
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
 			AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
 		])
 	])
 
-	AC_CHECK_HEADERS(afunix.h, [
-		AC_DEFINE(OF_HAVE_AFUNIX_H, 1, [Whether we have afunix.h])
-	], [], [
-		#ifdef _WIN32
-		# include <winsock2.h>
-		#endif
-	])
-	AC_CHECK_MEMBER(struct sockaddr_un.sun_path, [
-		AC_DEFINE(OF_HAVE_UNIX_SOCKETS, 1,
-			[Whether we have UNIX sockets])
-		AC_SUBST(USE_SRCS_UNIX_SOCKETS, '${SRCS_UNIX_SOCKETS}')
-	], [], [
-		#ifdef OF_HAVE_SYS_TYPES_H
-		# include <sys/types.h>
-		#endif
-		#ifdef OF_HAVE_SYS_UN_H
-		# include <sys/un.h>
-		#endif
-		#ifdef _WIN32
-		# include <winsock2.h>
-		#endif
-		#ifdef HAVE_AFUNIX_H
-		# include <afunix.h>
-		#endif
-
-		#ifdef __morphos__
-		# error MorphOS has the struct but does not support it
-		#endif
-
-		#ifdef __MINT__
-		# error Gives invalid argument at runtime
-		#endif
-	])
-
 	AC_CHECK_FUNCS(paccept accept4, break)
 
 	AC_CHECK_FUNCS(kqueue1 kqueue, [
 		AC_DEFINE(HAVE_KQUEUE, 1, [Whether we have kqueue])
 		AC_SUBST(OF_KQUEUE_KERNEL_EVENT_OBSERVER_M,