diff --git a/include/chibi/features.h b/include/chibi/features.h
index eabd97db..d867019f 100644
--- a/include/chibi/features.h
+++ b/include/chibi/features.h
@@ -739,6 +739,10 @@
 #define isinf(x) (isInf(x,1) || isInf(x,-1))
 #define isnan(x) isNaN(x)
 #elif defined(_WIN32)
+#ifdef __MINGW32__
+#include <shlwapi.h>
+#define strcasestr StrStrI
+#else
 #define snprintf(buf, len, fmt, val) sprintf(buf, fmt, val)
 #define strcasecmp lstrcmpi
 #define strncasecmp(s1, s2, n) lstrcmpi(s1, s2)
@@ -747,6 +751,7 @@
 #define isnan(x) (x!=x)
 #define isinf(x) (x > DBL_MAX || x < -DBL_MAX)
 #endif
+#endif
 
 #ifdef _WIN32
 #define sexp_pos_infinity (DBL_MAX*DBL_MAX)
diff --git a/include/chibi/sexp.h b/include/chibi/sexp.h
index 55cdf8ce..d67b3ccd 100755
--- a/include/chibi/sexp.h
+++ b/include/chibi/sexp.h
@@ -65,7 +65,9 @@ typedef unsigned long size_t;
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#if !(defined _WIN32) || defined(__CYGWIN__)
 #include <sys/socket.h>
+#endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <math.h>