diff --git a/ChangeLog b/ChangeLog
index 1a14fdfab6..831c876b6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-10-31  Carlos O'Donell  <carlos@redhat.com>
+
+	[Bz #20729]
+	* locale/weight.h: Include libc-internal.h.
+	* locale/weightwc.h: Likewise.
+	* nptl/nptl_dbP.h: Likewise.
+
 2016-10-31  Brent W. Baccala  <cosine@freesoft.org>
 
 	* sysdeps/mach/hurd/dl-sysdep.c (__mmap): Do not deallocate memobj_wr
@@ -16,7 +23,7 @@
 	[BZ #20729]
 	* include/libc-internal.h (DIAG_IGNORE_Os_NEEDS_COMMENT):
 	Define.
-	* iso-2022-cn-ext.c: Include libc-internal.h and ignore
+	* iconvdata/iso-2022-cn-ext.c: Include libc-internal.h and ignore
 	-Wmaybe-uninitialized for BODY macro only for -Os compiles.
 	* locale/weight.h (findix): Ignore -Wmaybe-uninitialized error
 	for seq2.back_us and seq1.back_us only for -Os compiles.
diff --git a/locale/weight.h b/locale/weight.h
index 1f61f01e1e..19b8e4a2df 100644
--- a/locale/weight.h
+++ b/locale/weight.h
@@ -19,6 +19,8 @@
 #ifndef _WEIGHT_H_
 #define _WEIGHT_H_	1
 
+#include <libc-internal.h>
+
 /* Find index of weight.  */
 static inline int32_t __attribute__ ((always_inline))
 findidx (const int32_t *table,
diff --git a/locale/weightwc.h b/locale/weightwc.h
index e42ce13241..ae189658eb 100644
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -19,6 +19,8 @@
 #ifndef _WEIGHTWC_H_
 #define _WEIGHTWC_H_	1
 
+#include <libc-internal.h>
+
 /* Find index of weight.  */
 static inline int32_t __attribute__ ((always_inline))
 findidx (const int32_t *table,
diff --git a/nptl_db/thread_dbP.h b/nptl_db/thread_dbP.h
index b53f1c1def..f448547cd3 100644
--- a/nptl_db/thread_dbP.h
+++ b/nptl_db/thread_dbP.h
@@ -30,6 +30,7 @@
 #include "../nptl/pthreadP.h"  	/* This is for *_BITMASK only.  */
 #include <list.h>
 #include <gnu/lib-names.h>
+#include <libc-internal.h>
 
 /* Indeces for the symbol names.  */
 enum