diff --git a/ChangeLog b/ChangeLog
index 844ab6a036..5dd1dc788c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-02-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/avi/gstavidemux.c: (gst_avi_demux_invert):
+	  Declare variables at beginning of block and make gcc-2.95 happy
+	  (fixes # 167482, patch by Gergely Nagy).
+	  
+	* gst/tcp/gsttcpclientsrc.c:
+	* gst/tcp/gsttcpclientsrc.h:
+	  Move some includes into the header, so that struct sockaddr_in is
+	  defined when it should be defined on FreeBSD as well (fixes
+	  #167483).
+	  
+	* gst/tcp/gsttcpserversrc.c: (gst_tcpserversrc_init_receive):
+	  Don't pass uninitialised values to setsockopt() here either.
+
 2005-02-17  Luca Ognibene  <luogni at tin dot it>
 
 	Reviewed by: Tim-Philipp Müller  <tim at centricular dot net>
diff --git a/gst/tcp/gsttcpclientsrc.c b/gst/tcp/gsttcpclientsrc.c
index 7449197f35..0d96a74dcd 100644
--- a/gst/tcp/gsttcpclientsrc.c
+++ b/gst/tcp/gsttcpclientsrc.c
@@ -28,9 +28,6 @@
 #include "gsttcpclientsrc.h"
 #include <string.h>             /* memset */
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 
diff --git a/gst/tcp/gsttcpclientsrc.h b/gst/tcp/gsttcpclientsrc.h
index 466f2b0f5d..f09a0b2a88 100644
--- a/gst/tcp/gsttcpclientsrc.h
+++ b/gst/tcp/gsttcpclientsrc.h
@@ -29,6 +29,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include <netdb.h>                        /* sockaddr_in */
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netinet/in.h>			  /* sockaddr_in */
 #include <unistd.h>
 #include "gsttcp.h"
diff --git a/gst/tcp/gsttcpserversrc.c b/gst/tcp/gsttcpserversrc.c
index e6b3e011d5..9c843205cb 100644
--- a/gst/tcp/gsttcpserversrc.c
+++ b/gst/tcp/gsttcpserversrc.c
@@ -483,6 +483,7 @@ gst_tcpserversrc_init_receive (GstTCPServerSrc * this)
       this->server_sock_fd);
 
   /* make address reusable */
+  ret = 1;
   if (setsockopt (this->server_sock_fd, SOL_SOCKET, SO_REUSEADDR, &ret,
           sizeof (int)) < 0) {
     GST_ELEMENT_ERROR (this, RESOURCE, SETTINGS, (NULL),