diff --git a/ChangeLog b/ChangeLog
index d27f29a5..6dea6e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	* src/text.c: Fix compilation with --enable-tiny --enable-justify.
 	* doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi:
 	Update date and version number to match the upcoming release.
+	* src/files.c, src/winio.c: Avoid two compilation warnings.
 
 2015-12-04  Benno Schulenberg  <bensberg@justemail.net>
 	* src/proto.h: Avoid a compilation warning.
diff --git a/src/files.c b/src/files.c
index c4d5b930..0f07f173 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1100,8 +1100,9 @@ void do_insertfile(
 	    break;
 	} else {
 	    size_t pww_save = openfile->placewewant;
+#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
 	    functionptrtype func = func_from_key(&i);
-
+#endif
 	    ans = mallocstrcpy(ans, answer);
 
 #ifndef NANO_TINY
diff --git a/src/winio.c b/src/winio.c
index 370441e4..42543b79 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -43,7 +43,9 @@ static bool disable_cursorpos = FALSE;
 static bool seen_wide = FALSE;
 	/* Whether we've seen a multicolumn character in the current line. */
 
+#ifndef NANO_TINY
 static sig_atomic_t sigwinch_counter_save = 0;
+#endif
 
 /* Control character compatibility:
  *