diff --git a/src/screen.c b/src/screen.c
index 3b5dbca95..c14ebc4e7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1923,12 +1923,7 @@ do_search (WPanel *panel, int c_code)
 		break;
 	    wrapped = 1;
 	}
-#ifdef OS2_NT
-#   define FILENAME_COMPARE strncasecmp
-#else
-#   define FILENAME_COMPARE strncmp
-#endif
-	if (FILENAME_COMPARE (panel->dir.list [i].fname, panel->search_buffer, l) == 0){
+	if (STRNCOMP (panel->dir.list [i].fname, panel->search_buffer, l) == 0){
 	    unselect_item (panel);
 	    panel->selected = i;
 	    select_item (panel);
diff --git a/src/subshell.c b/src/subshell.c
index 68222cede..e80939ff9 100644
--- a/src/subshell.c
+++ b/src/subshell.c
@@ -1195,8 +1195,6 @@ static int pty_open_slave (const char *pty_name)
 
 /* }}} */
 
-#else
-const int use_subshell = 0;
 #endif /* HAVE_SUBSHELL_SUPPORT */
 
 /* {{{ Emacs local variables */
diff --git a/src/subshell.h b/src/subshell.h
index 208a82169..5c57c0a2d 100644
--- a/src/subshell.h
+++ b/src/subshell.h
@@ -1,15 +1,15 @@
 #ifndef __SUBSHELL_H
 #define __SUBSHELL_H
 
-/* If using a subshell for evaluating commands this is true */
-extern int use_subshell;
-
 /* Used to distinguish between a normal MC termination and */
 /* one caused by typing `exit' or `logout' in the subshell */
 #define SUBSHELL_EXIT 128
 
 #ifdef HAVE_SUBSHELL_SUPPORT
 
+/* If using a subshell for evaluating commands this is true */
+extern int use_subshell;
+
 /* File descriptor of the pseudoterminal used by the subshell */
 extern int subshell_pty;
 
@@ -39,5 +39,8 @@ void do_subshell_chdir (char *command, int update_prompt, int reset_prompt);
 void subshell_get_console_attributes (void);
 void sigchld_handler (int sig);
 
-#endif /* HAVE_SUBSHELL_SUPPORT */
+#else
+int use_subshell = 0;
+#endif /* not HAVE_SUBSHELL_SUPPORT */
+
 #endif /* __SUBSHELL_H */