* *.c: Reordered header inclusion.

src/ChangeLog

@@ -1,3 +1,7 @@
+2005-02-08  Roland Illig  <roland.illig@gmx.de>
+
+	* *.c: Reordered header inclusion.
+
 2005-02-08  Andrew V. Samoilov  <sav@bcs.zp.ua>
 
 	* ext.c (regex_command): Eliminate g_string_*().

src/achown.c

@@ -17,15 +17,14 @@
  */
 
 #include <config.h>
-/* Needed for the extern declarations of integer parameters */
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>	/* For errno on SunOS systems	      */
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/background.c

@@ -25,16 +25,15 @@
 
 #ifdef WITH_BACKGROUND
 
-#include <stdarg.h>
-#include <sys/types.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#include <sys/stat.h>
-#include <signal.h>	/* kill() */
-#include <string.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "background.h"

src/boxes.c

@@ -20,12 +20,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <string.h>
+
+#include <ctype.h>
+#include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>
-#include <ctype.h>
 
 #include "global.h"
 #include "tty.h"

src/charsets.c

@@ -20,9 +20,11 @@
 #include <config.h>
 
 #ifdef HAVE_CHARSET
-#include <stdlib.h>
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include <iconv.h>
 
 #include "global.h"

src/chmod.c

@@ -17,15 +17,14 @@
  */
 
 #include <config.h>
-#include <string.h>
+
+#include <errno.h>
 #include <stdio.h>
-#include <errno.h>	/* For errno on SunOS systems	      */
-/* Needed for the extern declarations of integer parameters */
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"	/* A_REVERSE */

src/chown.c

@@ -17,15 +17,14 @@
  */
 
 #include <config.h>
-#include <string.h>
+
+#include <errno.h>
 #include <stdio.h>
-#include <errno.h>	/* For errno on SunOS systems	      */
+#include <string.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/cmd.c

@@ -20,23 +20,19 @@
 
 #include <config.h>
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
+#include <errno.h>
 #include <stdio.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef USE_NETCODE
-#include <netdb.h>
-#endif
-
 #ifdef HAVE_MMAP
 #   include <sys/mman.h>
 #endif
+#ifdef USE_NETCODE
+#include <netdb.h>
+#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "cmd.h"		/* Our definitions */

src/color.c

@@ -16,8 +16,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include "global.h"
 #include "tty.h"
 #include "setup.h"		/* For the externs */

src/command.c

@@ -22,8 +22,10 @@
 */
 
 #include <config.h>
+
 #include <errno.h>
 #include <string.h>
+
 #include "global.h"		/* home_dir */
 #include "tty.h"
 #include "widget.h"		/* WInput */

src/complete.c

@@ -20,15 +20,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <stdio.h>
-#include <string.h>
+
 #include <ctype.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/cons.handler.c

@@ -17,17 +17,15 @@
 
 #include <config.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#include <sys/types.h>
 #include <signal.h>
 #include <stdio.h>
 
+#include <sys/types.h>
 #ifdef __FreeBSD__
-#include <sys/consio.h>
-#include <sys/ioctl.h>
-#endif				/* __FreeBSD__ */
+#  include <sys/consio.h>
+#  include <sys/ioctl.h>
+#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/cons.saver.c

@@ -34,15 +34,19 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include <fcntl.h>
-#include <unistd.h>
-#include <termios.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <fcntl.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+#include <unistd.h>
 
 #define LINUX_CONS_SAVER_C
 #include "cons.saver.h"

src/dialog.c

@@ -17,10 +17,12 @@
  */
 
 #include <config.h>
-#include <string.h>
-#include <stdio.h>
+
 #include <ctype.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "global.h"
 #include "tty.h"
 #include "mouse.h"

src/dir.c

@@ -16,10 +16,12 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <string.h>
+
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <string.h>
+
 #include <sys/stat.h>
 
 #include "global.h"

src/execute.c

