diff --git a/xwords4/common/model.c b/xwords4/common/model.c
index 8066adf0e..ced1398bd 100644
--- a/xwords4/common/model.c
+++ b/xwords4/common/model.c
@@ -123,7 +123,6 @@ model_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
 {
     ModelCtxt* model;
     XP_U16 nCols;
-    XP_U16 ii;
     XP_U16 nPlayers;
     XP_U16 version = stream_getVersion( stream );
 
@@ -152,7 +151,7 @@ model_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
             model->vol.bonuses = 
                 XP_MALLOC( model->vol.mpool,
                            model->vol.nBonuses * sizeof( model->vol.bonuses[0] ) );
-            for ( ii = 0; ii < model->vol.nBonuses; ++ii ) {
+            for ( int ii = 0; ii < model->vol.nBonuses; ++ii ) {
                 model->vol.bonuses[ii] = stream_getBits( stream, 4 );
             }
         }
@@ -174,7 +173,7 @@ model_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
                          (XWStreamCtxt*)NULL, (WordNotifierInfo*)NULL,
                          pre, post, closure );
 
-    for ( ii = 0; ii < model->nPlayers; ++ii ) {
+    for ( int ii = 0; ii < model->nPlayers; ++ii ) {
         loadPlayerCtxt( model, stream, version, &model->players[ii] );
         setPendingCounts( model, ii );
         invalidateScore( model, ii );
diff --git a/xwords4/linux/lindutil.c b/xwords4/linux/lindutil.c
index 2b7f7c9ad..5fe649a25 100644
--- a/xwords4/linux/lindutil.c
+++ b/xwords4/linux/lindutil.c
@@ -38,7 +38,7 @@ static const XP_UCHAR* linux_dutil_getUserQuantityString( XW_DUtilCtxt* duc, XWE
                                                           XP_U16 quantity );
 
 static void linux_dutil_storePtr( XW_DUtilCtxt* duc, XWEnv xwe, const XP_UCHAR* keys[],
-                                  void* data, XP_U32 len );
+                                  const void* data, XP_U32 len );
 static void linux_dutil_loadPtr( XW_DUtilCtxt* duc, XWEnv xwe, const XP_UCHAR* keys[],
                                  void* data, XP_U32* lenp );
 static void linux_dutil_forEach( XW_DUtilCtxt* duc, XWEnv xwe,
@@ -298,7 +298,7 @@ linux_dutil_getUserQuantityString( XW_DUtilCtxt* duc, XWEnv xwe, XP_U16 code,
 static void
 linux_dutil_storePtr( XW_DUtilCtxt* duc, XWEnv XP_UNUSED(xwe),
                       const XP_UCHAR* keys[],
-                      void* data, const XP_U32 len )
+                      const void* data, const XP_U32 len )
 {
     XP_ASSERT( keys[1] == NULL );
     LaunchParams* params = (LaunchParams*)duc->closure;
diff --git a/xwords4/wasm/Makefile b/xwords4/wasm/Makefile
index f30de4e41..ab3dcb6ef 100644
--- a/xwords4/wasm/Makefile
+++ b/xwords4/wasm/Makefile
@@ -45,6 +45,7 @@ DEFINES += -DXWFEATURE_CROSSHAIRS
 DEFINES += -DXWFEATURE_STREAMREF
 DEFINES += -DXWFEATURE_TURNCHANGENOTIFY
 DEFINES += -DXWFEATURE_BOARDWORDS
+DEFINES += -DXWFEATURE_DEVICE
 DEFINES += -DNATIVE_NLI
 DEFINES += -DDEBUG_REF
 DEFINES += -Wno-switch
diff --git a/xwords4/wasm/main.c b/xwords4/wasm/main.c
index ea1f7d212..019dd6ffe 100644
--- a/xwords4/wasm/main.c
+++ b/xwords4/wasm/main.c
@@ -46,7 +46,6 @@
 #include "wasmutil.h"
 #include "wasmdutil.h"
 #include "wasmdict.h"
-#include "wasmasm.h"
 
 #ifdef __EMSCRIPTEN__
 #include <emscripten.h>
diff --git a/xwords4/wasm/wasmdutil.c b/xwords4/wasm/wasmdutil.c
index 6204e3c28..f6d2db407 100644
--- a/xwords4/wasm/wasmdutil.c
+++ b/xwords4/wasm/wasmdutil.c
@@ -33,7 +33,6 @@
 #include "main.h"
 #include "dbgutil.h"
 #include "LocalizedStrIncludes.h"
-#include "wasmasm.h"
 #include "wasmdict.h"
 
 typedef struct _WasmDUtilCtxt {
@@ -252,7 +251,7 @@ wasm_dutil_loadStream( XW_DUtilCtxt* duc, XWEnv xwe, const char* keys[],
 static void
 wasm_dutil_storePtr( XW_DUtilCtxt* duc, XWEnv xwe,
                      const char* keys[],
-                     void* data, XP_U32 len )
+                     const void* data, XP_U32 len )
 {
     char path[128];
     ensurePath(keys, path, true);