diff --git a/configure.ac b/configure.ac
index 81e3a123eb..0219796958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,6 +358,7 @@ char * strerror(int n);
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
+#  define NOMINMAX
 #  define BOOST_POSIX 1
 #  define BOOST_POSIX_API 1
 #  define BOOST_POSIX_PATH 1
diff --git a/src/client/client.cpp b/src/client/client.cpp
index 8d47e347aa..5040739eac 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -47,6 +47,9 @@
 // fcntl()
 #include <fcntl.h>
 
+// strerror()
+#include <string.h>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index 6b91873e3c..762fdb0c2e 100644
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -25,6 +25,7 @@
 #include <windef.h>
 #include <shellapi.h>
 #include <shlwapi.h>
+#include <limits.h>
 
 #include <sys/cygwin.h>
 
@@ -122,7 +123,7 @@ string convert_path_list(string const & p, PathStyle const & target)
 
 } // namespace anon
 
-void os::init(int, char *[])
+void init(int, char *[])
 {
 	// Make sure that the TEMP variable is set
 	// and sync the Windows environment.