diff --git a/configure.ac b/configure.ac
index 452362d728..6bc8d98b20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ if test "x$GST_CVS" = "xyes"; then
 fi
 
 dnl Check for FIONREAD ioctl declaration :
-HAVE_FIONREAD()
+GST_CHECK_FIONREAD()
 
 dnl ############################################
 dnl # Super Duper options for plug-in building #
diff --git a/gst/tcp/gsttcpserversink.c b/gst/tcp/gsttcpserversink.c
index 651d775fc9..87455b67fe 100644
--- a/gst/tcp/gsttcpserversink.c
+++ b/gst/tcp/gsttcpserversink.c
@@ -24,6 +24,11 @@
 #include <gst/gst-i18n-plugin.h>
 
 #include <sys/ioctl.h>
+
+#ifdef FIONREAD_IN_SYS_FILIO
+#include <sys/filio.h>
+#endif
+
 #include "gsttcpserversink.h"
 
 #define TCP_DEFAULT_HOST	"127.0.0.1"
diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c
index 449dcb8b29..dc8cf0d1b6 100644
--- a/gst/tcp/gsttcpserversrc.c
+++ b/gst/tcp/gsttcpserversrc.c
@@ -29,6 +29,10 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
+#ifdef FIONREAD_IN_SYS_FILIO
+#include <sys/filio.h>
+#endif
+
 GST_DEBUG_CATEGORY (tcpserversrc_debug);
 #define GST_CAT_DEFAULT tcpserversrc_debug
 
diff --git a/m4/gst-fionread.m4 b/m4/gst-fionread.m4
index 820d5cea64..b96498750b 100644
--- a/m4/gst-fionread.m4
+++ b/m4/gst-fionread.m4
@@ -1,4 +1,4 @@
-AC_DEFUN([HAVE_FIONREAD], [
+AC_DEFUN([GST_CHECK_FIONREAD], [
 
   AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
   AC_CACHE_VAL(GST_FIONREAD_IN_SYS_IOCTL, [