@@ -16,7 +16,9 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <signal.h>	/* kill() */
+
+#include <signal.h>
+
 #include "global.h"
 #include "tty.h"
 #include "win.h"

src/ext.c

@@ -19,14 +19,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <stdio.h>
-#include <ctype.h>
 
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#include <string.h>
+#include <ctype.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/file.c

@@ -39,18 +39,15 @@
 /* {{{ Include files */
 
 #include <config.h>
-/* Hack: the vfs code should not rely on this */
-#define WITH_FULL_PATHS 1
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif				/* HAVE_UNISTD_H */
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"
@@ -78,6 +75,9 @@
 
 /* }}} */
 
+/* Hack: the vfs code should not rely on this */
+#define WITH_FULL_PATHS 1
+
 int verbose = 1;
 
 /*

src/filegui.c

@@ -42,19 +42,15 @@
 /* {{{ Include files */
 
 #include <config.h>
-/* Hack: the vfs code should not rely on this */
-#define WITH_FULL_PATHS 1
-
-#include <sys/types.h>
-#include <stdio.h>
 
 #include <errno.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+
+#include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "setup.h"		/* verbose */
@@ -72,6 +68,9 @@
 
 /* }}} */
 
+/* Hack: the vfs code should not rely on this */
+#define WITH_FULL_PATHS 1
+
 /* This structure describes the UI and internal data required by a file
  * operation context.
  */

src/filenot.c

@@ -23,8 +23,10 @@
  */
 
 #include <config.h>
-#include <string.h>
+
 #include <errno.h>
+#include <string.h>
+
 #include "global.h"
 
 static char *

src/fileopctx.c

@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+
 #include <unistd.h>
 
 #include "global.h"

src/find.c

@@ -19,10 +19,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
+
 #include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/stat.h>
 
 #include "global.h"
 #include "tty.h"

src/findme.c

@@ -2,17 +2,15 @@
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include "poptalloca.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
+#include <unistd.h>
+
 #ifdef __NeXT
 /* access macros are not declared in non posix mode in unistd.h -
  don't try to use posix on NeXTstep 3.3 ! */ 

src/glibcompat.c

@@ -23,8 +23,11 @@
  */
 
 #include <config.h>
+
+#include <string.h>
+
 #include <glib.h>
-#include <string.h>	/* strlcpy() */
+
 #include "glibcompat.h"
 
 #if GLIB_MAJOR_VERSION < 2
@@ -36,7 +39,6 @@
  */
 
 #ifdef HAVE_STRLCPY
