diff --git a/ChangeLog b/ChangeLog
index 4a8b801d0b..cce3145c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/tcp/gsttcp.c:
+	* gst/tcp/gsttcpclientsink.c:
+	* gst/tcp/gsttcpserversink.c:
+	* gst/tcp/gsttcpserversrc.c:
+	  Add <string.h> includes for memset and FD_ZERO (fixes #323878;
+	  patch by: Benjamin Pineau).
+
 2005-12-15  Michael Smith  <msmith@fluendo.com>
 
 	* gst/videorate/gstvideorate.c: (gst_video_rate_blank_data),
diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
index 26ce38271f..a1121480f5 100644
--- a/gst/tcp/gsttcp.c
+++ b/gst/tcp/gsttcp.c
@@ -29,6 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <string.h>             /* memset, in FD_ZERO macro */
 #include <unistd.h>
 #include <sys/ioctl.h>
 
diff --git a/gst/tcp/gsttcpclientsink.c b/gst/tcp/gsttcpclientsink.c
index a69243c9bb..39a45e6f51 100644
--- a/gst/tcp/gsttcpclientsink.c
+++ b/gst/tcp/gsttcpclientsink.c
@@ -25,6 +25,7 @@
 #include <gst/dataprotocol/dataprotocol.h>
 #include "gsttcp.h"
 #include "gsttcpclientsink.h"
+#include <string.h>             /* memset */
 
 /* elementfactory information */
 static GstElementDetails gst_tcp_client_sink_details =
diff --git a/gst/tcp/gsttcpserversink.c b/gst/tcp/gsttcpserversink.c
index 4476657fed..50803d82cd 100644
--- a/gst/tcp/gsttcpserversink.c
+++ b/gst/tcp/gsttcpserversink.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 #include <gst/gst-i18n-plugin.h>
+#include <string.h>             /* memset */
 
 #include <sys/ioctl.h>
 
diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c
index 4f05f9d1da..d9cef1d82f 100644
--- a/gst/tcp/gsttcpserversrc.c
+++ b/gst/tcp/gsttcpserversrc.c
@@ -26,6 +26,7 @@
 #include <gst/gst-i18n-plugin.h>
 #include "gsttcp.h"
 #include "gsttcpserversrc.h"
+#include <string.h>             /* memset */
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>