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() */