Merge branch '260_fix_includes'

* 260_fix_includes:
  Fixed includes.
  edit/edit.h: added function prototypes.
  vfs/gc.c src/widget.c: removed unneeded #include's.
  Fixed missed #include's after rebase to current master.
  ChangeLog: added entry.
  Added Changelog entry.
  Removed unnecessary #include directives and USE_INTERNAL_EDIT define.
  further include file fixups
  fixed several missing #include's

ChangeLog

@@ -1,2 +1,2 @@
 See
-git log
+git log

edit/choosesyntax.c

@@ -24,6 +24,8 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+
 #include "edit-impl.h"
 #include "../src/global.h"
 #include "../src/wtools.h"

edit/edit.c

@@ -37,6 +37,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
+#include <fcntl.h>
 
 #include "../src/global.h"
 

edit/editcmd.c

@@ -43,18 +43,11 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
+#include <fcntl.h>
 
 #include "../src/global.h"
 #include "../src/history.h"
 
-#include "edit-impl.h"
-#include "editlock.h"
-#include "editcmddef.h"
-#include "edit-widget.h"
-#include "editcmd_dialogs.h"
-#include "../edit/etags.h"
-#include "../src/panel.h"
-
 #include "../src/tty.h"		/* LINES */
 #include "../src/widget.h"	/* listbox_new() */
 #include "../src/layout.h"	/* clr_scr() */
@@ -66,6 +59,14 @@
 #include "../src/selcodepage.h"
 #include "../src/strutil.h"	/* utf string functions */
 
+#include "../edit/edit-impl.h"
+#include "../edit/edit.h"
+#include "../edit/editlock.h"
+#include "../edit/editcmddef.h"
+#include "../edit/edit-widget.h"
+#include "../edit/editcmd_dialogs.h"
+#include "../edit/etags.h"
+
 /* globals: */
 
 /* search and replace: */

edit/editdraw.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/editlock.c

@@ -39,18 +39,17 @@
  */
 
 #include <config.h>
-#include <signal.h>		/* kill() */
 
+#include <signal.h>		/* kill() */
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <pwd.h>
 #include <stdlib.h>
 
 #include "../src/global.h"

edit/editmenu.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/editoptions.c

@@ -29,18 +29,7 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-#include <stdlib.h>
+#include <stdlib.h> /* atoi(), NULL */
 
 #include "../src/global.h"
 
@@ -52,10 +41,6 @@
 #define OPT_DLG_H 19
 #define OPT_DLG_W 72
 
-#ifndef USE_INTERNAL_EDIT
-#define USE_INTERNAL_EDIT 1
-#endif
-
 static const char *key_emu_str[] =
 {N_("Intuitive"), N_("Emacs"), N_("User-defined"), NULL};
 

edit/editwidget.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/syntax.c

@@ -35,6 +35,7 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
@@ -49,6 +50,7 @@
 
 #include "edit-impl.h"
 #include "edit-widget.h"
+
 #include "../src/color.h"	/* use_colors */
 #include "../src/main.h"	/* mc_home */
 #include "../src/wtools.h"	/* message() */

edit/wordproc.c

@@ -29,9 +29,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

src/achown.c

@@ -30,6 +30,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
 
 #include "global.h"
 #include "tty.h"

src/background.c

@@ -30,6 +30,7 @@
 
 #ifdef WITH_BACKGROUND
 
+#include <stdlib.h>
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
@@ -38,7 +39,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>	/* waitpid() */
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "global.h"
 #include "background.h"

src/background.h

@@ -8,6 +8,8 @@
 
 #ifdef WITH_BACKGROUND
 
