diff --git a/ChangeLog b/ChangeLog
index bd2152e58c..a911d6aee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-09-03  Joseph Myers  <joseph@codesourcery.com>
 
+	* Makefile (headers): Remove bits/libc-lock.h.
+	* libio/Makefile (headers): Remove bits/stdio-lock.h.
+
 	* libio/libio.h [_IO_MTSAFE_IO]: Remove include of
 	<bits/stdio-lock.h> and commented-out include of <comthread.h>.
 	* include/libio.h [!_ISOMAC && _IO_MTSAFE_IO]: Include
diff --git a/Makefile b/Makefile
index 658ccfa037..e07309e7a1 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ endif # $(AUTOCONF) = no
 		   subdir_objs subdir_stubs subdir_testclean		\
 		   $(addprefix install-, no-libc.a bin lib data headers others)
 
-headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
+headers := limits.h values.h features.h gnu-versions.h \
 	   bits/xopen_lim.h gnu/libc-version.h stdc-predef.h
 
 echo-headers: subdir_echo-headers
diff --git a/libio/Makefile b/libio/Makefile
index 604f4196b3..a1d1741c95 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -22,7 +22,7 @@ subdir	:= libio
 
 include ../Makeconfig
 
-headers	:= stdio.h libio.h _G_config.h bits/stdio.h bits/stdio-lock.h \
+headers	:= stdio.h libio.h _G_config.h bits/stdio.h \
 	   bits/sys_errlist.h bits/stdio2.h bits/stdio-ldbl.h bits/libio-ldbl.h
 
 routines	:=							      \