Changes in sources matched with mass movement of $(srcdir)/src/*/ into $(srcdir)/lib/*/

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

lib/filehighlight/common.c

@@ -29,7 +29,7 @@
 
 
 #include "../src/global.h"
-#include "../src/filehighlight/fhl.h"
+#include "../lib/filehighlight/fhl.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/filehighlight/fhl.h

@@ -1,8 +1,8 @@
 #ifndef MC__FILEHIGHLIGHT_H
 #define MC__FILEHIGHLIGHT_H
 
-#include "../../src/mcconfig/mcconfig.h"
-#include "../../src/search/search.h"
+#include "../../lib/mcconfig/mcconfig.h"
+#include "../../lib/search/search.h"
 #include "../src/dir.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/

lib/filehighlight/get-color.c

@@ -31,8 +31,8 @@
 
 #include "../src/global.h"
 #include "../src/util.h"
-#include "../src/skin/skin.h"
-#include "../src/filehighlight/fhl.h"
+#include "../lib/skin/skin.h"
+#include "../lib/filehighlight/fhl.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/filehighlight/ini-file-read.c

@@ -32,7 +32,7 @@
 #include "../src/main.h"
 #include "../src/fileloc.h"
 #include "../src/strescape.h"
-#include "../src/skin/skin.h"
+#include "../lib/skin/skin.h"
 #include "../../src/util.h"
 #include "fhl.h"
 #include "internal.h"

lib/search/glob.c

@@ -29,8 +29,8 @@
 
 
 #include "../src/global.h"
-#include "../src/search/search.h"
-#include "../src/search/internal.h"
+#include "search.h"
+#include "internal.h"
 #include "../src/strutil.h"
 #include "../src/strescape.h"
 #include "../src/charsets.h"

lib/search/hex.c

@@ -30,8 +30,8 @@
 #include <stdio.h>
 
 #include "../src/global.h"
-#include "../src/search/search.h"
-#include "../src/search/internal.h"
+#include "search.h"
+#include "internal.h"
 #include "../src/strutil.h"
 #include "../src/strescape.h"
 #include "../src/charsets.h"

lib/search/lib.c

@@ -31,8 +31,8 @@
 #include <sys/types.h>
 
 #include "../src/global.h"
-#include "../src/search/search.h"
-#include "../src/search/internal.h"
+#include "search.h"
+#include "internal.h"
 #include "../src/strutil.h"
 #include "../src/charsets.h"
 

lib/search/normal.c

@@ -29,8 +29,8 @@
 
 
 #include "../src/global.h"
-#include "../src/search/search.h"
-#include "../src/search/internal.h"
+#include "search.h"
+#include "internal.h"
 #include "../src/strutil.h"
 #include "../src/charsets.h"
 

lib/search/regex.c

@@ -30,8 +30,8 @@
 #include <stdlib.h>
 
 #include "../src/global.h"
-#include "../src/search/search.h"
-#include "../src/search/internal.h"
+#include "search.h"
+#include "internal.h"
 #include "../src/strutil.h"
 #include "../src/strescape.h"
 #include "../src/charsets.h"

lib/search/search.c

@@ -31,8 +31,8 @@
 #include <sys/types.h>
 
 #include "../src/global.h"
-#include "../src/search/search.h"
-#include "../src/search/internal.h"
+#include "search.h"
+#include "internal.h"
 #include "../src/strutil.h"
 #include "../src/charsets.h"
 

lib/skin/colors-old.c

@@ -28,7 +28,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <sys/types.h>          /* size_t */
-#include "../src/tty/color.h"
+#include "../tty/color.h"
 
 #include "../src/global.h"
 #include "../src/setup.h"

lib/skin/colors.c

@@ -30,7 +30,7 @@
 
 #include "../src/global.h"
 #include "../src/args.h"
-#include "../src/tty/color.h"
+#include "../tty/color.h"
 #include "skin.h"
 #include "internal.h"
 

lib/skin/lines.c

@@ -30,7 +30,7 @@
 
 #include "../src/global.h"
 #include "../src/args.h"
-#include "../src/tty/tty.h"
+#include "../tty/tty.h"
 #include "skin.h"
 #include "internal.h"
 

lib/skin/skin.h

@@ -3,9 +3,9 @@
 
 #include "../../src/global.h"
 
-#include "../../src/mcconfig/mcconfig.h"
+#include "../../lib/mcconfig/mcconfig.h"
 
-#include "../src/tty/color.h"
+#include "../lib/tty/color.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

