diff --git a/ChangeLog b/ChangeLog
index 953e51e630..a9de8e8466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-11  David Schleef  <ds@schleef.org>
+
+	* gst/tcp/gstfdset.c: Fix compile problem on OS/X.
+
 2004-08-11  David Schleef  <ds@schleef.org>
 
 	* gst/mpeg1sys/gstmpeg1systemencode.c: Oops, this was correct
diff --git a/gst/tcp/gstfdset.c b/gst/tcp/gstfdset.c
index fddfe4e342..b394cafc10 100644
--- a/gst/tcp/gstfdset.c
+++ b/gst/tcp/gstfdset.c
@@ -24,6 +24,11 @@
 #define INIT_POLLFDS	MIN_POLLFDS
 
 #include <sys/poll.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+/* OS/X needs this because of bad headers */
+#include <string.h>
 
 #include "gstfdset.h"