diff --git a/palm/l10n/xwords4_en_US.rcp.pre b/palm/l10n/xwords4_en_US.rcp.pre
index 9f5960712..ad51a52b5 100644
--- a/palm/l10n/xwords4_en_US.rcp.pre
+++ b/palm/l10n/xwords4_en_US.rcp.pre
@@ -54,7 +54,9 @@ BEGIN
     BEGIN
         MENUITEM "Hint" XW_HINT_PULLDOWN_ID "I"
         MENUITEM "Next hint" XW_NEXTHINT_PULLDOWN_ID "M"
+#ifdef XWFEATURE_HINT_CONFIG
         MENUITEM "Configure hint..." XW_HINTCONFIG_PULLDOWN_ID "C"
+#endif
 	MENUITEM SEPARATOR
         MENUITEM "Undo cur. move" XW_UNDOCUR_PULLDOWN_ID "U"
         MENUITEM "Undo last move" XW_UNDOLAST_PULLDOWN_ID "Z"
@@ -450,8 +452,9 @@ BEGIN
 #endif
 END
 
-#define NTILES_TOP 17
-#define NTILES_BUTTON_TOP 60
+#ifdef XWFEATURE_HINT_CONFIG
+# define NTILES_TOP 17
+# define NTILES_BUTTON_TOP 60
 FORM ID XW_HINTCONFIG_FORM_ID AT ( 2 75 156 82 ) USABLE MODAL SAVEBEHIND
 BEGIN
     TITLE "Hint parameters"
@@ -471,7 +474,7 @@ BEGIN
     BUTTON "Ok" XW_HINTCONFIG_OK_ID RIGHT@156-10 NTILES_BUTTON_TOP AUTO 12
     BUTTON "Cancel" XW_HINTCONFIG_CANCEL_ID RIGHT@PREVLEFT-10 PREVTOP AUTO 12
 END
-
+#endif
 
 #if defined OWNER_HASH || defined NO_REG_REQUIRED
 FORM ID XW_SAVEDGAMES_DIALOG_ID AT ( 2 2 156 156 )
diff --git a/palm/palmmain.c b/palm/palmmain.c
index 760e3ac00..eb5d14106 100644
--- a/palm/palmmain.c
+++ b/palm/palmmain.c
@@ -1364,6 +1364,7 @@ handleHideTray( PalmAppGlobals* globals )
     return draw;
 } /* handleHideTray */
 
+#ifdef XWFEATURE_HINT_CONFIG
 static Boolean 
 popupLists( EventPtr event )
 {
@@ -1422,7 +1423,8 @@ doHintConfig( PalmAppGlobals* globals )
 
     FrmDeleteForm( form );
     FrmSetActiveForm( prevForm );
-} /* palmAskNTiles */
+} /* doHintConfig */
+#endif
 
 static Boolean
 handleHintRequest( PalmAppGlobals* globals )
@@ -2057,9 +2059,11 @@ mainViewHandleEvent( EventPtr event )
             draw = handleHintRequest( globals );
             break;
 
+#ifdef XWFEATURE_HINT_CONFIG
         case XW_HINTCONFIG_PULLDOWN_ID:
             doHintConfig( globals );
             break;
+#endif
 
         case XW_UNDOCUR_PULLDOWN_ID:
             draw = board_replaceTiles( globals->game.board );