Don't include lib/util.h via lib/global.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/filehighlight/get-color.c

@@ -30,6 +30,7 @@
 
 #include "lib/global.h"
 #include "lib/skin.h"
+#include "lib/util.h"           /* is_exe() */
 #include "lib/filehighlight.h"
 #include "internal.h"
 

lib/filehighlight/ini-file-read.c

@@ -32,6 +32,7 @@
 #include "lib/fileloc.h"
 #include "lib/strescape.h"
 #include "lib/skin.h"
+#include "lib/util.h"           /* exist_file() */
 #include "lib/filehighlight.h"
 
 #include "src/main.h"

lib/global.h

@@ -84,7 +84,6 @@
 #endif /* !ENABLE_NLS */
 
 #include "fs.h"
-#include "util.h"
 
 #ifdef USE_MAINTAINER_MODE
 #include "lib/logging.h"

lib/mcconfig/common.c

@@ -27,6 +27,7 @@
 
 #include "lib/global.h"
 #include "lib/vfs/mc-vfs/vfs.h" /* mc_stat */
+#include "lib/util.h"
 #include "lib/mcconfig.h"
 
 /*** global variables **************************************************/

lib/skin/ini-file.c

@@ -30,6 +30,7 @@
 
 #include "internal.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"           /* exist_file() */
 
 #include "src/main.h"
 

lib/tty/win.c

@@ -33,6 +33,7 @@
 #include <unistd.h>
 
 #include "lib/global.h"
+#include "lib/util.h"           /* is_printable() */
 #include "tty.h"                /* tty_gotoyx, tty_print_char */
 #include "win.h"
 #include "src/consaver/cons.saver.h"    /* console_flag */

lib/util.c

@@ -42,12 +42,11 @@
 
 #include "lib/global.h"
 #include "lib/tty/win.h"        /* xterm_flag */
-#include "lib/search.h"
 #include "lib/mcconfig.h"
-#include "lib/timefmt.h"
 #include "lib/fileloc.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 
 #include "src/filegui.h"
 #include "src/file.h"           /* copy_file_file() */

lib/utilunix.c

@@ -52,8 +52,9 @@
 #include <grp.h>
 
 #include "lib/global.h"
-#include "lib/strutil.h"        /* str_move() */
 #include "lib/vfs/mc-vfs/vfs.h" /* VFS_ENCODING_PREFIX */
+#include "lib/strutil.h"        /* str_move() */
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "src/execute.h"

lib/vfs/mc-vfs/cpio.c

@@ -31,6 +31,7 @@
 
 #include "lib/global.h"
 #include "lib/unixcompat.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/extfs.c

@@ -48,6 +48,7 @@
 
 #include "lib/global.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "src/main.h"           /* shell */