diff --git a/ChangeLog b/ChangeLog
index 130ea8276a..5117372ad8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/posix/spawni.c: Include <signal.h>.
+	* sysdeps/pthread/aio_cancel.c: Include <fcntl.h>.
+	* sysdeps/pthread/aio_fsync.c: Likewise.
+
 2012-02-26  Ulrich Drepper  <drepper@gmail.com>
 
 	* conform/Makefile (tests): Run only when not cross-compiling and
diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index 11a74b53b3..abbf956226 100644
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -1,5 +1,5 @@
 /* Guts of POSIX spawn interface.  Generic POSIX.1 version.
-   Copyright (C) 2000-2005, 2006, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2000-2005, 2006, 2011, 2012 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
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <signal.h>
 #include <sys/resource.h>
 #include "spawn_int.h"
 #include <not-cancel.h>
diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c
index b160f556a7..e405e66cdf 100644
--- a/sysdeps/pthread/aio_cancel.c
+++ b/sysdeps/pthread/aio_cancel.c
@@ -1,5 +1,5 @@
 /* Cancel requests associated with given file descriptor.
-   Copyright (C) 1997, 1998, 2000, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2002, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -32,6 +32,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #include <aio_misc.h>
 
diff --git a/sysdeps/pthread/aio_fsync.c b/sysdeps/pthread/aio_fsync.c
index 1fc39b9ac8..046e25c171 100644
--- a/sysdeps/pthread/aio_fsync.c
+++ b/sysdeps/pthread/aio_fsync.c
@@ -1,5 +1,5 @@
 /* Synchronize I/O in given file descriptor.
-   Copyright (C) 1997, 1999, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2002, 2005, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -28,6 +28,7 @@
 /* And undo the hack.  */
 #undef aio_fsync64
 #include <errno.h>
+#include <fcntl.h>
 
 #include <aio_misc.h>