diff --git a/src/math/logb.c b/src/math/logb.c
index f7cd7613069bc172c345bada309a3151a016cfab..624425a81165b219a973dee4c3d0f6cbe2c3c43c 100644
--- a/src/math/logb.c
+++ b/src/math/logb.c
@@ -1,20 +1,17 @@
-#include <limits.h>
 #include "libm.h"
 
 /*
 special cases:
-	logb(+-0) = -inf
+	logb(+-0) = -inf, and raise divbyzero
 	logb(+-inf) = +inf
 	logb(nan) = nan
-these are calculated at runtime to raise fp exceptions
 */
 
-double logb(double x) {
-	int i = ilogb(x);
-
-	if (i == FP_ILOGB0)
-		return -1.0/fabs(x);
-	if (i == FP_ILOGBNAN || i == INT_MAX)
+double logb(double x)
+{
+	if (!isfinite(x))
 		return x * x;
-	return i;
+	if (x == 0)
+		return -1/(x+0);
+	return ilogb(x);
 }
diff --git a/src/math/logbf.c b/src/math/logbf.c
index 934827f885b7e388eacce766cdd30090fc329487..950d35697bbe4abaa9a0ac83b70d5dbf6229359b 100644
--- a/src/math/logbf.c
+++ b/src/math/logbf.c
@@ -1,12 +1,10 @@
-#include <limits.h>
 #include "libm.h"
 
-float logbf(float x) {
-	int i = ilogbf(x);
-
-	if (i == FP_ILOGB0)
-		return -1.0f/fabsf(x);
-	if (i == FP_ILOGBNAN || i == INT_MAX)
+float logbf(float x)
+{
+	if (!isfinite(x))
 		return x * x;
-	return i;
+	if (x == 0)
+		return -1/(x+0);
+	return ilogbf(x);
 }
diff --git a/src/math/logbl.c b/src/math/logbl.c
index 5d04abd764404dbb166ae01d18c25cba9b07d679..f3850745812bcfdc797603502d188bf4245b9c10 100644
--- a/src/math/logbl.c
+++ b/src/math/logbl.c
@@ -1,4 +1,3 @@
-#include <limits.h>
 #include "libm.h"
 #if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024
 long double logbl(long double x)
@@ -8,12 +7,10 @@ long double logbl(long double x)
 #else
 long double logbl(long double x)
 {
-	int i = ilogbl(x);
-
-	if (i == FP_ILOGB0)
-		return -1.0/fabsl(x);
-	if (i == FP_ILOGBNAN || i == INT_MAX)
+	if (!isfinite(x))
 		return x * x;
-	return i;
+	if (x == 0)
+		return -1/(x+0);
+	return ilogbl(x);
 }
 #endif