2 files changed, 2 insertions, 11 deletions
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 270be89aa..8879ee67d 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -126,7 +126,9 @@ int     _EXFUN(vhangup, (void ));
 _READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
 
 #ifdef __CYGWIN__
+# define __UNISTD_GETOPT__
 # include <getopt.h>
+# undef __UNISTD_GETOPT__
 #else
 extern char *optarg;			/* getopt(3) external variables */
 extern int optind, opterr, optopt;
diff --git a/newlib/libc/sys/cygwin/include/unistd.h b/newlib/libc/sys/cygwin/include/unistd.h
deleted file mode 100644
index 9818176b9..000000000
--- a/newlib/libc/sys/cygwin/include/unistd.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* unistd.h for Cygwin. */
-
-#ifndef _UNISTD_H_
-#define _UNISTD_H_
-
-# include <sys/unistd.h>
-# define __UNISTD_GETOPT__
-# include <getopt.h>
-# undef __UNISTD_GETOPT__
-
-#endif /* _UNISTD_H_ */