lib/tty/color-internal.c

@@ -28,8 +28,8 @@
 
 #include <string.h>             /* strcmp */
 
-#include "../../src/tty/color.h"        /* colors and attributes */
-#include "../../src/tty/color-internal.h"
+#include "color.h"        /* colors and attributes */
+#include "color-internal.h"
 
 /*** global variables ****************************************************************************/
 

lib/tty/color-internal.h

@@ -11,9 +11,9 @@
 #include "../../src/global.h"
 
 #ifdef HAVE_SLANG
-#   include "../../src/tty/tty-slang.h"
+#   include "tty-slang.h"
 #else
-#   include "../../src/tty/tty-ncurses.h"
+#   include "tty-ncurses.h"
 #endif /* HAVE_SLANG */
 
 extern gboolean use_colors;

lib/tty/color-ncurses.c

@@ -32,9 +32,9 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty-ncurses.h"
-#include "../../src/tty/color.h"        /* variables */
-#include "../../src/tty/color-internal.h"
+#include "tty-ncurses.h"
+#include "color.h"        /* variables */
+#include "color-internal.h"
 
 /*** global variables ****************************************************************************/
 

lib/tty/color-slang.c

@@ -32,9 +32,9 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty-slang.h"
-#include "../../src/tty/color.h"        /* variables */
-#include "../../src/tty/color-internal.h"
+#include "tty-slang.h"
+#include "color.h"        /* variables */
+#include "color-internal.h"
 
 #include "../../src/setup.h"    /* color_terminal_string */
 

lib/tty/color-slang.h

@@ -6,7 +6,7 @@
 #ifndef MC_COLOR_SLANG_H
 #define MC_COLOR_SLANG_H
 
