diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 63d67ab796d..6bf65e03c76 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1248,12 +1248,12 @@ float_fromhex(PyObject *cls, PyObject *arg)
 		s++;
 
 	/* infinities and nans */
-	if (PyOS_mystrnicmp(s, "nan", 4) == 0) {
+	if (PyOS_strnicmp(s, "nan", 4) == 0) {
 		x = Py_NAN;
 		goto finished;
 	}
-	if (PyOS_mystrnicmp(s, "inf", 4) == 0 ||
-	    PyOS_mystrnicmp(s, "infinity", 9) == 0) {
+	if (PyOS_strnicmp(s, "inf", 4) == 0 ||
+	    PyOS_strnicmp(s, "infinity", 9) == 0) {
 		x = sign*Py_HUGE_VAL;
 		goto finished;
 	}
diff --git a/Python/pymath.c b/Python/pymath.c
index 7c0010675a3..5cf61ab74c6 100644
--- a/Python/pymath.c
+++ b/Python/pymath.c
@@ -35,6 +35,8 @@ copysign(double x, double y)
 #endif /* HAVE_COPYSIGN */
 
 #ifndef HAVE_LOG1P
+#include <float.h>
+
 double
 log1p(double x)
 {