Index: include/comms.h
===================================================================
--- include/comms.h	(revision 89106)
+++ include/comms.h	(working copy)
@@ -21,10 +21,6 @@
 #define ZABBIX_COMMS_H
 
 #ifdef _WINDOWS
-#include <VersionHelpers.h>
-#endif
-
-#ifdef _WINDOWS
 #	if defined(__INT_MAX__) && __INT_MAX__ == 2147483647
 typedef int	ssize_t;
 #	else
@@ -64,11 +60,6 @@
 typedef int	ZBX_SOCKET;
 #endif
 
-#if defined(_WINDOWS) && !defined(WSA_FLAG_NO_HANDLE_INHERIT)
-/* allow compilation on older Windows systems */
-#define WSA_FLAG_NO_HANDLE_INHERIT	0x80
-#endif
-
 #if defined(HAVE_IPV6)
 #	define ZBX_SOCKADDR struct sockaddr_storage
 #else
Index: src/libs/zbxcomms/comms.c
===================================================================
--- src/libs/zbxcomms/comms.c	(revision 89106)
+++ src/libs/zbxcomms/comms.c	(working copy)
@@ -23,6 +23,13 @@
 #include "../zbxcrypto/tls_tcp.h"
 #include "zbxcompress.h"
 
+#ifdef _WINDOWS
+#include <VersionHelpers.h>
+#ifndef WSA_FLAG_NO_HANDLE_INHERIT
+#	define WSA_FLAG_NO_HANDLE_INHERIT	0x80	/* allow compilation on older Windows systems */
+#endif
+#endif
+
 #define IPV4_MAX_CIDR_PREFIX	32	/* max number of bits in IPv4 CIDR prefix */
 #define IPV6_MAX_CIDR_PREFIX	128	/* max number of bits in IPv6 CIDR prefix */