+#include <sys/types.h> /* pid_t */
+
 enum TaskState {
     Task_Running,
     Task_Stopped

src/charsets.c

@@ -33,6 +33,7 @@
 #include "charsets.h"
 #include "strutil.h"		/* utf-8 functions */
 #include "main.h"
+#include "util.h"		/* concat_dir_and_file() */
 
 int n_codepages = 0;
 

src/chown.c

@@ -26,7 +26,8 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-
+#include <pwd.h>
+#include <grp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

src/cmd.c

@@ -39,6 +39,11 @@
 #include <netdb.h>
 #endif
 #include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/time.h>
 
 #include "global.h"
 #include "cmd.h"		/* Our definitions */

src/command.c

@@ -28,6 +28,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 

src/complete.c

@@ -30,18 +30,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <pwd.h>
 #include <unistd.h>
 
 #include "global.h"
 #include "tty.h"
-#include "win.h"
 #include "color.h"
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
-#include "main.h"
+#include "main.h"		/* show_all_if_ambiguous */
 #include "util.h"
 #include "../src/strescape.h"
 #include "key.h"		/* XCTRL and ALT macros */

src/cons.handler.c

@@ -22,9 +22,11 @@
 
 #include <config.h>
 
+#include <stdlib.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdio.h>
-
+#include <fcntl.h>
 #include <sys/types.h>
 #ifdef __FreeBSD__
 #  include <sys/consio.h>

src/cons.saver.c

@@ -43,9 +43,7 @@
  *  root is even worse.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE

src/dialog.c

@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <ctype.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>

src/dialog.h

@@ -20,10 +20,11 @@
  *  \brief Header: dialog box features module
  */
 
-#ifndef MC_DLG_H
-#define MC_DLG_H
+#ifndef MC_DIALOG_H
+#define MC_DIALOG_H
 
 #include "mouse.h"
+#include "util.h" /* Hook */
 
 /* Color constants */
 #define DLG_NORMALC(h)		((h)->color[0])
@@ -241,4 +242,4 @@ void do_refresh (void);
 /* Used in load_prompt() */
 void update_cursor (Dlg_head *h);
 
-#endif
+#endif				/* MC_DIALOG_H */

src/dir.c

@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,6 +33,7 @@
 #include "wtools.h"
 #include "treestore.h"
 #include "strutil.h"
+#include "fs.h"
 #include "../src/search/search.h"
 
 /* If true show files starting with a dot */

src/ecs.h

@@ -35,6 +35,10 @@
  * byte-to-character encoding.
  */
 
+#include <sys/types.h>		/* size_t */
+
+#include "global.h"		/* include <glib.h> */
+
 /* Use the macros ECS_CHAR and ECS_STR to bring character and string
  * literals to the correct form required by the C compiler. */
 #ifdef EXTCHARSET_ENABLED

src/execute.c

@@ -21,7 +21,8 @@
 
 #include <config.h>
 
-#include <signal.h>
+#include <sys/stat.h>
+#include <sys/time.h>
 
 #include "global.h"
 #include "tty.h"

src/ext.c

@@ -27,6 +27,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

src/file.c

@@ -47,12 +47,14 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
 
 #include "global.h"
 #include "tty.h"

src/file.h

@@ -7,6 +7,7 @@
 #define MC_FILE_H
 
 #include "global.h"
+#include <sys/types.h>		/* off_t */
 #include "fileopctx.h"
 #include "dialog.h"		/* Dlg_head */
 #include "widget.h"		/* WLabel */

src/filenot.c

@@ -35,6 +35,8 @@
 #include <string.h>
 
 #include "global.h"
+#include "fs.h"
+#include "util.h"
 
 static char *
 get_absolute_name (const char *file)

src/find.c

@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #include "global.h"
@@ -38,11 +39,8 @@
 #include "setup.h"
 #include "find.h"
 #include "strutil.h"
-
-/* Dialog manager and widgets */
 #include "dialog.h"
 #include "widget.h"
-
 #include "dir.h"
 #include "panel.h"		/* current_panel */
 #include "main.h"		/* do_cd, try_to_select */

src/fs.h

@@ -9,9 +9,7 @@
 #define MC_FS_H
 
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #include <sys/stat.h>
 
 
@@ -54,30 +52,9 @@
 #endif
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
-#ifdef HAVE_DIRENT_H
-#   include <dirent.h>
-#   define NLENGTH(dirent) (strlen ((dirent)->d_name))
-#   define DIRENT_LENGTH_COMPUTED 1
-#elif defined(_MSC_VER)
-/* dirent provided by glib */
-#   define NLENGTH(dirent) (strlen ((dirent)->d_name))
-#   define DIRENT_LENGTH_COMPUTED 1
-#else
-#   define dirent direct
-#   define NLENGTH(dirent) ((dirent)->d_namlen)
-
-#   ifdef HAVE_SYS_NDIR_H
-#       include <sys/ndir.h>
-#   endif /* HAVE_SYS_NDIR_H */
-
-#   ifdef HAVE_SYS_DIR_H
-#       include <sys/dir.h>
-#   endif /* HAVE_SYS_DIR_H */
-
-#   ifdef HAVE_NDIR_H
-#       include <ndir.h>
-#   endif /* HAVE_NDIR_H */
-#endif /* not (HAVE_DIRENT_H or _POSIX_VERSION) */
+#include <dirent.h>
+#define NLENGTH(dirent) (strlen ((dirent)->d_name))
+#define DIRENT_LENGTH_COMPUTED 1
 
 static inline void
 compute_namelen (struct dirent *dent __attribute__ ((unused)))

src/global.h

@@ -9,8 +9,6 @@
 #ifndef MC_GLOBAL_H
 #define MC_GLOBAL_H
 
-#include <stdlib.h>	/* for free() and other useful routins */
-
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #  include <string.h>
    /* An ANSI string.h and pre-ANSI memory.h might conflict */
@@ -27,10 +25,6 @@
 #  include <sys/param.h>
 #endif
 
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif
-
 /* The O_BINARY definition was taken from gettext */
 #if !defined O_BINARY && defined _O_BINARY
   /* For MSC-compatible compilers.  */
@@ -45,7 +39,6 @@
 #  define O_BINARY 0
 #endif
 
-
 /* Replacement for O_NONBLOCK */
 #ifndef O_NONBLOCK
 #ifdef O_NDELAY /* SYSV */
@@ -55,51 +48,10 @@
 #endif /* !O_NDELAY */
 #endif /* !O_NONBLOCK */
 
-
-#ifdef HAVE_SYS_TIMEB_H
-#  include <sys/timeb.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#  include <sys/time.h>
-#  include <time.h>
-#else
-#  ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else
-#    include <time.h>
-#  endif
-#endif
-
-#if !defined(HAVE_SYS_TIME_H)
-struct timeval {
-    long int tv_sec;  /* seconds */
-    long int tv_usec; /* microseconds */
-};
-#endif /* !HAVE_SYS_TIME_H */
-
-#ifdef HAVE_UTIME_H
-#  include <utime.h>
-#elif defined(HAVE_SYS_UTIME_H)
-#  include <sys/utime.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#  include <sys/wait.h>
-#endif
-
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
 
-#ifdef HAVE_GRP_H
-#  include <grp.h>
-#endif
-
-#ifdef HAVE_PWD_H
-#  include <pwd.h>
-#endif
-
 #if defined(__QNX__) && !defined(__QNXNTO__)
 /* exec*() from <process.h> */
 #  include <unix.h>

src/key.c

@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 

src/layout.c

@@ -28,9 +28,9 @@
 
 #include <signal.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 

src/main.c

@@ -33,9 +33,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
+#include <pwd.h>
 
 #include "global.h"
 #include "tty.h"

src/panel.h

@@ -8,6 +8,7 @@
 
 #include "dir.h"		/* dir_list */
 #include "dialog.h"		/* Widget */
+#include "fs.h"			/* MC_MAXPATHLEN */
 
 #define selection(p) (&(p->dir.list[p->selected]))
 #define DEFAULT_USER_FORMAT "half type name | size | perm"

src/popt.c

@@ -17,9 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "findme.h"

src/search/regex.c

@@ -27,6 +27,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 
 #include "../src/global.h"
 #include "../src/search/search.h"

src/setup.c

@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>

src/subshell.c

@@ -29,13 +29,14 @@
 #endif
 
 #include <ctype.h>
-#include <stdio.h>      
+#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <signal.h>
-
+#include <fcntl.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #ifdef HAVE_SYS_IOCTL_H
 #  include <sys/ioctl.h>
 #endif

src/user.c

@@ -24,6 +24,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -47,7 +48,6 @@
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
-
 #include "view.h" /* for default_* externs */
 
 #define MAX_ENTRIES 16

src/util.c

@@ -34,6 +34,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

src/util.h

@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>
+#include <sys/stat.h>
 
 /* Returns its argument as a "modifiable" string. This function is
  * intended to pass strings to legacy libraries that don't know yet

src/utilunix.c

@@ -36,14 +36,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #ifdef HAVE_SYS_IOCTL_H
 #   include <sys/ioctl.h>
 #endif
 #include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
 
 #include "global.h"
 #include "execute.h"

src/vfsdummy.h

@@ -6,6 +6,9 @@
 #ifndef MC_VFSDUMMY_H
 #define MC_VFSDYMMY_H
 
+#include "global.h"		/* glib.h*/
+#include "util.h"
+
 /* Flags of VFS classes */
 #define VFSF_LOCAL 1		/* Class is local (not virtual) filesystem */
 #define VFSF_NOLINKS 2		/* Hard links not supported */
@@ -76,4 +79,4 @@ vfs_canon (const char *path)
     return p;
 }
 
