diff --git a/ChangeLog b/ChangeLog
index 84712856a7..ee0a822daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-17  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* libio/fileops.c: Add missing sys/mman.h
+	* libio/iopopen.c: Add missing fcntl.h, remove redundant unistd.h
+
 2015-02-17  Joseph Myers  <joseph@codesourcery.com>
 
 	* manual/math.texi (Errors in Math Functions): Clarify goals
diff --git a/libio/fileops.c b/libio/fileops.c
index b997e4bc55..297b4784cc 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -32,6 +32,7 @@
 #include "libioP.h"
 #include <assert.h>
 #include <fcntl.h>
+#include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libio/iopopen.c b/libio/iopopen.c
index ac3948524a..53da776d86 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -29,11 +29,11 @@
 # define _POSIX_SOURCE
 #endif
 #include "libioP.h"
+#include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
 #ifdef _LIBC
-# include <unistd.h>
 # include <shlib-compat.h>
 # include <not-cancel.h>
 #endif