diff --git a/src/http.cpp b/src/http.cpp
index 4327deb4..75bdab02 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -22,9 +22,8 @@
  * http.cpp
  */
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)
 #include <winsock2.h>
-#pragma comment(lib, "ws2_32.lib")
 #endif
 
 // included header files
@@ -52,9 +51,8 @@
 // platform specific code
 #if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
 #include <string.h>
-#include <windows.h>
 #include <io.h>
-#ifndef  __MINGW__
+#if !defined(__MINGW__) && !defined(__CYGWIN__)
 #define  snprintf sprintf_s
 #define  write    _write
 #define  read     _read
@@ -210,7 +208,7 @@ int Exiv2::http(Exiv2::Dictionary& request,Exiv2::Dictionary& response,std::stri
 
     ////////////////////////////////////
     // Windows specific code
-#ifdef WIN32
+#if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__) || defined(__CYGWIN__)
     WSADATA wsaData;
     WSAStartup(MAKEWORD(2,2), &wsaData);
 #endif