diff --git a/ChangeLog b/ChangeLog
index d6386e2cd2..e9eed7ca2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-11  Joseph Myers  <joseph@codesourcery.com>
 
+	* include/cpio.h: New file.
+	* include/fmtmsg.h: Likewise.
+
 	* tst-mbswcs1.c (show): Use %zu format instead of %Zd.  Cast
 	corresponding format argument to size_t.
 	* tst-mbswcs2.c (show): Likewise.  Use %td format for ptrdiff_t
diff --git a/include/cpio.h b/include/cpio.h
new file mode 100644
index 0000000000..38e2ed1b62
--- /dev/null
+++ b/include/cpio.h
@@ -0,0 +1 @@
+#include <posix/cpio.h>
diff --git a/include/fmtmsg.h b/include/fmtmsg.h
new file mode 100644
index 0000000000..6ac606df2b
--- /dev/null
+++ b/include/fmtmsg.h
@@ -0,0 +1 @@
+#include <stdlib/fmtmsg.h>