diff --git a/ChangeLog b/ChangeLog
index b64ed0571d..05a8d8eab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-07  Joseph Myers  <joseph@codesourcery.com>
+
+	* misc/sys/cdefs.h (__long_double_t): Remove.
+	* stdio-common/printf_fp.c (__printf_fp_l): Use long double
+	instead of __long_double_t,
+	* stdlib/strfmon_l.c (__vstrfmon_l): Likewise.
+
 2017-08-07  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
 	* benchtests/scripts/compare_strings.py: Avoid display error when
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 06523bfe9c..b3e7f3be96 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -102,7 +102,6 @@
 
 /* This is not a typedef so `const __ptr_t' does the right thing.  */
 #define __ptr_t void *
-#define __long_double_t  long double
 
 
 /* C++ needs to know that types and declarations are C, not C++.  */
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 514b698d27..3ed4037ba5 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -217,7 +217,7 @@ __printf_fp_l (FILE *fp, locale_t loc,
   union
     {
       double dbl;
-      __long_double_t ldbl;
+      long double ldbl;
 #if __HAVE_DISTINCT_FLOAT128
       _Float128 f128;
 #endif
diff --git a/stdlib/strfmon_l.c b/stdlib/strfmon_l.c
index 69ca9d5d3b..98554dfe80 100644
--- a/stdlib/strfmon_l.c
+++ b/stdlib/strfmon_l.c
@@ -100,7 +100,7 @@ __vstrfmon_l (char *s, size_t maxsize, locale_t loc, const char *format,
       union
       {
 	double dbl;
-	__long_double_t ldbl;
+	long double ldbl;
       }
       fpnum;
       int int_format;