Index: nbase/getaddrinfo.c
===================================================================
--- nbase/getaddrinfo.c	(revision 31741)
+++ nbase/getaddrinfo.c	(working copy)
@@ -143,7 +143,7 @@
 #include <assert.h>
 
 
-#if !defined(HAVE_GAI_STRERROR) || defined(__MINGW32__)
+#if !defined(HAVE_GAI_STRERROR)// || defined(__MINGW32__)
 #ifdef __MINGW32__
 #undef gai_strerror
 #endif
@@ -165,12 +165,12 @@
 }
 #endif
 
-#ifdef __MINGW32__
-char* WSAAPI gai_strerrorA (int errcode)
-{
-  return gai_strerror(errcode);
-}
-#endif
+//#ifdef __MINGW32__
+//char* WSAAPI gai_strerrorA (int errcode)
+//{
+//  return gai_strerror(errcode);
+//}
+//#endif
 
 #ifndef HAVE_GETADDRINFO
 void freeaddrinfo(struct addrinfo *res) {
Index: nbase/nbase_winconfig.h
===================================================================
--- nbase/nbase_winconfig.h	(revision 31741)
+++ nbase/nbase_winconfig.h	(working copy)
@@ -167,14 +167,14 @@
 // #undef HAVE_VASPRINTF
 #define HAVE_VSNPRINTF 1
 
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-typedef signed __int8 int8_t;
-typedef signed __int16 int16_t;
-typedef signed __int32 int32_t;
-typedef signed __int64 int64_t;
+//typedef unsigned __int8 uint8_t;
+//typedef unsigned __int16 uint16_t;
+//typedef unsigned __int32 uint32_t;
+//typedef unsigned __int64 uint64_t;
+//typedef signed __int8 int8_t;
+//typedef signed __int16 int16_t;
+//typedef signed __int32 int32_t;
+//typedef signed __int64 int64_t;
 
 #define HAVE_IPV6 1
 #define HAVE_AF_INET6 1
Index: nbase/nbase_winunix.h
===================================================================
--- nbase/nbase_winunix.h	(revision 31741)
+++ nbase/nbase_winunix.h	(working copy)
@@ -186,7 +186,7 @@
 #include <sys/types.h>
 #include <process.h>
 #include <limits.h>
-#include <WINCRYPT.H>
+//#include <WINCRYPT.H>
 #include <math.h>
Index: ncat/ncat_ssl.c
===================================================================
--- ncat/ncat_ssl.c	(revision 31741)
+++ ncat/ncat_ssl.c	(working copy)
@@ -136,7 +136,7 @@
 /* Required for windows compilation to Eliminate APPLINK errors.
    See http://www.openssl.org/support/faq.html#PROG2 */
 #ifdef WIN32
-#include <openssl/applink.c>
+//#include <openssl/applink.c>
 #endif
 
 static SSL_CTX *sslctx;
Index: ncat/sys_wrap.h
===================================================================
--- ncat/sys_wrap.h	(revision 31741)
+++ ncat/sys_wrap.h	(working copy)
@@ -144,7 +144,7 @@
 #define socklen_t int
 #define uint16_t int
 #define ssize_t int
-#include <WinDef.h>
+#include <windef.h>
 #endif
 
 #include <sys/stat.h>
Index: nsock/src/netutils.c
===================================================================
--- nsock/src/netutils.c	(revision 31741)
+++ nsock/src/netutils.c	(working copy)
@@ -60,7 +60,7 @@
 #include "error.h"
 
 #if WIN32
-#include "Winsock2.h"
+#include "winsock2.h"
 #endif
 
 #if HAVE_SYS_TIME_H
Index: nsock/src/nsock_internal.h
===================================================================
--- nsock/src/nsock_internal.h	(revision 31741)
+++ nsock/src/nsock_internal.h	(working copy)
@@ -69,7 +69,7 @@
 
 #ifdef WIN32
 #include "nbase_winconfig.h"
-#include <Winsock2.h>
+#include <winsock2.h>
 #endif
 
 #include "gh_list.h"