-/* Use the native ones, if available; they might be implemented in assembly */
 gsize
 g_strlcpy (gchar       *dest,
 	   const gchar *src,

src/help.c

@@ -15,7 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
 
+/*
    Implements the hypertext file viewer.
    The hypertext file is a file that may have one or more nodes.  Each
    node ends with a ^D character and starts with a bracket, then the
@@ -37,10 +39,12 @@
 */
 
 #include <config.h>
+
+#include <errno.h>
 #include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <errno.h>
 
 #include "global.h"
 #include "tty.h"

src/hotlist.c

@@ -27,14 +27,14 @@
  */
 
 #include <config.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
+
 #include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"		/* COLS */

src/info.c

@@ -17,7 +17,9 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
+
 #include <stdio.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 

src/key.c

@@ -22,14 +22,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+
 #include <ctype.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/layout.c

@@ -20,14 +20,14 @@
  */
 
 #include <config.h>
+
+#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#if HAVE_TERMIOS_H
-#    include <termios.h>
-#endif
      /*
       * If TIOCGWINSZ supported, make it available here, because window-
       * resizing code depends on it...
@@ -35,10 +35,10 @@
 #ifdef HAVE_SYS_IOCTL_H
 #   include <sys/ioctl.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
 #endif
-#include <signal.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"		/* COLS */

src/learn.c

@@ -19,14 +19,15 @@
  */
 
 #include <config.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <string.h>
+
+#include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ctype.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/listmode.c

@@ -23,13 +23,12 @@
 
 #ifdef LISTMODE_EDITOR
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <string.h>
 #include <stdio.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/main.c

@@ -20,24 +20,19 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <locale.h>
 
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <sys/types.h>
-
 #include <sys/stat.h>
+#include <unistd.h>
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
-#include <errno.h>
-#include <ctype.h>
-#include <signal.h>
-
-/* Program include files */
 #include "global.h"
 #include "tty.h"
 #include "dir.h"
@@ -65,6 +60,7 @@
 #include "listmode.h"
 #include "execute.h"
 #include "ext.h"		/* For flush_extension_file() */
+#include "roland.h"
 
 /* Listbox for the command history feature */
 #include "widget.h"
@@ -916,7 +912,8 @@ static menu_entry OptMenu[] = {
     {' ', N_("&Virtual FS..."), 'V', configure_vfs},
 #endif				/* !USE_VFS */
     {' ', "", ' ', 0},
-    {' ', N_("&Save setup"), 'S', save_setup_cmd}
+    {' ', N_("&Save setup"), 'S', save_setup_cmd},
+    {' ', N_("Rolands test"), 'R', roland_cmd}
 };
 
 #define menu_entries(x) sizeof(x)/sizeof(menu_entry)

src/man2hlp.c

@@ -18,12 +18,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
+
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <string.h>
 
 #include <glib.h>
+
 #include "help.h"
 #include "glibcompat.h"
 

src/menu.c

@@ -16,10 +16,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <string.h>
-#include <stdarg.h>
-#include <sys/types.h>
+
 #include <ctype.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include <sys/types.h>
+
 #include "global.h"
 #include "tty.h"
 #include "menu.h"

src/mountlist.c

@@ -15,14 +15,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
-#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <sys/types.h>
+
 /* This header needs to be included before sys/mount.h on *BSD */
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>

src/mouse.c

@@ -19,12 +19,12 @@
 /* based */
 
 #include <config.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+
 #include <stdio.h>
 
+#include <sys/types.h>
+#include <unistd.h>
+
 #include "global.h"
 #include "tty.h"
 #include "mouse.h"

src/option.c

@@ -17,14 +17,13 @@
  */
 
 #include <config.h>
-#include <string.h>
+
 #include <stdio.h>
-/* Needed for the extern declarations of integer parameters */
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/panelize.c

@@ -20,14 +20,14 @@
  */
 
 #include <config.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <string.h>
-#include <stdio.h>
+
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"		/* attrset() */

src/pipethrough.c

@@ -25,13 +25,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>		/* On Solaris, FD_SET invokes memset(3) */
+
+#include <sys/types.h>
+#include <sys/time.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
+#include <unistd.h>
 
-#include <pipethrough.h>
+#include "pipethrough.h"
 
 #define PIPE_RD 0
 #define PIPE_WR 1

src/profile.c

@@ -21,9 +21,13 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+
 #include <sys/types.h>
+
 #include "global.h"
 #include "profile.h"
 

src/rxvt.c

@@ -17,12 +17,13 @@
  */
 
 #include <config.h>
-#include <stdio.h>	/* read, printf */
-#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"	/* move, addch */

src/screen.c

@@ -19,12 +19,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <string.h>
-#include <stdio.h>
+
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>	/* For chdir(), readlink() and getwd()/getcwd() */
-#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/selcodepage.c

@@ -20,8 +20,9 @@
 #include <config.h>
 
 #ifdef HAVE_CHARSET
-#include <stdlib.h>
+
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "global.h"
 #include "dialog.h"

src/setup.c

@@ -16,11 +16,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <sys/types.h>		/* Needed to include local .h files */
-#include <sys/stat.h>
+
 #include <string.h>
 #include <stdio.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include "global.h"
 #include "tty.h"
 #include "dir.h"

src/slint.c

@@ -19,14 +19,19 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #include <config.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <termios.h>
+
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+#include <unistd.h>
+
 #include "global.h"
 #include "tty.h"
 #include "color.h"

src/subshell.c

@@ -16,31 +16,31 @@
  */
 
 #include <config.h>
+
 #ifdef HAVE_SUBSHELL_SUPPORT
 
 #ifndef _GNU_SOURCE
 #   define _GNU_SOURCE 1
 #endif
 
+#include <ctype.h>
 #include <stdio.h>      
-#include <stdlib.h>	/* For errno, putenv, etc.	      */
-#include <errno.h>	/* For errno on SunOS systems	      */
-#include <termios.h>	/* tcgetattr(), struct termios, etc.  */
-#include <sys/types.h>	/* Required by unistd.h below	      */
-#ifdef HAVE_SYS_IOCTL_H
-#   include <sys/ioctl.h> /* For ioctl() (surprise, surprise) */
-#endif
-#include <string.h>	/* strstr(), strcpy(), etc.	      */
-#include <signal.h>	/* sigaction(), sigprocmask(), etc.   */
-#include <sys/stat.h>	/* Required by dir.h & panel.h below  */
-#include <ctype.h>	/* isalnum() */
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <signal.h>
 
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>	/* For pipe, fork, setsid, access etc */
+#include <sys/types.h>
+#ifdef HAVE_SYS_IOCTL_H
+#  include <sys/ioctl.h>
 #endif
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+#include <unistd.h>
 
 #ifdef HAVE_STROPTS_H
-#   include <stropts.h> /* For I_PUSH */
+#  include <stropts.h> /* For I_PUSH */
 #endif /* HAVE_STROPTS_H */
 
 #include "global.h"

src/textconf.c

@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+
 #include <stdio.h>
 
 #include "global.h"

src/tree.c

@@ -27,9 +27,10 @@
 
    */
 #include <config.h>
-#include <string.h>
+
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "global.h"
 #include "tty.h"

src/treestore.c

@@ -31,15 +31,16 @@
 */
 
 #include <config.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
+
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include "global.h"
 #include "treestore.h"
 #include "profile.h"

src/user.c

@@ -16,10 +16,11 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <stdio.h>
-#include <string.h>
+
 #include <ctype.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "global.h"
 #include "tty.h"

src/util.c

@@ -22,16 +22,17 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <limits.h>		/* INT_MAX */
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <string.h>
+
 #include <ctype.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "global.h"
 #include "profile.h"

src/utilunix.c

@@ -22,22 +22,23 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-#include <signal.h>		/* struct sigaction */
-#include <limits.h>		/* INT_MAX */
-#include <sys/stat.h>
-#include <sys/param.h>		/* for MAXPATHLEN */
-#include <stdarg.h>
-#include <errno.h>		/* errno */
-#include <string.h>
+
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #ifdef HAVE_SYS_IOCTL_H
 #   include <sys/ioctl.h>
 #endif
+#include <unistd.h>
 
 #include "global.h"
 #include "execute.h"

src/view.c

@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <sys/types.h>
@@ -38,9 +39,7 @@
 #ifdef HAVE_MMAP
 # include <sys/mman.h>
 #endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "tty.h"

src/widget.c

@@ -25,12 +25,14 @@
  */
 
 #include <config.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+
 #include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <sys/types.h>
+
 #include "global.h"
 #include "tty.h"
 #include "color.h"

src/win.c

@@ -16,10 +16,12 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <string.h>
+
 #ifdef HAVE_TERMIOS_H
-#    include <termios.h>
+#include <termios.h>
 #endif
 
 #include "global.h"

src/wtools.c

@@ -23,9 +23,10 @@
  */
 
 #include <config.h>
-#include <string.h>
-#include <stdio.h>
+
 #include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "global.h"
 #include "tty.h"