-#endif
+#endif				/* MC_VFSDUMMY_H */

src/view.c

@@ -42,6 +42,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

src/widget.c

@@ -34,8 +34,10 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <fcntl.h>
 #include <sys/types.h>
 
 #include "global.h"
@@ -44,7 +46,6 @@
 #include "mouse.h"
 #include "dialog.h"
 #include "widget.h"
-#include "win.h"
 #include "key.h"	/* XCTRL and ALT macros  */
 #include "../src/mcconfig/mcconfig.h"	/* for history loading and saving */
 #include "wtools.h"	/* For common_dialog_repaint() */

src/win.c

@@ -23,30 +23,21 @@
 #include <config.h>
 
 #include <stdio.h>
-#include <string.h>
 
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
-#include "global.h"
-#include "tty.h"
-#include "color.h"
-#include "mouse.h"
-#include "dialog.h"
-#include "widget.h"
-#include "win.h"
+#include "global.h"		/* glib.h */
+#include "tty.h"		/* raw(), noraw() */
 #include "key.h"		/* XCTRL and ALT macros  */
 #include "layout.h"
 #include "strutil.h"
+#include "win.h"
 
 /*
  * Common handler for standard movement keys in a text area.  Provided
  * functions are called with the "data" argument.  backfn and forfn also
- * get an argument indicating how many lines to scroll.  Return 1 if
- * the key was handled, 0 otherwise.
+ * get an argument indicating how many lines to scroll.  Return MSG_HANDLED if
+ * the key was handled, MSG_NOT_HANDLED otherwise.
  */
