diff --git a/headers/cpp/cmath b/headers/cpp/cmath
index b18ea0b428..6ba8438007 100644
--- a/headers/cpp/cmath
+++ b/headers/cpp/cmath
@@ -73,4 +73,114 @@ inline long double abs (long double x) { return fabs (x); }
 
 } // extern "C++"
 
+// These are possible macros imported from C99-land.
+#undef fpclassify
+#undef isfinite
+#undef isinf
+#undef isnan
+#undef isnormal
+#undef signbit
+#undef isgreater
+#undef isgreaterequal
+#undef isless
+#undef islessequal
+#undef islessgreater
+#undef isunordered
+
+namespace std
+{
+  inline int fpclassify(float __x) { return __fpclassifyf(__x); }
+  inline int fpclassify(double __x) { return __fpclassify(__x); }
+  inline int fpclassify(long double __x) { return __fpclassifyl(__x); }
+
+  inline bool isfinite(float __x) { return __finitef(__x); }
+  inline bool isfinite(double __x) { return __finite(__x); }
+  inline bool isfinite(long double __x) { return __finitel(__x); }
+
+  inline bool isinf(float __x) { return __isinff(__x); }
+  inline bool isinf(double __x) { return __isinf(__x); }
+  inline bool isinf(long double __x) { return __isinfl(__x); }
+
+  inline bool isnan(float __x) { return __isnanf(__x); }
+  inline bool isnan(double __x) { return __isnan(__x); }
+  inline bool isnan(long double __x) { return __isnanl(__x); }
+
+  inline bool isnormal(float __x) { return __fpclassifyf(__x) == FP_NORMAL; }
+  inline bool isnormal(double __x) { return __fpclassify(__x) == FP_NORMAL; }
+  inline bool isnormal(long double __x) { return __fpclassifyl(__x) == FP_NORMAL; }
+
+  inline bool signbit(float __x) { return __signbitf(__x); }
+  inline bool signbit(double __x) { return __signbit(__x); }
+  inline bool signbit(long double __x) { return __signbitl(__x); }
+
+#undef _wrap_expr_typeof
+	#define _wrap_expr_typeof(x, y, body) ({	\
+		__typeof(x) X = (x);					\
+		__typeof(y) Y = (y);					\
+		return (body);})
+
+  inline bool isgreater(float __x, float __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X > Y);
+  };
+  inline bool isgreater(double __x, double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X > Y);
+  };
+  inline bool isgreater(long double __x, long double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X > Y);
+  };
+
+  inline bool isgreaterequal(float __x, float __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X >= Y);
+  };
+  inline bool isgreaterequal(double __x, double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X >= Y);
+  };
+  inline bool isgreaterequal(long double __x, long double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X >= Y);
+  };
+
+  inline bool isless(float __x, float __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X < Y);
+  };
+  inline bool isless(double __x, double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X < Y);
+  };
+  inline bool isless(long double __x, long double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X < Y);
+  };
+
+  inline bool islessequal(float __x, float __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X <= Y);
+  };
+  inline bool islessequal(double __x, double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X <= Y);
+  };
+  inline bool islessequal(long double __x, long double __y) {
+    _wrap_expr_typeof(__x, __y, !isnan(X) && !isnan(Y) && X <= Y);
+  };
+
+  inline bool islessgeater(float __x, float __y) {
+    _wrap_expr_typeof(__x, __y, X < Y || Y < X);
+  };
+  inline bool islessgreater(double __x, double __y) {
+    _wrap_expr_typeof(__x, __y, X < Y || Y < X);
+  };
+  inline bool islessgreater(long double __x, long double __y) {
+    _wrap_expr_typeof(__x, __y, X < Y || Y < X);
+  };
+
+  inline bool isunordered(float __x, float __y) {
+    _wrap_expr_typeof(__x, __y, isnan(X) || isnan(Y));
+  };
+  inline bool isunordered(double __x, double __y) {
+    _wrap_expr_typeof(__x, __y, isnan(X) || isnan(Y));
+  };
+  inline bool isunordered(long double __x, long double __y) {
+    _wrap_expr_typeof(__x, __y, isnan(X) || isnan(Y));
+  };
+
+#undef _wrap_expr_typeof
+
+} // namespace
+
 #endif
diff --git a/src/system/libroot/posix/glibc/math/bits/mathcalls.h b/src/system/libroot/posix/glibc/math/bits/mathcalls.h
index c1181f737c..a5773cddd6 100644
--- a/src/system/libroot/posix/glibc/math/bits/mathcalls.h
+++ b/src/system/libroot/posix/glibc/math/bits/mathcalls.h
@@ -179,9 +179,12 @@ __MATHDECL_1 (int,__isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
 __MATHDECL_1 (int,__finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
 
 #ifdef __USE_MISC
+
+#ifndef __cplusplus
 /* Return 0 if VALUE is finite or NaN, +1 if it
    is +Infinity, -1 if it is -Infinity.  */
 __MATHDECL_1 (int,isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
+#endif
 
 /* Return nonzero if VALUE is finite and not NaN.  */
 __MATHDECL_1 (int,finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
@@ -209,8 +212,11 @@ __MATHCALLX (nan,, (__const char *__tagb), (__const__));
 __MATHDECL_1 (int,__isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
 
 #if defined __USE_MISC || defined __USE_XOPEN
+
+#ifndef __cplusplus
 /* Return nonzero if VALUE is not a number.  */
 __MATHDECL_1 (int,isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
+#endif
 
 /* Bessel functions.  */
 __MATHCALL (j0,, (_Mdouble_));