diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index ac2e1c062f..fbe0fb16c8 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Thu Jul  9 19:48:36 CDT 2009
+Thu Jul  9 19:49:43 CDT 2009
diff --git a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
index f14df28b98..561e2f7454 100644
--- a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
+++ b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
@@ -421,19 +421,20 @@ gboolean su_source_check(GSource *gs)
   SuSource *ss = (SuSource *)gs;
   su_port_t *self = ss->ss_port;
   gint tout;
-  unsigned i, I;
+  unsigned I;
 
   enter;
 
   I = self->sup_n_waits;
 
 #if SU_HAVE_POLL
+  unsigned i;
   for (i = 0; i < I; i++) {
     if (self->sup_waits[i].revents)
       return TRUE;
   }
 #endif
-
+  (void)I;
   return su_source_prepare(gs, &tout);
 }
 
diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
index 1f16588e0a..be07d61c7d 100644
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
@@ -223,8 +223,12 @@ sres_cache_get0(sres_htable_t *htable,
 
   if (cname && dcount == derrorcount) {
     /* Nothing found, trace CNAMEs */
-    struct frame *f, frame = { previous, domain };
-    unsigned hash = sres_hash_key(domain = cname->cn_cname);
+    unsigned hash;
+    struct frame *f, frame;
+    frame.previous = previous;
+    frame.domain = domain;
+
+    hash = sres_hash_key(domain = cname->cn_cname);
 
     /* Check for cname loops */
     for (f = previous; f; f = f->previous) {
diff --git a/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c b/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c
index 1ef31a7e8c..8803261312 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c
@@ -34,7 +34,8 @@
  *
  * @author Pekka Pessi <Pekka.Pessi@nokia.com>
  */
-
+#include <stdlib.h>
+#include <sofia-sip/su_config.h>
 #include "config.h"
 
 #include <sofia-sip/heap.h>
@@ -219,7 +220,11 @@ void su_smoothsort(void *base, size_t r, size_t N,
   stretch s = { 1, 1, 1 };
   size_t q;
 
-  array const array[1] = {{ base, less, swap }};
+  array array_i;
+  array* const array = &array_i;
+  array->less = less;
+  array->swap = swap;
+  array->m = base;
 
   assert(less && swap);
 
diff --git a/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp b/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp
index 5b6f074250..8a0e2051c3 100644
--- a/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp
+++ b/libs/sofia-sip/open_c/group/libsofia-sip-ua.mmp
@@ -68,6 +68,9 @@ SOURCE          strtoull.c
 SOURCE          su_string.c
 SOURCE          getopt.c
 SOURCE          poll.c
+SOURCE          smoothsort.c
+SOURCE          su_kqueue_port.c
+SOURCE          su_devpoll_port.c
 
 SOURCEPATH 			..\..\libsofia-sip-ua\bnf
 
@@ -286,7 +289,6 @@ SYSTEMINCLUDE   \epoc32\include\stdapis
 SYSTEMINCLUDE   \epoc32\include\stdapis\openssl
 SYSTEMINCLUDE   \epoc32\include\osextensions
 SYSTEMINCLUDE   \epoc32\include\osextensions\sofia-sip
-SYSTEMINCLUDE   \epoc32\include\stdapis\stlport
 
 // Library dependencies