diff --git a/ChangeLog b/ChangeLog
index ccffcd7873..b8831285a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-08-21  Andreas Jaeger  <aj@suse.de>
+
+	* include/poll.h: Include include/sys/poll.h to get __poll
+	declaration.
+
+	* io/sys/poll.h: Move __poll declaration from here...
+	* include/sys/poll.h: ...to here.
+
+	* include/sys/socket.h (__getpeername): Add declaration.
+
+	* include/wchar.h (__vswprintf): Add declaration.
+
+	* include/stdio.h (__flockfile): Add declaration.
+	(__funlockfile): Likewise.
+
 2000-08-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* misc/sys/cdefs.h: Define __restrict_arr.
diff --git a/include/poll.h b/include/poll.h
index 778488accb..75181925aa 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -1 +1 @@
-#include <io/poll.h>
+#include <include/sys/poll.h>
diff --git a/include/stdio.h b/include/stdio.h
index a4dc141275..0329fe2d1e 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -50,6 +50,12 @@ extern int __gen_tempname (char *__tmpl, int __kind);
 extern void __libc_fatal (__const char *__message)
      __attribute__ ((__noreturn__));
 
+/* Acquire ownership of STREAM.  */
+extern void __flockfile (FILE *__stream);
+
+/* Relinquish the ownership granted for STREAM.  */
+extern void __funlockfile (FILE *__stream);
+    
 # endif
 
 #endif
diff --git a/include/sys/poll.h b/include/sys/poll.h
index 5231e6845e..d7d6e013a0 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -1 +1,6 @@
-#include <io/sys/poll.h>
+#ifndef	_SYS_POLL_H
+# include <io/sys/poll.h>
+
+extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
+		   int __timeout);
+#endif
diff --git a/include/wchar.h b/include/wchar.h
index cdc4e757c3..7187d76c05 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -43,5 +43,10 @@ extern int __vfwscanf (FILE *__restrict __s,
 		       __const wchar_t *__restrict __format,
 		       __gnuc_va_list __arg)
      /* __attribute__ ((__format__ (__wscanf__, 2, 0)) */;
+extern int __vswprintf (wchar_t *__restrict __s, size_t __n,
+			__const wchar_t *__restrict __format,
+			__gnuc_va_list __arg)
+     /* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
+
 # endif
 #endif
diff --git a/io/sys/poll.h b/io/sys/poll.h
index ac9c634e9d..f4c736e74a 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -1,5 +1,5 @@
 /* Compatibility definitions for System V `poll' interface.
-   Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1994,96,97,98,99,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -41,8 +41,6 @@ struct pollfd
    an event to occur; if TIMEOUT is -1, block until an event occurs.
    Returns the number of file descriptors with events, zero if timed out,
    or -1 for errors.  */
-extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
-		   int __timeout) __THROW;
 extern int poll (struct pollfd *__fds, unsigned long int __nfds, int __timeout)
      __THROW;