Remove some unneeded includes.

src/achown.c

@@ -39,11 +39,9 @@
 
 #include "dir.h"
 #include "panel.h"		/* Needed for the externs */
-#include "file.h"
 #include "chmod.h"
 #include "main.h"
 #include "achown.h"
-#include "../vfs/vfs.h"
 
 #define BX		5
 #define BY		6

src/boxes.c

@@ -45,7 +45,6 @@
 #include "main.h"		/* For the confirm_* variables */
 #include "tree.h"
 #include "layout.h"		/* for get_nth_panel_name proto */
-#include "fileopctx.h"
 #include "background.h"
 
 #ifdef HAVE_CHARSET

src/chown.c

@@ -38,7 +38,6 @@
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"
 #include "panel.h"		/* Needed for the externs */
-#include "file.h"
 #include "chmod.h"
 #include "main.h"
 #include "chown.h"

src/filegui.c

@@ -72,29 +72,20 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
-#include "eregex.h"
-#include "setup.h"
-#include "dialog.h"
-/* Needed by query_replace */
-#include "color.h"
-#include "win.h"
-#include "dlg.h"
+#include "setup.h"		/* verbose */
+#include "dialog.h"		/* do_refresh */
+#include "color.h"		/* dialog_colors */
+#include "dlg.h"		/* B_ENTER */
+#include "background.h"		/* message_3s */
+#include "widget.h"		/* WLabel */
 #define WANT_WIDGETS
-#include "widget.h"		/* Note the sequence */
-#include "main.h"		/* WANT_WIDGETS-> we get the the_hint def */
-#include "layout.h"
-#include "wtools.h"
-
-/* Needed for current_panel, other_panel and WTree */
-#include "dir.h"
-#include "panel.h"
-#include "file.h"
+#include "main.h"		/* the_hint */
+#include "wtools.h"		/* QuickDialog */
+#include "panel.h"		/* cpanel */
+#include "file.h"		/* is_wildcarded */
 #include "filegui.h"
-#include "fileopctx.h"
-#include "tree.h"
-#include "key.h"
-#include "../vfs/vfs.h"
+#include "fileopctx.h"		/* FILE_CONT */
+#include "key.h"		/* get_event */
 
 /* }}} */
 

src/hotlist.c

@@ -37,25 +37,19 @@
 #include <sys/stat.h>
 
 #include "global.h"
-#include "tty.h"
-#include "win.h"
-#include "color.h"
+#include "tty.h"		/* COLS */
+#include "color.h"		/* dialog_colors */
 #include "dlg.h"
 #include "widget.h"
-#include "dialog.h"		/* For do_refresh() */
+#include "dialog.h"		/* do_refresh() */
 #include "setup.h"		/* For profile_bname */
 #include "profile.h"		/* Load/save directories hotlist */
-
-#include "../vfs/vfs.h"
-/* Needed for the extern declarations of integer parameters */
-#include "wtools.h"
-#include "dir.h"
-#include "panel.h"		/* Needed for the externs */
-#include "file.h"
-#include "main.h"
+#include "wtools.h"		/* QuickDialog */
+#include "panel.h"		/* cpanel */
+#include "main.h"		/* repaint_screen */
 #include "hotlist.h"
-#include "key.h"
-#include "command.h"
+#include "key.h"		/* ctrl_pressed */
+#include "command.h"		/* cmdline */
 
 #define UX		5
 #define UY		2

src/layout.c

@@ -41,7 +41,7 @@
 #include <signal.h>
 
 #include "global.h"
-#include "tty.h"
+#include "tty.h"		/* COLS */
 #include "win.h"
 #include "color.h"
 #include "key.h"
@@ -60,7 +60,6 @@
 /* Needed for the extern declarations of integer parameters */
 #include "dir.h"
 #include "panel.h"		/* The Panel widget */
-#include "file.h"
 #include "cons.saver.h"
 #include "layout.h"
 #include "info.h"		/* The Info widget */

src/main.c

@@ -48,11 +48,9 @@
 #include "color.h"
 #include "dialog.h"
 #include "menu.h"
-#include "file.h"
 #include "panel.h"
 #include "main.h"
 #include "win.h"
-#include "user.h"
 #include "mouse.h"
 #include "option.h"
 #include "tree.h"
@@ -61,12 +59,12 @@
 #include "key.h"		/* For init_key() and mi_getch() */
 #include "setup.h"		/* save_setup() */
 #include "profile.h"		/* free_profiles() */
-#include "boxes.h"
+#include "boxes.h"		/* sort_box() */
 #include "layout.h"
 #include "cmd.h"		/* Normal commands */
 #include "hotlist.h"
 #include "panelize.h"
-#include "learn.h"
+#include "learn.h"		/* learn_keys() */
 #include "listmode.h"
 #include "background.h"
 #include "ext.h"		/* For flush_extension_file() */
@@ -84,8 +82,6 @@
 #    include "drive.h"
 #endif
 
-#include "../vfs/vfs.h"
-
 #ifdef WITH_SMBFS
 #include "../vfs/smbfs.h"	/* smbfs_set_debug() */
 #endif

src/option.c

@@ -37,9 +37,8 @@
 #include "main.h"
 #include "profile.h"		/* For sync_profiles */
 
-#include "dir.h"
 #include "panel.h"		/* Needed for the externs */
-#include "file.h"
+#include "file.h"		/* safe_delete */
 #include "layout.h"		/* For nice_rotating_dash */
 #include "option.h"
 static Dlg_head *conf_dlg;

src/panelize.c

@@ -32,7 +32,7 @@
 /* Needed for the extern declarations of integer parameters */
 #define DIR_H_INCLUDE_HANDLE_DIRENT
 #include "global.h"
-#include "tty.h"
+#include "tty.h"		/* attrset() */
 #include "win.h"
 #include "color.h"
 #include "dlg.h"
@@ -42,9 +42,8 @@
 #include "setup.h"		/* For profile_bname */
 #include "profile.h"		/* Load/save directories panelize */
 #include "dir.h"
-#include "panel.h"		/* Needed for the externs */
-#include "file.h"
-#include "main.h"
+#include "panel.h"		/* cpanel */
+#include "main.h"		/* repaint_screen */
 #include "panelize.h"
 
 #define UX		5

src/setup.c

@@ -26,7 +26,7 @@
 #include "dir.h"
 #include "panel.h"
 #include "main.h"
-#include "tree.h"
+#include "tree.h"		/* xtree_mode */
 #include "profile.h"
 #define WANT_WIDGETS
 #include "setup.h"
@@ -39,13 +39,12 @@
 #include "menu.h"		/* menubar_visible declaration */
 #include "win.h"		/* lookup_key */
 #include "cmd.h"
-#include "file.h"
+#include "file.h"		/* safe_delete */
 
 #ifdef HAVE_CHARSET
 #include "charsets.h"
 #endif
 
-#include "../vfs/vfs.h"
 #ifdef USE_NETCODE
 #   include "../vfs/ftpfs.h"
 #endif

src/tree.c

@@ -46,7 +46,6 @@
 #include "key.h"	/* For mi_getch() */
 #include "tree.h"
 #include "cmd.h"
-#include "../vfs/vfs.h"
 
 extern int command_prompt;