-int
+cb_ret_t
 check_movement_keys (int key, int page_size, void *data, movefn backfn,
 		     movefn forfn, movefn topfn, movefn bottomfn)
 {
@@ -228,4 +219,3 @@ int lookup_key (char *keyname)
     }
     return 0;
 }
-

src/win.h

@@ -6,10 +6,12 @@
 #ifndef MC_WIN_H
 #define MC_WIN_H
 
+#include "dialog.h"	/* cb_ret_t */
+
 /* Keys management */
 typedef void (*movefn) (void *, int);
-int check_movement_keys (int key, int page_size, void *data, movefn backfn,
-			 movefn forfn, movefn topfn, movefn bottomfn);
+cb_ret_t check_movement_keys (int key, int page_size, void *data, movefn backfn,
+				movefn forfn, movefn topfn, movefn bottomfn);
 int lookup_key (char *keyname);
 
 /* Terminal management */
@@ -20,4 +22,4 @@ void do_exit_ca_mode (void);
 void mc_raw_mode (void);
 void mc_noraw_mode (void);
 
-#endif
+#endif				/* MC_WIN_H */

vfs/cpio.c

@@ -27,6 +27,7 @@
 #include <config.h>
 
 #include <errno.h>
+#include <fcntl.h>
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/direntry.c

@@ -32,6 +32,9 @@
 #include <config.h>
 
 #include <errno.h>
+#include <sys/fcntl.h>
+#include <time.h>
+#include <sys/time.h>		/* gettimeofday() */
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/extfs.c

@@ -32,6 +32,7 @@
 /* Namespace: init_extfs */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -40,10 +41,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <signal.h>
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
+#include <fcntl.h>
 #include <errno.h>
+#include <sys/wait.h>
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/fish.c

@@ -45,6 +45,12 @@
 
 #include <config.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/time.h>		/* gettimeofday() */
+#include <stdlib.h>
+#include <string.h>
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */
@@ -52,13 +58,14 @@
 #include "../src/main.h"	/* print_vfs_message */
 #include "../src/util.h"
 #include "../src/strescape.h"
