3 files changed, 11 insertions, 2 deletions
diff --git a/newlib/libc/include/grp.h b/newlib/libc/include/grp.h
index 2e676f366..e652b29f2 100644
--- a/newlib/libc/include/grp.h
+++ b/newlib/libc/include/grp.h
@@ -44,6 +44,9 @@
 #define	_GRP_H_
 
 #include <sys/types.h>
+#ifdef __CYGWIN__
+#include <cygwin/grp.h>
+#endif
 
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	_PATH_GROUP		"/etc/group"
@@ -56,7 +59,6 @@ struct group {
 	char	**gr_mem;		/* group members */
 };
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index bca437707..3ef2291c8 100644
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -22,6 +22,9 @@ extern "C" {
    sizes of any of the basic types change (short, int, long) [via a compile
    time option].  */
 
+#ifdef __CYGWIN__
+#include <cygwin/stat.h>
+#else
 struct	stat 
 {
   dev_t		st_dev;
@@ -49,6 +52,7 @@ struct	stat
   long	st_spare4[2];
 #endif
 };
+#endif
 
 #define	_IFMT		0170000	/* type of file */
 #define		_IFDIR	0040000	/* directory */
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 96d25c4a0..2a12e4e34 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -128,10 +128,13 @@ typedef unsigned long long dev_t;
 typedef	short	dev_t;
 #endif
 
-typedef	long	off_t;
+#ifndef __CYGWIN__	/* which defines these types in it's own types.h. */
+typedef long		off_t;
 
 typedef	unsigned short	uid_t;
 typedef	unsigned short	gid_t;
+#endif
+
 typedef int pid_t;
 typedef	long key_t;
 typedef long ssize_t;