diff --git a/wince/Makefile b/wince/Makefile
index 90afe7228..2d4e393db 100644
--- a/wince/Makefile
+++ b/wince/Makefile
@@ -42,7 +42,7 @@ LFLAGS += -Wl,--major-subsystem-version,4,--minor-subsystem-version,20
 ifdef HAVE_COMMCTRL
 CELIBS += -lcommctrl -laygshell
 else
-CFLAGS += -DCANT_DO_CMDBAR -DBEYOND_IR
+CFLAGS += -DCANT_DO_CMDBAR -DXWFEATURE_RELAY
 endif
 else							# ifeq ($(TARGET_OS),wince)
 ifeq ($(TARGET_OS),win32)
@@ -51,7 +51,7 @@ WINDRES = i586-mingw32msvc-windres
 STRIP = i586-mingw32msvc-strip
 TARGET_OS_DEF = -DTARGET_OS_WIN32
 CELIBS += -lws2_32 
-CFLAGS += -DCANT_DO_CMDBAR -DBEYOND_IR -DDRAW_LINK_DIRECT
+CFLAGS += -DCANT_DO_CMDBAR -DXWFEATURE_RELAY -DDRAW_LINK_DIRECT
 #CFLAGS += -DFORCE_HEIGHT=240 -DFORCE_WIDTH=320
 endif
 endif
diff --git a/wince/cedict.c b/wince/cedict.c
index 0581cdb64..a9ef673d5 100755
--- a/wince/cedict.c
+++ b/wince/cedict.c
@@ -36,7 +36,7 @@ typedef struct CEDictionaryCtxt {
 } CEDictionaryCtxt;
 
 static void ce_dict_destroy( DictionaryCtxt* dict );
-static XP_UCHAR* ce_dict_getShortName( const DictionaryCtxt* dict );
+static const XP_UCHAR* ce_dict_getShortName( const DictionaryCtxt* dict );
 static void ceLoadSpecialData( CEDictionaryCtxt* ctxt, XP_U8** ptrp );
 static XP_U16 ceCountSpecials( CEDictionaryCtxt* ctxt );
 static XP_Bitmap* ceMakeBitmap( CEDictionaryCtxt* ctxt, XP_U8** ptrp );
@@ -427,10 +427,10 @@ ce_dict_destroy( DictionaryCtxt* dict )
     XP_FREE( ctxt->super.mpool, ctxt );
 } // ce_dict_destroy
 
-static XP_UCHAR* 
+static const XP_UCHAR* 
 ce_dict_getShortName( const DictionaryCtxt* dict )
 {
-    XP_UCHAR* name = dict_getName( dict );
+    const XP_UCHAR* name = dict_getName( dict );
     return bname( name );
 } /* ce_dict_getShortName */
 
@@ -850,11 +850,11 @@ n_ptr_tohs( XP_U8** inp )
     return XP_NTOHS(t);
 } /* n_ptr_tohs */
 
-XP_UCHAR*
-bname( XP_UCHAR* in )
+const XP_UCHAR*
+bname( const XP_UCHAR* in )
 {
     XP_U16 len = (XP_U16)XP_STRLEN(in);
-    XP_UCHAR* out = in + len - 1;
+    const XP_UCHAR* out = in + len - 1;
 
     while ( *out != '\\' && out >= in ) {
         --out;
diff --git a/wince/cedict.h b/wince/cedict.h
index 4bb348ce4..cafed7828 100755
--- a/wince/cedict.h
+++ b/wince/cedict.h
@@ -49,5 +49,5 @@ void ceFormatDictDirs( XWStreamCtxt* stream, HINSTANCE hInstance );
    return value (which is into buf, but not necessarily the first char.) */
 wchar_t* wbname( wchar_t* buf, XP_U16 buflen, const wchar_t* in );
 
-XP_UCHAR* bname( XP_UCHAR* in );
+const XP_UCHAR* bname( const XP_UCHAR* in );
 #endif
diff --git a/wince/cemain.c b/wince/cemain.c
index cd48fd830..5d03b0b44 100755
--- a/wince/cemain.c
+++ b/wince/cemain.c
@@ -698,7 +698,7 @@ ceInitAndStartBoard( CEAppGlobals* globals, XP_Bool newGame, CeGamePrefs* gp,
     dict = model_getDictionary( globals->game.model );
 
     if ( !!dict ) {
-        XP_UCHAR* curDictName = dict_getName( dict );
+        const XP_UCHAR* curDictName = dict_getName( dict );
         if ( !!newDictName &&
             ( !curDictName || 0 != strcmp( curDictName, newDictName ) ) ) {
             dict_destroy( dict );
@@ -1626,7 +1626,7 @@ ceSaveCurGame( CEAppGlobals* globals, XP_Bool autoSave )
             XWStreamCtxt* memStream;
             DictionaryCtxt* dict;
             FileWriteState fwState;
-            char* dictName;
+            const char* dictName;
 
             fwState.path = globals->curGameName;
             fwState.globals = globals;