7 files changed, 14 insertions, 31 deletions
diff --git a/newlib/libc/sys/linux/sys/cdefs.h b/newlib/libc/sys/linux/sys/cdefs.h
index f6ea0c73e..459785bcb 100644
--- a/newlib/libc/sys/linux/sys/cdefs.h
+++ b/newlib/libc/sys/linux/sys/cdefs.h
@@ -227,12 +227,4 @@
 # endif
 #endif
 
-/* The nonull function attribute allows to mark pointer parameters which
-   must not be NULL.  */
-#if __GNUC_PREREQ (3,3)
-# define __nonnull(params) __attribute__ ((__nonnull__ params))
-#else
-# define __nonnull(params)
-#endif
-
 #endif	 /* sys/cdefs.h */
diff --git a/newlib/libc/sys/linux/sys/dirent.h b/newlib/libc/sys/linux/sys/dirent.h
index 4bbae4229..083158eb3 100644
--- a/newlib/libc/sys/linux/sys/dirent.h
+++ b/newlib/libc/sys/linux/sys/dirent.h
@@ -41,7 +41,6 @@ int closedir(DIR *);
 
 /* internal prototype */
 void _seekdir(DIR *dir,off_t offset);
-DIR *_opendir(const char *);
 
 #ifndef _POSIX_SOURCE
 long telldir (DIR *);
diff --git a/newlib/libc/sys/linux/sys/lock.h b/newlib/libc/sys/linux/sys/lock.h
index d934031e2..167392e10 100644
--- a/newlib/libc/sys/linux/sys/lock.h
+++ b/newlib/libc/sys/linux/sys/lock.h
@@ -1,6 +1,7 @@
 #ifndef __SYS_LOCK_H__
 #define __SYS_LOCK_H__
 
+#include <machine/weakalias.h>
 #include <features.h>
 
 #define  _LIBC  1
diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h
index 99da598ba..7bc06f7ae 100644
--- a/newlib/libc/sys/linux/sys/stat.h
+++ b/newlib/libc/sys/linux/sys/stat.h
@@ -7,15 +7,14 @@
 #define _SYS_STAT_H
 
 #include <asm/stat.h>
-#include <_ansi.h>
-#include <sys/types.h>
-#include <linux/time.h>
 #define __KERNEL__
 #include <linux/stat.h>
 #undef __KERNEL__
 
 /* --- redundant stuff below --- */
 
+#include <_ansi.h>
+#include <sys/types.h>
 
 int     _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
 int     _EXFUN(mkdir,( const char *_path, mode_t __mode ));
@@ -24,10 +23,10 @@ int     _EXFUN(stat,( const char *__path, struct stat *__sbuf ));
 mode_t  _EXFUN(umask,( mode_t __mask ));
 
 #ifndef _POSIX_SOURCE
-int     _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf ));
-int	_EXFUN(lstat,( const char *file_name, struct stat64 *buf));
-int	_EXFUN(lstat64,( const char *file_name, struct stat64 *buf));
-int     _EXFUN(stat64,( const char *__path, struct stat64 *__sbuf ));
+int     _EXFUN(fstat64,( int __fd, struct stat *__sbuf ));
+int	_EXFUN(lstat,( const char *file_name, struct stat *buf));
+int	_EXFUN(lstat64,( const char *file_name, struct stat *buf));
+int     _EXFUN(stat64,( const char *__path, struct stat *__sbuf ));
 #endif /* _POSIX_SOURCE */
 
 #endif /* _SYS_STAT_H */
diff --git a/newlib/libc/sys/linux/sys/string.h b/newlib/libc/sys/linux/sys/string.h
deleted file mode 100644
index 25489caea..000000000
--- a/newlib/libc/sys/linux/sys/string.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SYS_STRING_H
-#define _SYS_STRING_H
-
-#ifndef __STRICT_ANSI__
-char    *_EXFUN(strsignal, (int __signo));
-#endif
-
-#endif /* _SYS_STRING_H */
diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h
index ba191f072..47f49087a 100644
--- a/newlib/libc/sys/linux/sys/types.h
+++ b/newlib/libc/sys/linux/sys/types.h
@@ -50,8 +50,8 @@
  * libc/include/sys/types.h.  Repeat those here and
  * skip the kernel's definitions. */
 
-#include <sys/config.h>
 #include <features.h>
+#include <sys/config.h>
 #include <machine/types.h>
 #include <sys/_types.h>
 
@@ -166,7 +166,6 @@ typedef __uint8_t u_int8_t;
 typedef __uint16_t u_int16_t;
 typedef __uint32_t u_int32_t;
 typedef __uint64_t u_int64_t;
-typedef __int8_t int8_t;
 typedef __int16_t int16_t;
 typedef __int32_t int32_t;
 typedef __int64_t int64_t;
diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h
index 502fb473a..dd3f0f7ea 100644
--- a/newlib/libc/sys/linux/sys/unistd.h
+++ b/newlib/libc/sys/linux/sys/unistd.h
@@ -29,6 +29,9 @@ char    _EXFUN(*ctermid, (char *__s ));
 char    _EXFUN(*cuserid, (char *__s ));
 int     _EXFUN(dup, (int __fildes ));
 int     _EXFUN(dup2, (int __fildes, int __fildes2 ));
+#if defined(__CYGWIN__)
+void	_EXFUN(endusershell, (void));
+#endif
 int     _EXFUN(execl, (const char *__path, const char *, ... ));
 int     _EXFUN(execle, (const char *__path, const char *, ... ));
 int     _EXFUN(execlp, (const char *__file, const char *, ... ));
@@ -41,7 +44,6 @@ int     _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
 pid_t   _EXFUN(fork, (void ));
 long    _EXFUN(fpathconf, (int __fd, int __name ));
 int     _EXFUN(fsync, (int __fd));
-int     _EXFUN(ftruncate, (int __fd, off_t __length));
 char    _EXFUN(*getcwd, (char *__buf, size_t __size ));
 int	_EXFUN(getdomainname ,(char *__name, size_t __len));
 gid_t   _EXFUN(getegid, (void ));
@@ -68,11 +70,13 @@ int	_EXFUN(nice, (int __nice_value ));
 off_t   _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
 long    _EXFUN(pathconf, (const char *__path, int __name ));
 int     _EXFUN(pause, (void ));
+#ifdef __CYGWIN__
+int	_EXFUN(pthread_atfork, (void (*)(void), void (*)(void), void (*)(void)));
+#endif
 int     _EXFUN(pipe, (int __fildes[2] ));
 ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
 ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
 _READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
-int     _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
 int     _EXFUN(rmdir, (const char *__path ));
 void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
 int     _EXFUN(setegid, (gid_t __gid ));
@@ -84,15 +88,12 @@ pid_t   _EXFUN(setsid, (void ));
 int     _EXFUN(setuid, (uid_t __uid ));
 unsigned _EXFUN(sleep, (unsigned int __seconds ));
 void    _EXFUN(swab, (const void *, void *, ssize_t));
-int     _EXFUN(symlink, (const char *oldpath, const char *newpath));
 long    _EXFUN(sysconf, (int __name ));
 pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
 int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
-int     _EXFUN(truncate, (const char *, off_t __length));
 char *  _EXFUN(ttyname, (int __fildes ));
 int     _EXFUN(ttyname_r, (int __fildes, char *__buf, size_t __len));
 int     _EXFUN(unlink, (const char *__path ));
-int     _EXFUN(usleep, (__useconds_t __useconds));
 int     _EXFUN(vhangup, (void ));
 _READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));