diff --git a/relay/xwrelay.h b/relay/xwrelay.h
index ba38912ae..e31527976 100644
--- a/relay/xwrelay.h
+++ b/relay/xwrelay.h
@@ -26,7 +26,9 @@
 /* Set if device is acting a server; cleared if as client */
 #define FLAGS_SERVER_BIT 0x01
 
+#ifndef CANT_DO_TYPEDEF
 typedef
+#endif
 enum { XWRELAY_NONE             /* 0 is an illegal value */
 
        , XWRELAY_GAME_CONNECT
@@ -82,7 +84,11 @@ enum { XWRELAY_NONE             /* 0 is an illegal value */
        , XWRELAY_MSG_TORELAY
        /* Sent from device to relay.  Format: connectionID: 2; src_hostID:
           1; dest_hostID: 1 */
-} XWRelayMsg;
+}
+#ifndef CANT_DO_TYPEDEF
+ XWRelayMsg
+#endif
+;
 
 #ifndef CANT_DO_TYPEDEF
 typedef unsigned char XWRELAY_Cmd;
@@ -98,7 +104,10 @@ typedef unsigned char XWRELAY_Cmd;
 #define XWRELAY_PROTO_VERSION 0x01
 
 /* Errors passed with denied  */
-typedef enum {
+#ifndef CANT_DO_TYPEDEF
+typedef 
+#endif
+enum {
     XWRELAY_ERROR_NONE
     ,XWRELAY_ERROR_BADPROTO
     ,XWRELAY_ERROR_RELAYBUSY
@@ -109,10 +118,16 @@ typedef enum {
     ,XWRELAY_ERROR_LOST_OTHER  /* Generic other-left-we-dunno-why error */
 
     ,XWRELAY_ERROR_LASTERR
-} XWREASON;
-
+}
+#ifndef CANT_DO_TYPEDEF
+XWREASON
+#endif
+;
 
+#ifndef CANT_DO_TYPEDEF
 typedef unsigned short CookieID;
+#endif
+
 #define COOKIE_ID_NONE 0L
 
 #endif
diff --git a/symbian/inc/xwappview.h b/symbian/inc/xwappview.h
index 835c4571b..ff4fc1f96 100644
--- a/symbian/inc/xwappview.h
+++ b/symbian/inc/xwappview.h
@@ -169,8 +169,8 @@ class CXWordsAppView : public CCoeControl
 #else
 # define SYM_SEND      sym_send
 
-    static XP_S16      sym_send( XP_U8* buf, XP_U16 len, CommsAddrRec* addr, 
-                                 void* closure );
+    static XP_S16      sym_send( XP_U8* buf, XP_U16 len, 
+                                 const CommsAddrRec* addr, void* closure );
     static void        sym_send_on_close( XWStreamCtxt* stream, 
                                           void* closure );
     static void PacketReceived( const TDesC8* aBuf, void* aClosure );
diff --git a/symbian/src/symdraw.cpp b/symbian/src/symdraw.cpp
index 80211a11d..1dbc57eea 100644
--- a/symbian/src/symdraw.cpp
+++ b/symbian/src/symdraw.cpp
@@ -207,7 +207,7 @@ sym_draw_destroyCtxt( DrawCtx* p_dctx )
 }
 
 static XP_Bool
-sym_draw_boardBegin( DrawCtx* p_dctx, XP_Rect* rect, 
+sym_draw_boardBegin( DrawCtx* p_dctx, DictionaryCtxt* dict, XP_Rect* rect, 
                      XP_Bool hasfocus )
 {
     XP_LOGF( "sym_draw_boardBegin" );
diff --git a/symbian/src/xwappview.cpp b/symbian/src/xwappview.cpp
index a99520310..f0d1b177d 100644
--- a/symbian/src/xwappview.cpp
+++ b/symbian/src/xwappview.cpp
@@ -389,7 +389,8 @@ sym_util_engineProgressCallback( XW_UtilCtxt* /*uc*/ )
 }
 
 static void
-sym_util_setTimer( XW_UtilCtxt* /*uc*/, XWTimerReason /*why*/ )
+sym_util_setTimer( XW_UtilCtxt* /*uc*/, XWTimerReason /*why*/, XP_U16 /*when*/,
+                   TimerProc /* proc */, void* /* closure */ )
 {
 }
 
@@ -1296,7 +1297,7 @@ CXWordsAppView::PacketReceived( const TDesC8* aBuf, void* aClosure )
 } /* CXWordsAppView::PacketReceived */
 
 /*static*/ XP_S16
-CXWordsAppView::sym_send( XP_U8* aBuf, XP_U16 aLen, CommsAddrRec* aAddr, 
+CXWordsAppView::sym_send( XP_U8* aBuf, XP_U16 aLen, const CommsAddrRec* aAddr, 
                           void* aClosure )
 {
     CommsAddrRec addr;