-#include "../../src/tty/tty-slang.h"    /* S-Lang headers */
+#include "tty-slang.h"    /* S-Lang headers */
 
 enum {
     COLOR_BLACK = 0,

lib/tty/color.c

@@ -35,10 +35,10 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty.h"
-#include "../../src/tty/color.h"
+#include "tty.h"
+#include "color.h"
 
-#include "../../src/tty/color-internal.h"
+#include "color-internal.h"
 
 /*** global variables ****************************************************************************/
 

lib/tty/color.h

@@ -15,9 +15,9 @@
 #include "../../src/global.h"   /* glib.h */
 
 #ifdef HAVE_SLANG
-#   include "../../src/tty/color-slang.h"
+#   include "color-slang.h"
 #else
-#   include "../../src/tty/tty-ncurses.h"
+#   include "tty-ncurses.h"
 #endif
 
 extern char *command_line_colors;

lib/tty/key.c

@@ -39,11 +39,11 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty.h"
-#include "../../src/tty/tty-internal.h" /* mouse_enabled */
-#include "../../src/tty/mouse.h"
-#include "../../src/tty/key.h"
-#include "../../src/tty/win.h"  /* xterm_flag */
+#include "tty.h"
+#include "tty-internal.h" /* mouse_enabled */
+#include "mouse.h"
+#include "key.h"
+#include "win.h"  /* xterm_flag */
 
 #include "../../src/main.h"
 #include "../../src/layout.h"   /* winch_flag, mc_refresh() */
@@ -57,7 +57,7 @@
 #endif /* ENABLE_VFS */
 
 #ifdef HAVE_TEXTMODE_X11_SUPPORT
-#include "../src/tty/x11conn.h"
+#include "x11conn.h"
 #endif
 
 #ifdef __linux__

lib/tty/key.h

@@ -9,7 +9,7 @@
 #include "../../src/global.h"   /* <glib.h> */
 #include "../../src/dialog.h"   /* cb_ret_t */
 
-#include "../../src/tty/tty.h"  /* KEY_F macro */
+#include "tty.h"  /* KEY_F macro */
 
 gboolean define_sequence (int code, const char *seq, int action);
 

lib/tty/keyxdef.c

@@ -43,9 +43,9 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty.h"
-#include "../../src/tty/mouse.h"        /* required before key.h */
-#include "../../src/tty/key.h"
+#include "tty.h"
+#include "mouse.h"        /* required before key.h */
+#include "key.h"
 
 #if defined (__QNX__) && !defined (__QNXNTO__)
 #define HAVE_QNX_KEYS

lib/tty/mouse.c

@@ -33,10 +33,10 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty.h"
-#include "../../src/tty/tty-internal.h" /* mouse_enabled */
-#include "../../src/tty/mouse.h"
-#include "../../src/tty/key.h"  /* define sequence */
+#include "tty.h"
+#include "tty-internal.h" /* mouse_enabled */
+#include "mouse.h"
+#include "key.h"  /* define sequence */
 
 gboolean mouse_enabled = FALSE;
 const char *xmouse_seq;

lib/tty/tty-ncurses.c

@@ -42,10 +42,10 @@
 #   define WANT_TERM_H
 #endif
 
-#include "../../src/tty/tty-internal.h" /* slow_tty */
-#include "../../src/tty/tty.h"
-#include "../../src/tty/color-internal.h"
-#include "../../src/tty/win.h"
+#include "tty-internal.h" /* slow_tty */
+#include "tty.h"
+#include "color-internal.h"
+#include "win.h"
 #include "../../src/main.h"
 
 #include "../../src/strutil.h"  /* str_term_form */

lib/tty/tty-slang.c

@@ -41,13 +41,13 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty-internal.h" /* slow_tty */
-#include "../../src/tty/tty.h"
-#include "../../src/tty/color-slang.h"
-#include "../../src/tty/color-internal.h"
-#include "../../src/tty/mouse.h"        /* Gpm_Event is required in key.h */
-#include "../../src/tty/key.h"  /* define_sequence */
-#include "../../src/tty/win.h"
+#include "tty-internal.h" /* slow_tty */
+#include "tty.h"
+#include "color-slang.h"
+#include "color-internal.h"
+#include "mouse.h"        /* Gpm_Event is required in key.h */
+#include "key.h"  /* define_sequence */
+#include "win.h"
 
 #include "../../src/strutil.h"  /* str_term_form */
 

lib/tty/tty.c

@@ -36,8 +36,8 @@
 
 #include "../../src/global.h"
 
-#include "../../src/tty/tty.h"
-#include "../../src/tty/tty-internal.h"
+#include "tty.h"
+#include "tty-internal.h"
 
 #include "../../src/strutil.h"
 

lib/tty/tty.h

@@ -14,9 +14,9 @@
 #include "../../src/global.h"   /* include <glib.h> */
 
 #ifdef HAVE_SLANG
-#   include "../../src/tty/tty-slang.h"
+#   include "tty-slang.h"
 #else
-#   include "../../src/tty/tty-ncurses.h"
+#   include "tty-ncurses.h"
 #endif
 
 /* {{{ Input }}} */

lib/tty/win.c

@@ -32,8 +32,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../../src/tty/tty.h"  /* tty_gotoyx, tty_print_char */
-#include "../../src/tty/win.h"
+#include "tty.h"  /* tty_gotoyx, tty_print_char */
+#include "win.h"
 #include "../../src/util.h"
 #include "../../src/cons.saver.h"       /* console_flag */
 

lib/tty/x11conn.c

@@ -40,7 +40,7 @@ typedef int dummy;              /* C99 forbids empty compilation unit */
 #endif
 
 #include "../../src/global.h"
-#include "../../src/tty/x11conn.h"
+#include "x11conn.h"
 
 /*** file scope type declarations **************************************/
 

lib/vfs/mc-vfs/direntry.c

@@ -37,7 +37,8 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+#include "../tty/tty.h"	/* enable/disable interrupt key */
+
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
 #include "../vfs/vfs.h"

lib/vfs/mc-vfs/fish.c

@@ -54,7 +54,7 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+#include "../tty/tty.h"	/* enable/disable interrupt key */
 
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */

lib/vfs/mc-vfs/ftpfs.c

@@ -85,13 +85,13 @@ What to do with this?
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"	/* enable/disable interrupt key */
+#include "../lib/tty/tty.h"	/* enable/disable interrupt key */
 
 #include "../src/wtools.h"	/* message() */
 #include "../src/main.h"	/* print_vfs_message */
 #include "../src/history.h"
 #include "../src/setup.h"	/* for load_anon_passwd */
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 
 #include "utilvfs.h"
 #include "xdirentry.h"

src/achown.c

@@ -35,10 +35,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"		/* XCTRL and ALT macros */
-#include "../src/skin/skin.h"
-#include "../vfs/vfs.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"		/* XCTRL and ALT macros */
+#include "../lib/skin/skin.h"
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 #include "dialog.h"
 #include "widget.h"

src/args.c

@@ -29,7 +29,7 @@
 
 
 #include "../src/global.h"
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "../src/args.h"
 #include "../src/strutil.h"
 #include "../src/textconf.h"

src/background.c

@@ -48,7 +48,7 @@
 #include "wtools.h"
 #include "layout.h"	/* repaint_screen() */
 #include "fileopctx.h"	/* FileOpContext */
-#include "../src/tty/key.h"	/* add_select_channel(), delete_select_channel() */
+#include "../lib/tty/key.h"	/* add_select_channel(), delete_select_channel() */
 
 enum ReturnType {
     Return_String,

src/boxes.c

@@ -36,11 +36,11 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"		/* INPUT_COLOR */
-#include "../src/tty/key.h"		/* XCTRL and ALT macros  */
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"		/* INPUT_COLOR */
+#include "../lib/tty/key.h"		/* XCTRL and ALT macros  */
 
-#include "../src/mcconfig/mcconfig.h"	/* Load/save user formats */
+#include "../lib/mcconfig/mcconfig.h"	/* Load/save user formats */
 
 #include "dialog.h"		/* The nice dialog manager */
 #include "widget.h"		/* The widgets for the nice dialog manager */

src/chmod.c

@@ -33,9 +33,9 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../vfs/vfs.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 #include "dialog.h"	/* add_widget() */
 #include "widget.h"	/* NORMAL_BUTTON */

src/chown.c

@@ -34,9 +34,9 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../vfs/vfs.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 #include "dialog.h"
 #include "widget.h"

src/cmd.c

@@ -47,14 +47,14 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"		/* LINES, tty_touch_screen() */
-#include "../src/tty/key.h"		/* ALT() macro */
-#include "../src/tty/win.h"		/* do_enter_ca_mode() */
-#include "../src/mcconfig/mcconfig.h"
-#include "../src/search/search.h"
+#include "../lib/tty/tty.h"		/* LINES, tty_touch_screen() */
+#include "../lib/tty/key.h"		/* ALT() macro */
+#include "../lib/tty/win.h"		/* do_enter_ca_mode() */
+#include "../lib/mcconfig/mcconfig.h"
+#include "../lib/search/search.h"
 #include "../src/viewer/mcviewer.h"
-#include "../src/filehighlight/fhl.h"	/* MC_FHL_INI_FILE */
-#include "../vfs/vfs.h"
+#include "../lib/filehighlight/fhl.h"	/* MC_FHL_INI_FILE */
+#include "../lib/vfs/mc-vfs/vfs.h"
 
 #include "cmd.h"		/* Our definitions */
 #include "fileopctx.h"

src/command.c

@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "global.h"		/* home_dir */
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "../../lib/vfs/mc-vfs/vfs.h"
 #include "widget.h"		/* WInput */
 #include "command.h"
@@ -44,7 +44,7 @@
 #include "user.h"		/* expand_format */
 #include "subshell.h"		/* SUBSHELL_EXIT */
 #include "tree.h"		/* for tree_chdir */
-#include "../src/skin/skin.h"		/* DEFAULT_COLOR */
+#include "../lib/skin/skin.h"		/* DEFAULT_COLOR */
 #include "execute.h"		/* shell_execute */
 #include "../src/strescape.h"
 

src/complete.c

@@ -38,9 +38,9 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"		/* XCTRL and ALT macros */
-#include "../vfs/vfs.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"		/* XCTRL and ALT macros */
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 #include "dialog.h"
 #include "widget.h"

src/cons.handler.c

@@ -36,9 +36,9 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"		/* tty_set_normal_attrs */
-#include "../src/tty/win.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"		/* tty_set_normal_attrs */
+#include "../lib/tty/win.h"
 
 #include "cons.saver.h"
 

src/cons.saver.c

@@ -62,7 +62,7 @@
 
 #define LINUX_CONS_SAVER_C
 #include "cons.saver.h"
-#include "../src/tty/win.h"
+#include "../lib/tty/win.h"
 
 static void
 send_contents (char *buffer, unsigned int columns, unsigned int rows)

src/dialog.c

@@ -31,10 +31,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/key.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/key.h"
 
 #include "help.h"	/* interactive_display() */
 #include "dialog.h"

src/dialog.h

@@ -23,7 +23,7 @@
 #ifndef MC_DIALOG_H
 #define MC_DIALOG_H
 
-#include "../src/tty/mouse.h"
+#include "../lib/tty/mouse.h"
 #include "util.h" /* Hook */
 
 /* Common return values */

src/dir.c

@@ -27,9 +27,9 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "../src/tty/tty.h"
-#include "../src/search/search.h"
-#include "../vfs/vfs.h"
+#include "../lib/tty/tty.h"
+#include "../lib/search/search.h"
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 #include "global.h"
 #include "wtools.h"

src/editor/edit-widget.h

@@ -7,7 +7,7 @@
 #define MC_EDIT_WIDGET_H
 
 #include "../src/dialog.h"		/* Widget */
-#include "../src/search/search.h"		/* mc_search_t */
+#include "../lib/search/search.h"		/* mc_search_t */
 
 #include "edit-impl.h"
 #include "../src/keybind.h"

src/editor/edit.c

@@ -41,11 +41,11 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/color.h"	
-#include "../src/tty/tty.h"	/* attrset() */
-#include "../src/tty/key.h"	/* is_idle() */
+#include "../lib/tty/color.h"	
+#include "../lib/tty/tty.h"	/* attrset() */
+#include "../lib/tty/key.h"	/* is_idle() */
 
-#include "../src/skin/skin.h"	/* EDITOR_NORMAL_COLOR */
+#include "../lib/skin/skin.h"	/* EDITOR_NORMAL_COLOR */
 
 #include "../src/widget.h"
 #include "../src/cmd.h"		/* view_other_cmd() */

src/editor/editcmd.c

@@ -47,12 +47,12 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"	/* XCTRL */
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"	/* XCTRL */
 
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 
-#include "../src/skin/skin.h"
+#include "../lib/skin/skin.h"
 
 #include "../src/history.h"
 #include "../src/widget.h"	/* listbox_new() */

src/editor/editcmd_dialogs.c

@@ -28,11 +28,11 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"		/* INPUT_COLOR */
-#include "../src/tty/key.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"		/* INPUT_COLOR */
+#include "../lib/tty/key.h"
 
-#include "../src/search/search.h"
+#include "../lib/search/search.h"
 
 #include "../src/dialog.h"
 #include "../src/widget.h"

src/editor/editdraw.c

@@ -45,9 +45,9 @@
 
 #define MAX_LINE_LEN 1024
 
-#include "../src/tty/tty.h"		/* tty_printf() */
-#include "../src/skin/skin.h"
-#include "../src/tty/key.h"		/* is_idle() */
+#include "../lib/tty/tty.h"		/* tty_printf() */
+#include "../lib/skin/skin.h"
+#include "../lib/tty/key.h"		/* is_idle() */
 
 #include "../src/widget.h"		/* buttonbar_redraw() */
 #include "../src/charsets.h"

src/editor/editkeys.c

@@ -45,8 +45,8 @@
 #include "edit-widget.h"	/* edit->macro_i */
 #include "editcmd_dialogs.h"
 
-#include "../src/tty/tty.h"	/* keys */
-#include "../src/tty/key.h"	/* KEY_M_SHIFT */
+#include "../lib/tty/tty.h"	/* keys */
+#include "../lib/tty/key.h"	/* KEY_M_SHIFT */
 
 #include "../src/cmddef.h"	/* list of commands */
 #include "../src/keybind.h"	/* lookup_keymap_command() */

src/editor/editmenu.c

@@ -41,8 +41,8 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"	/* KEY_F */
-#include "../src/tty/key.h"	/* XCTRL */
+#include "../lib/tty/tty.h"	/* KEY_F */
+#include "../lib/tty/key.h"	/* XCTRL */
 
 #include "../src/menu.h"	/* menu_entry */
 #include "../src/main.h"	/* drop_menus */

src/editor/editwidget.c

@@ -41,8 +41,8 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"		/* LINES, COLS */
-#include "../src/tty/key.h"		/* is_idle() */
+#include "../lib/tty/tty.h"		/* LINES, COLS */
+#include "../lib/tty/key.h"		/* is_idle() */
 
 #include "edit-impl.h"
 #include "edit-widget.h"

src/editor/syntax.c

@@ -48,9 +48,9 @@
 
 #include "../src/global.h"
 
-#include "../src/search/search.h"	/* search engine */
+#include "../lib/search/search.h"	/* search engine */
 
-#include "../src/skin/skin.h"
+#include "../lib/skin/skin.h"
 
 #include "../src/main.h"		/* mc_home */
 #include "../src/wtools.h"		/* message() */

src/execute.c

@@ -27,9 +27,9 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
-#include "../src/tty/win.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
+#include "../lib/tty/win.h"
 
 #include "main.h"
 #include "cons.saver.h"

src/ext.c

@@ -33,7 +33,7 @@
 #include <unistd.h>
 
 #include "global.h"
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "user.h"
 #include "main.h"
 #include "wtools.h"
@@ -42,7 +42,7 @@
 #include "history.h"
 #include "cons.saver.h"
 #include "layout.h"
-#include "../src/search/search.h"
+#include "../lib/search/search.h"
 #include "../src/viewer/mcviewer.h"
 
 #include "../../lib/vfs/mc-vfs/vfs.h"

src/file.c

@@ -58,10 +58,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
 
-#include "../src/search/search.h"
+#include "../lib/search/search.h"
 
 #include "setup.h"
 #include "dialog.h"

src/filegui.c

@@ -78,9 +78,9 @@
 
 #include "global.h"
 
-#include "../src/tty/key.h"		/* tty_get_event */
-#include "../src/search/search.h"
-#include "../vfs/vfs.h"
+#include "../lib/tty/key.h"		/* tty_get_event */
+#include "../lib/search/search.h"
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 #include "setup.h"		/* verbose */
 #include "dialog.h"		/* do_refresh() */

src/fileopctx.c

@@ -34,8 +34,8 @@
 
 #include "global.h"
 #include "fileopctx.h"
-#include "../src/search/search.h"
-#include "../vfs/vfs.h"
+#include "../lib/search/search.h"
+#include "../lib/vfs/mc-vfs/vfs/vfs.h"
 
 /**
  * \fn FileOpContext * file_op_context_new (FileOperation op)

src/find.c

@@ -34,11 +34,11 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
-#include "../src/skin/skin.h"
-#include "../src/search/search.h"
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
+#include "../lib/skin/skin.h"
+#include "../lib/search/search.h"
+#include "../lib/mcconfig/mcconfig.h"
 
 #include "../../lib/vfs/mc-vfs/vfs.h"
 

src/help.c

@@ -53,10 +53,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/key.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/key.h"
 
 #include "dialog.h"		/* For Dlg_head */
 #include "widget.h"		/* For Widget */

src/hotlist.c

@@ -42,14 +42,14 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"		/* COLS */
-#include "../src/skin/skin.h"
-#include "../src/tty/key.h"		/* KEY_M_CTRL */
+#include "../lib/tty/tty.h"		/* COLS */
+#include "../lib/skin/skin.h"
+#include "../lib/tty/key.h"		/* KEY_M_CTRL */
 
 #include "dialog.h"
 #include "widget.h"
 #include "setup.h"		/* For profile_bname */
-#include "../src/mcconfig/mcconfig.h"	/* Load/save directories hotlist */
+#include "../lib/mcconfig/mcconfig.h"	/* Load/save directories hotlist */
 #include "wtools.h"		/* QuickDialog */
 #include "panel.h"		/* current_panel */
 #include "main.h"		/* update_panels() */

src/info.c

@@ -26,10 +26,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"		/* is_idle() */
-#include "../src/tty/mouse.h"		/* Gpm_Event */
-#include "../src/skin/skin.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"		/* is_idle() */
+#include "../lib/tty/mouse.h"		/* Gpm_Event */
+#include "../lib/skin/skin.h"
 
 #include "dialog.h"
 #include "widget.h"		/* default_proc*/

src/keybind.c

@@ -37,9 +37,9 @@
 #include "global.h"
 
 #include "cmddef.h"		/* CK_ cmd name const */
-#include "tty/win.h"
-#include "tty/key.h"		/* KEY_M_ */
-#include "tty/tty.h"		/* keys */
+#include "../lib/tty/win.h"
+#include "../lib/tty/key.h"		/* KEY_M_ */
+#include "../lib/tty/tty.h"		/* keys */
 #include "wtools.h"
 #include "strutil.h"
 

src/layout.c

@@ -46,13 +46,13 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/key.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/win.h"	/* do_enter_ca_mode() */
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/key.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/win.h"	/* do_enter_ca_mode() */
 
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 
 #include "dialog.h"
 #include "widget.h"

src/learn.c

@@ -36,12 +36,12 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
 
 #include "dialog.h"
 #include "widget.h"
-#include "../src/mcconfig/mcconfig.h"	/* Save profile */
+#include "../lib/mcconfig/mcconfig.h"	/* Save profile */
 #include "setup.h"
 #include "layout.h"			/* repaint_screen() */
 #include "learn.h"

src/logging.c

@@ -35,7 +35,7 @@
 #include "global.h"
 #include "logging.h"
 #include "setup.h"
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 #include "fileloc.h"
 
 /*** file scope functions **********************************************/

src/main.c

@@ -41,16 +41,15 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/key.h"		/* For init_key() */
-#include "../src/tty/win.h"		/* xterm_flag */
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/key.h"		/* For init_key() */
+#include "../lib/tty/win.h"		/* xterm_flag */
 
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 #include "../src/args.h"
-#include "../src/skin/skin.h"
-#include "../src/filehighlight/fhl.h"
+#include "../lib/filehighlight/fhl.h"
 
 #include "dir.h"
 #include "dialog.h"

src/menu.c

@@ -28,10 +28,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/key.h"	/* key macros */
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/key.h"	/* key macros */
 
 #include "cmddef.h"		/* CK_Ignore_Key */
 #include "help.h"

src/option.c

@@ -32,13 +32,13 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 
 #include "dialog.h"
 #include "widget.h"
 #include "setup.h"		/* For save_setup() */
 #include "main.h"
-#include "../src/mcconfig/mcconfig.h"	/* For mc_config_save_file */
+#include "../lib/mcconfig/mcconfig.h"	/* For mc_config_save_file */
 #include "strutil.h"
 #include "panel.h"		/* Needed for the externs */
 #include "file.h"		/* safe_delete */

src/panelize.c

@@ -35,7 +35,7 @@
 
 #include "global.h"
 
-#include "../src/skin/skin.h"
+#include "../lib/skin/skin.h"
 
 #include "../../lib/vfs/mc-vfs/vfs.h"
 
@@ -43,7 +43,7 @@
 #include "widget.h"
 #include "wtools.h"		/* For common_dialog_repaint() */
 #include "setup.h"		/* For profile_bname */
-#include "../src/mcconfig/mcconfig.h"	/* Load/save directories panelize */
+#include "../lib/mcconfig/mcconfig.h"	/* Load/save directories panelize */
 #include "dir.h"
 #include "panel.h"		/* current_panel */
 #include "layout.h"		/* repaint_screen() */

src/screen.c

@@ -33,11 +33,11 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"		/* For Gpm_Event */
-#include "../src/tty/key.h"		/* XCTRL and ALT macros  */
-#include "../src/filehighlight/fhl.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"		/* For Gpm_Event */
+#include "../lib/tty/key.h"		/* XCTRL and ALT macros  */
+#include "../lib/filehighlight/fhl.h"
 
 #include "dir.h"
 #include "panel.h"
@@ -50,7 +50,7 @@
 #include "command.h"		/* cmdline */
 #include "setup.h"		/* For loading/saving panel options */
 #include "user.h"
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 #include "execute.h"
 #include "widget.h"
 #include "menu.h"		/* menubar_visible */

src/setup.c

@@ -30,9 +30,9 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
-#include "../src/tty/mouse.h"		/* To make view.h happy */
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
+#include "../lib/tty/mouse.h"		/* To make view.h happy */
 #include "../../lib/vfs/mc-vfs/vfs.h"
 
 #include "args.h"
@@ -40,7 +40,7 @@
 #include "panel.h"
 #include "main.h"
 #include "tree.h"		/* xtree_mode */
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 #include "setup.h"
 #include "../src/viewer/mcviewer.h" /* For the externs */
 #include "hotlist.h"		/* load/save/done hotlist */

src/subshell.c

@@ -48,12 +48,12 @@
 #endif /* HAVE_STROPTS_H */
 
 #include "global.h"
-#include "../src/tty/tty.h"	/* LINES */
+#include "../lib/tty/tty.h"	/* LINES */
 #include "panel.h"	/* current_panel */
 #include "wtools.h"	/* query_dialog() */
 #include "main.h"	/* do_update_prompt() */
 #include "cons.saver.h"	/* handle_console() */
-#include "../src/tty/key.h"	/* XCTRL */
+#include "../lib/tty/key.h"	/* XCTRL */
 #include "subshell.h"
 #include "strutil.h"
 #include "fileloc.h"

src/tree.c

@@ -41,11 +41,11 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/key.h"
-#include "../vfs/vfs.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/key.h"
+#include "../lib/vfs/mc-vfs/vfs.h"
 
 #include "wtools.h"	/* message() */
 #include "dir.h"

src/treestore.c

@@ -49,7 +49,7 @@
 
 #include "global.h"
 #include "treestore.h"
-#include "../src/mcconfig/mcconfig.h"
+#include "../lib/mcconfig/mcconfig.h"
 #include "../../lib/vfs/mc-vfs/vfs.h"
 #include "setup.h"
 #include "fileloc.h"

src/user.c

@@ -29,8 +29,8 @@
 #include <string.h>
 
 #include "global.h"
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
 #include "dir.h"
 #include "panel.h"
 #include "main.h"
@@ -40,7 +40,7 @@
 #include "setup.h"
 #include "history.h"
 #include "strutil.h"
-#include "../src/search/search.h"
+#include "../lib/search/search.h"
 
 #include "../../lib/vfs/mc-vfs/vfs.h"
 

src/util.c

@@ -42,16 +42,16 @@
 
 #include "global.h"
 
-#include "../src/tty/win.h"		/* xterm_flag */
+#include "../lib/tty/win.h"		/* xterm_flag */
 
-#include "../src/search/search.h"
+#include "../lib/search/search.h"
 
 #include "main.h"		/* mc_home */
 #include "cmd.h"		/* guess_message_value */
 #include "mountlist.h"
 #include "timefmt.h"
 #include "strutil.h"
-#include "./src/mcconfig/mcconfig.h"
+#include "./lib/mcconfig/mcconfig.h"
 #include "fileopctx.h"
 #include "file.h"		/* copy_file_file() */
 #include "dir.h"

src/viewer/actions_cmd.c

@@ -51,8 +51,8 @@
 
 #include "../src/global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
 
 #include "../src/dialog.h"	/* cb_ret_t */
 #include "../src/panel.h"

src/viewer/coord_cache.c

@@ -54,7 +54,7 @@
 #include <string.h>		/* for g_memmove() */
 
 #include "../src/global.h"
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

src/viewer/display.c

@@ -38,9 +38,9 @@
 #include <config.h>
 
 #include "../src/global.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"
 #include "../src/strutil.h"
 #include "../src/main.h"
 #include "../src/dialog.h"		/* Dlg_head */

src/viewer/hex.c

@@ -41,8 +41,8 @@
 #include <fcntl.h>
 
 #include "../src/global.h"
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
 #include "../src/main.h"
 #include "../src/wtools.h"
 #include "../src/charsets.h"

src/viewer/internal.h

@@ -8,7 +8,7 @@
 
 #include "../src/global.h"
 
-#include "../src/search/search.h"
+#include "../lib/search/search.h"
 
 #include "../src/dialog.h"
 #include "../src/widget.h"

src/viewer/mcviewer.c

@@ -40,7 +40,7 @@
 #include <fcntl.h>
 
 #include "../src/global.h"
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "../src/strutil.h"
 #include "../src/main.h"
 #include "../src/charsets.h"

src/viewer/move.c

@@ -54,7 +54,7 @@
 #include <config.h>
 
 #include "../src/global.h"
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

src/viewer/nroff.c

@@ -40,8 +40,8 @@
 #include "../src/global.h"
 #include "../src/main.h"
 #include "../src/charsets.h"
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
 #include "internal.h"
 
 

src/viewer/plain.c

@@ -38,9 +38,9 @@
 
 #include <config.h>
 
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 
-#include "../src/skin/skin.h"
+#include "../lib/skin/skin.h"
 
 #include "../src/global.h"
 #include "../src/main.h"

src/viewer/search.c

@@ -40,7 +40,7 @@
 #include "../src/global.h"
 #include "../src/setup.h"
 #include "../src/wtools.h"
-#include "../src/tty/tty.h"
+#include "../lib/tty/tty.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

src/widget.c

@@ -42,11 +42,11 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/skin/skin.h"
-#include "../src/tty/mouse.h"
-#include "../src/tty/key.h"	/* XCTRL and ALT macros  */
-#include "../src/mcconfig/mcconfig.h"	/* for history loading and saving */
+#include "../lib/tty/tty.h"
+#include "../lib/skin/skin.h"
+#include "../lib/tty/mouse.h"
+#include "../lib/tty/key.h"	/* XCTRL and ALT macros  */
+#include "../lib/mcconfig/mcconfig.h"	/* for history loading and saving */
 
 #include "../../lib/vfs/mc-vfs/vfs.h"
 

src/wtools.c

@@ -35,10 +35,10 @@
 
 #include "global.h"
 
-#include "../src/tty/tty.h"
-#include "../src/tty/key.h"		/* tty_getch() */
+#include "../lib/tty/tty.h"
+#include "../lib/tty/key.h"		/* tty_getch() */
 
-#include "../src/skin/skin.h"		/* INPUT_COLOR */
+#include "../lib/skin/skin.h"		/* INPUT_COLOR */
 
 #include "dialog.h"
 #include "widget.h"