diff --git a/ChangeLog b/ChangeLog
index f636bc0c6e..87f079da8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-08-09  Joseph Myers  <joseph@codesourcery.com>
 
+	* posix/bits/types.h (__qaddr_t): Remove.
+
 	[BZ #21457]
 	* sysdeps/arm/sys/ucontext.h (__ctx): Move undefine further down.
 	(ucontext_t): Use __ctx with uc_flags.  Rename uc_filler to
diff --git a/posix/bits/types.h b/posix/bits/types.h
index e2f73a89e4..2f37478018 100644
--- a/posix/bits/types.h
+++ b/posix/bits/types.h
@@ -188,7 +188,6 @@ __STD_TYPE __SYSCALL_ULONG_TYPE __syscall_ulong_t;
 /* These few don't really vary by system, they always correspond
    to one of the other defined types.  */
 typedef __off64_t __loff_t;	/* Type of file sizes and offsets (LFS).  */
-typedef __quad_t *__qaddr_t;
 typedef char *__caddr_t;
 
 /* Duplicates info from stdint.h but this is used in unistd.h.  */