diff --git a/Include/pyport.h b/Include/pyport.h
index 1adb5f0d020..9df74ce9895 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -295,6 +295,10 @@ typedef Py_intptr_t	Py_ssize_t;
 
 #include <stdlib.h>
 
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>  /* needed for 'finite' declaration on some platforms */
+#endif
+
 #include <math.h> /* Moved here from the math section, before extern "C" */
 
 /********************************************
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index e5e07c1b6aa..562e41f6f98 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -8,10 +8,6 @@
 #include "Python.h"
 #include "structmember.h"
 
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
 /* elementary operations on complex numbers */
 
 static Py_complex c_1 = {1., 0.};
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index ff5c0f6a699..b281f815dc7 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -15,10 +15,6 @@
 #define MAX(x, y) ((x) < (y) ? (y) : (x))
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
 
 #ifdef _OSF_SOURCE
 /* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */