diff --git a/ChangeLog b/ChangeLog
index 1fecee02c57ff752d03b0301be63fdcfdb3bff0e..b2b92083260e2bbbe0676f58c867f65bf03a0d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -149,6 +149,8 @@ CVS code -
 - proto.h:
 	- Remove unused xpt() and add_marked_sameline() prototypes.
 	  (DLR)
+	- Add missing #ifdefs around the nstristr() and get_mouseinput()
+	  prototypes. (DLR)
 - rcfile.c:
 	- Move "rebinddelete" up in the list of options so that the list
 	  is in alphabetical order. (DLR)
diff --git a/src/proto.h b/src/proto.h
index 0e0ca45aa417aba6400c5a43d5208cb02c0d17cb..a3cf85c271c83348fcecd77e3686198c53362029 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -438,7 +438,9 @@ int nstricmp(const char *s1, const char *s2);
 #ifndef HAVE_STRNCASECMP
 int nstrnicmp(const char *s1, const char *s2, size_t n);
 #endif
+#ifndef HAVE_STRCASESTR
 const char *nstristr(const char *haystack, const char *needle);
+#endif
 #ifndef NANO_SMALL
 const char *revstrstr(const char *haystack, const char *needle, const
 	char *rev_start);
@@ -470,7 +472,9 @@ int get_ascii_kbinput(WINDOW *win, int kbinput);
 int get_escape_seq_kbinput(WINDOW *win, int *escape_seq, size_t
 	escape_seq_len);
 int get_escape_seq_abcd(int kbinput);
+#ifndef DISABLE_MOUSE
 int get_mouseinput(int *mouse_x, int *mouse_y, int shortcut);
+#endif
 int do_first_line(void);
 int do_last_line(void);
 size_t xplustabs(void);