+#include "../src/unixcompat.h"
+#include "../src/fs.h"
 #include "utilvfs.h"
 #include "xdirentry.h"
 #include "vfs.h"
 #include "vfs-impl.h"
 #include "gc.h"		/* vfs_stamp_create */
 #include "tcputil.h"
-#include "../src/unixcompat.h"
 #include "fish.h"
 
 int fish_directory_timeout = 900;

vfs/ftpfs.c

@@ -77,6 +77,8 @@ What to do with this?
 #include <sys/param.h>
 #include <errno.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <sys/time.h>		/* gettimeofday() */
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/gc.c

@@ -39,20 +39,17 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <signal.h>
 #include <ctype.h>		/* is_digit() */
+#include <sys/time.h>		/* gettimeofday() */
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */
-#include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
+#include "../src/layout.h"	/* get_current_type() */
 #include "utilvfs.h"
 #include "vfs-impl.h"
-#include "gc.h"
 #include "vfs.h"
-
-#include "../src/panel.h"	/* get_current_panel() */
-#include "../src/layout.h"	/* get_current_type() */
+#include "gc.h"
 
 
 int vfs_timeout = 60;		/* VFS timeout in seconds */

vfs/local.c

@@ -10,6 +10,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
+#include <fcntl.h>
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/mcserv.c

@@ -40,9 +40,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #ifdef HAVE_LIMITS_H
 #    include <limits.h>
@@ -53,9 +51,7 @@
 #        define NGROUPS_MAX NGROUPS
 #    endif
 #endif
-#ifdef HAVE_GRP_H
-#    include <grp.h>
-#endif
+#include <grp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>

vfs/samba/include/includes.h

@@ -46,37 +46,25 @@
 #endif
 
 #include <sys/types.h>
-
-#ifdef TIME_WITH_SYS_TIME
+#include <fcntl.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
+#include <unistd.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdio.h>
-#include <stddef.h>
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -107,16 +95,6 @@
 #endif
 #endif
 
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#endif
-
-#include <sys/stat.h>
-
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -129,17 +107,11 @@
 #include <sys/filio.h>
 #endif
 
-#include <signal.h>
 
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
-#ifdef HAVE_GRP_H
 #include <grp.h>
-#endif
 #ifdef HAVE_SYS_ID_H
 #include <sys/id.h>
 #endif
@@ -212,22 +184,7 @@
 #include <sys/termio.h>
 #endif
 
-#if HAVE_DIRENT_H
 # include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>

vfs/samba/lib/netmask.c

@@ -237,9 +237,7 @@ this should cover most of the rest of systems
 #elif defined(HAVE_NETMASK_AIX)
 
 #include <stdio.h>
-#ifdef	HAVE_UNISTD_H
 #include <unistd.h>	/* close() declaration for gcc in fussy mode */
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

vfs/sfs.c

@@ -39,6 +39,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
+#include <fcntl.h>
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/tar.c

@@ -33,6 +33,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <ctype.h>
+#include <fcntl.h>
 
 #ifdef hpux
 /* major() and minor() macros (among other things) defined here for hpux */

vfs/undelfs.c

@@ -39,10 +39,11 @@
  */
  
 #include <config.h>
-#include <errno.h>
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <fcntl.h>
 
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>

vfs/utilvfs.c

@@ -29,6 +29,10 @@
 
 #include <ctype.h>
 
+#include <pwd.h>
+#include <grp.h>
+#include <stdlib.h>
+
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */
 #include "../src/wtools.h"	/* message() */

vfs/vfs-impl.h

@@ -9,7 +9,10 @@
 
 #ifdef USE_VFS
 
-#include <stddef.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include "../src/fs.h"		/* MC_MAXPATHLEN */
 
 typedef void *vfsid;
 struct vfs_stamping;

vfs/vfs.c

@@ -45,6 +45,10 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <ctype.h>	/* is_digit() */
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
 
 #include "../src/global.h"
 #include "../src/tty.h"		/* enable/disable interrupt key */

vfs/vfs.h

@@ -7,6 +7,10 @@
 #ifndef MC_VFS_VFS_H
 #define MC_VFS_VFS_H
 
+#include <sys/types.h>
+#include <dirent.h>
+#include <utime.h>
+
 void vfs_init (void);
 void vfs_shut (void);