diff --git a/ChangeLog b/ChangeLog
index ebe1641cb3..a43569336d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-10-02  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/ieee754/dbl-64/s_atan.c: Include <libm-alias-double.h>.
+	(atan): Define using libm_alias_double.
+	* sysdeps/ieee754/dbl-64/s_tan.c: Include <libm-alias-double.h>.
+	(tan): Define using libm_alias_double.
+	* sysdeps/ieee754/ldbl-opt/s_atan.c: Remove file.
+	* sysdeps/ieee754/ldbl-opt/s_tan.c: Likewise.
+
 	* sysdeps/ieee754/dbl-64/s_atan.c (atan): Rename to __atan and
 	define as weak alias of __atan.  Do not define any aliases if
 	[__atan].
diff --git a/sysdeps/ieee754/dbl-64/s_atan.c b/sysdeps/ieee754/dbl-64/s_atan.c
index fdc3bf7e25..ca04bb0991 100644
--- a/sysdeps/ieee754/dbl-64/s_atan.c
+++ b/sysdeps/ieee754/dbl-64/s_atan.c
@@ -43,6 +43,7 @@
 #include "atnat.h"
 #include <fenv.h>
 #include <float.h>
+#include <libm-alias-double.h>
 #include <math.h>
 #include <math_private.h>
 #include <stap-probe.h>
@@ -324,9 +325,5 @@ atanMp (double x, const int pr[])
 }
 
 #ifndef __atan
-weak_alias (__atan, atan)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__atan, __atanl)
-weak_alias (__atanl, atanl)
-# endif
+libm_alias_double (__atan, atan)
 #endif
diff --git a/sysdeps/ieee754/dbl-64/s_tan.c b/sysdeps/ieee754/dbl-64/s_tan.c
index feec826237..24f6a9f1e6 100644
--- a/sysdeps/ieee754/dbl-64/s_tan.c
+++ b/sysdeps/ieee754/dbl-64/s_tan.c
@@ -41,6 +41,7 @@
 #include "MathLib.h"
 #include <math.h>
 #include <math_private.h>
+#include <libm-alias-double.h>
 #include <fenv.h>
 #include <stap-probe.h>
 
@@ -844,9 +845,5 @@ tanMp (double x)
 }
 
 #ifndef __tan
-weak_alias (__tan, tan)
-# ifdef NO_LONG_DOUBLE
-strong_alias (__tan, __tanl)
-weak_alias (__tanl, tanl)
-# endif
+libm_alias_double (__tan, tan)
 #endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_atan.c b/sysdeps/ieee754/ldbl-opt/s_atan.c
deleted file mode 100644
index 5fbd5e62d6..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_atan.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_atan.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, atan, atanl, GLIBC_2_0);
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_tan.c b/sysdeps/ieee754/ldbl-opt/s_tan.c
deleted file mode 100644
index 6b0fec0063..0000000000
--- a/sysdeps/ieee754/ldbl-opt/s_tan.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/s_tan.c>
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, tan, tanl, GLIBC_2_0);
-#endif