diff --git a/src/main.c b/src/main.c
index 5d02c95..80cff7c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2571,7 +2571,7 @@
 		}
 	    }
 #endif
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 	    /*
 	     * If vim is invoked by non-Cygwin tools, convert away any
 	     * DOS paths, so things like .swp files are created correctly.
diff --git a/src/os_unix.c b/src/os_unix.c
index cbd8ba8..a6f3a6c 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6341,7 +6341,7 @@
 	FD_ZERO(&wfds);
 	FD_ZERO(&efds);
 	FD_SET(fd, &rfds);
-# if !defined(__QNX__) && !defined(__CYGWIN32__)
+# ifndef __QNX__
 	// For QNX select() always returns 1 if this is set.  Why?
 	FD_SET(fd, &efds);
 # endif
diff --git a/src/pty.c b/src/pty.c
index 5f8b9e5..4c4e9e2 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -46,10 +46,6 @@
 
 #include <signal.h>
 
-#ifdef __CYGWIN32__
-# include <sys/termios.h>
-#endif
-
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
diff --git a/src/version.c b/src/version.c
index 8d0dece..3caad5f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4316,
+/**/
     4315,
 /**/
     4314,
diff --git a/src/vim.h b/src/vim.h
index 86acb6d..33d294c 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1576,10 +1576,10 @@
 #endif
 
 /*
- * EMX doesn't have a global way of making open() use binary I/O.
+ * Cygwin doesn't have a global way of making open() use binary I/O.
  * Use O_BINARY for all open() calls.
  */
-#if defined(__CYGWIN32__)
+#ifdef __CYGWIN__
 # define O_EXTRA    O_BINARY
 #else
 # define O_EXTRA    0