diff --git a/configure.ac b/configure.ac
index fc715e50d9..1a748879c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1750,6 +1750,7 @@ sys/prctl.h \
 sys/resource.h \
 sys/timerfd.h \
 sys/un.h \
+ieeefp.h \
 ],[],[],
 [
  #ifdef HAVE_SYS_SOCKET_H
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 5a011a43c6..0ee0eb69ad 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -11,13 +11,9 @@
 # endif
 #endif
 
-#ifdef __SUNPRO_C
-# include <ieeefp.h>
-# include <string.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <math.h>
 #include <sys/types.h>
@@ -29,6 +25,10 @@
 # include <systemd/sd-daemon.h>
 #endif
 
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h> /* for Solaris */
+#endif
+
 #ifdef _MSC_VER
 # include <float.h>
 #endif
diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c
index 94319b62e2..7ac69640a8 100644
--- a/src/lib/ecore/ecore_pipe.c
+++ b/src/lib/ecore/ecore_pipe.c
@@ -7,8 +7,8 @@
 #include <errno.h>
 #include <math.h>
 
-#ifdef __SUNPRO_C
-# include <ieeefp.h>
+#ifdef HAVE_IEEEFP_H
+# include <ieeefp.h> /* for Solaris */
 #endif
 
 #ifdef HAVE_ISFINITE