reduce the use of windows.h in header files

--HG--
extra : rebase_source : 3d15968fcc5255e99a7343aeef2b2a79d71c6704

include/freerdp/utils/tcp.h

@@ -22,7 +22,6 @@
 
 #include <freerdp/api.h>
 #include <freerdp/types.h>
-#include <freerdp/utils/windows.h>
 
 FREERDP_API int freerdp_tcp_connect(const char* hostname, int port);
 FREERDP_API int freerdp_tcp_read(int sockfd, uint8* data, int length);

include/freerdp/window.h

@@ -22,10 +22,6 @@
 
 #include <freerdp/types.h>
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 /* Window Order Header Flags */
 #define WINDOW_ORDER_TYPE_WINDOW			0x01000000
 #define WINDOW_ORDER_TYPE_NOTIFY			0x02000000

libfreerdp-utils/tcp.c

@@ -28,6 +28,7 @@
 #include <fcntl.h>
 
 #ifndef _WIN32
+
 #include <netdb.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -42,13 +43,16 @@
 #endif
 #endif
 
-#else
+#else /* ifdef _WIN32 */
+
+#include <freerdp/utils/windows.h>
 #define SHUT_RDWR SD_BOTH
 #define close(_fd) closesocket(_fd)
 #endif
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
+
 #endif
 
 int freerdp_tcp_connect(const char* hostname, int port)