diff --git a/ChangeLog b/ChangeLog
index 6a45f33dfe..75abcd171b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-08-28  Jan Schmidt  <Jan.Schmidt@sun.com>
+
+	* gst/dccp/gstdccp.c:
+	* gst/dccp/gstdccpclientsrc.c:
+	Fix compilation on Solaris by including filio.h as needed.
+
+	* gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc:
+	* gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc:
+	Fix compilation with Forte - apparently it hates concatenating a
+	macro argument that starts with an underscore??
+
 2008-08-28  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	Patch by: Jérémie Bernard <gremimail at gmail dot com>
diff --git a/gst/dccp/gstdccp.c b/gst/dccp/gstdccp.c
index 35f3743248..8a4f02df65 100644
--- a/gst/dccp/gstdccp.c
+++ b/gst/dccp/gstdccp.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gstdccp.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -27,6 +31,10 @@
 #include <sys/ioctl.h>
 #include <string.h>
 
+#ifdef HAVE_FIONREAD_IN_SYS_FILIO
+#include <sys/filio.h>
+#endif
+
 /* Prototypes and definitions for private functions and not exported via gstdccp.h */
 gint gst_dccp_socket_write (int socket, const void *buf, size_t count,
     int packet_size);
diff --git a/gst/dccp/gstdccpclientsrc.c b/gst/dccp/gstdccpclientsrc.c
index bd42bf66eb..f82bd17088 100644
--- a/gst/dccp/gstdccpclientsrc.c
+++ b/gst/dccp/gstdccpclientsrc.c
@@ -56,6 +56,11 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 
+#include <sys/ioctl.h>
+#ifdef HAVE_FIONREAD_IN_SYS_FILIO
+#include <sys/filio.h>
+#endif
+
 #define DCCP_DEFAULT_CAPS       NULL
 
 /* signals */
diff --git a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
index 835098a07b..d38cf01910 100644
--- a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
+++ b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll.inc
@@ -186,52 +186,52 @@ void FUNCT_NAME(GstDeinterlaceMethod *d_method, GstDeinterlace2* object)
     {
       if (SearchEffort == 0)
 	{
-	  SEFUNC(0_SB);
+	  SEFUNC(0SB);
 	}
       else if (SearchEffort <= 1)
 	{
-	  SEFUNC(1_SB);
+	  SEFUNC(1SB);
 	}
       /*	else if (SearchEffort <= 2)
 		{
-		SEFUNC(2_SB);
+		SEFUNC(2SB);
 		}
       */
       else if (SearchEffort <= 3)
 	{
-	  SEFUNC(3_SB);
+	  SEFUNC(3SB);
 	}
       else if (SearchEffort <= 5)
 	{
-	  SEFUNC(5_SB);
+	  SEFUNC(5SB);
 	}
       else if (SearchEffort <= 9)
 	{
-	  SEFUNC(9_SB);
+	  SEFUNC(9SB);
 	}
       else if (SearchEffort <= 11)
 	{
-	  SEFUNC(11_SB);
+	  SEFUNC(11SB);
 	}
       else if (SearchEffort <= 13)
 	{
-	  SEFUNC(13_SB);
+	  SEFUNC(13SB);
 	}
       else if (SearchEffort <= 15)
 	{
-	  SEFUNC(15_SB);
+	  SEFUNC(15SB);
 	}
       else if (SearchEffort <= 19)
 	{
-	  SEFUNC(19_SB);
+	  SEFUNC(19SB);
 	}
       else if (SearchEffort <= 21)
 	{
-	  SEFUNC(21_SB);
+	  SEFUNC(21SB);
 	}
       else 
 	{
-	  SEFUNC(Max_SB);
+	  SEFUNC(MaxSB);
 	}
     }
 
diff --git a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc
index 6a68f08bbb..f6344eabb3 100644
--- a/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc
+++ b/gst/deinterlace2/tvtime/tomsmocomp/TomsMoCompAll2.inc
@@ -5,7 +5,7 @@
 #endif
 
 #ifdef USE_STRANGE_BOB
-#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##SB)
 #else
 #define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
 #endif
@@ -241,4 +241,3 @@ static inline int SEARCH_EFFORT_FUNC(Max)
 
 #undef SEARCH_EFFORT_FUNC
 
-