diff --git a/ChangeLog b/ChangeLog
index 99a89dc511..e2108a98c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,22 @@
+2016-01-27  Andreas Schwab  <schwab@suse.de>
+
+	* sysdeps/ieee754/ldbl-128ibm/s_erfl.c (half): Remove.
+	* sysdeps/ieee754/ldbl-128ibm/s_log1pl.c (maxlog, big): Remove.
+	* sysdeps/powerpc/fpu/s_cosf.c (one): Remove.
+	* sysdeps/powerpc/fpu/e_hypotf.c (two30): Remove.
+
 2016-01-26  David S. Miller  <davem@davemloft.net>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc32/localplt.data: Add _Q_cmp.
 
 2016-01-25  David S. Miller  <davem@davemloft.net>
 
-	* sysdeps/sparc/sparc32/Versions (GLIBC_2.23): Add entry for __sqrtl_finite.
-	* sysdeps/sparc/sparc32/fpu/e_sqrtl.c (__sqrtl_finite): Define instead using
-	versioned_symbol.
-	* sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Fix ordering of entries.
+	* sysdeps/sparc/sparc32/Versions (GLIBC_2.23): Add entry for
+	__sqrtl_finite.
+	* sysdeps/sparc/sparc32/fpu/e_sqrtl.c (__sqrtl_finite): Define
+	instead using versioned_symbol.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Fix ordering
+	of entries.
 
 	* sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist: Move
 	__sqrtl_finite to GLIBC_2.23
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_erfl.c b/sysdeps/ieee754/ldbl-128ibm/s_erfl.c
index 82d889d14e..7b761b0afa 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_erfl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_erfl.c
@@ -147,7 +147,6 @@ deval (long double x, const long double *p, int n)
 
 static const long double
 tiny = 1e-300L,
-  half = 0.5L,
   one = 1.0L,
   two = 2.0L,
   /* 2/sqrt(pi) - 1 */
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c b/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c
index ad9a1fe20f..743693bfd6 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c
@@ -117,8 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
 
 static const long double sqrth = 0.7071067811865475244008443621048490392848L;
 /* ln (2^16384 * (1 - 2^-113)) */
-static const long double maxlog = 1.1356523406294143949491931077970764891253E4L;
-static const long double big = 2e300L;
 static const long double zero = 0.0L;
 
 
diff --git a/sysdeps/powerpc/fpu/e_hypotf.c b/sysdeps/powerpc/fpu/e_hypotf.c
index c27df253e8..48360828c3 100644
--- a/sysdeps/powerpc/fpu/e_hypotf.c
+++ b/sysdeps/powerpc/fpu/e_hypotf.c
@@ -21,8 +21,6 @@
 #include <math_private.h>
 #include <stdint.h>
 
-static const float two30  = 1.0737418e09;
-
 /* __ieee754_hypotf(x,y)
 
    This a FP only version without any FP->INT conversion.
diff --git a/sysdeps/powerpc/fpu/s_cosf.c b/sysdeps/powerpc/fpu/s_cosf.c
index 2d1ec1b994..eaeaebcb12 100644
--- a/sysdeps/powerpc/fpu/s_cosf.c
+++ b/sysdeps/powerpc/fpu/s_cosf.c
@@ -21,7 +21,6 @@
 #include <math.h>
 #include <math_private.h>
 
-static const float one  = 1.0;
 static const float pio4 = 7.8539801e-1;
 
 float