diff --git a/configure.ac b/configure.ac
index 3a2c6b8..7b3845c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ AC_SUBST(LFLAGS)
 
 CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
 AS_CASE([$host],
-        [*mingw*|*cygwin*], [LDFLAGS="$LDFLAGS -no-undefined"], [])
+        [*mingw*|*cygwin*], [LDFLAGS="$LDFLAGS -no-undefined -lWs2_32"], [])
 dnl Enable -Wl,--as-needed by default to prevent overlinking
 
 AC_ARG_ENABLE([as-needed],
diff --git a/include/mdbfakeglib.h b/include/mdbfakeglib.h
index 614dc68..751ae0c 100644
--- a/include/mdbfakeglib.h
+++ b/include/mdbfakeglib.h
@@ -4,6 +4,7 @@
 #include <time.h>
 #include <locale.h>
 #include <inttypes.h>
+#include <string.h>
 
 // for ntohl
 #ifdef _WIN32
diff --git a/src/libmdb/fakeglib.c b/src/libmdb/fakeglib.c
index c9e1548..525ddfc 100644
--- a/src/libmdb/fakeglib.c
+++ b/src/libmdb/fakeglib.c
@@ -1,7 +1,6 @@
 
 #include "mdbfakeglib.h"
 
-#include <string.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/src/libmdb/iconv.c b/src/libmdb/iconv.c
index 25c1fa3..34dbd17 100644
--- a/src/libmdb/iconv.c
+++ b/src/libmdb/iconv.c
@@ -23,6 +23,10 @@
 #include "dmalloc.h"
 #endif
 
+#ifndef MIN
+#define MIN(a,b) (a>b ? b : a)
+#endif
+
 /*
  * This function is used in reading text data from an MDB table.
  */