diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c
index cd5f0aa97..7982f0cc5 100644
--- a/lib/filehighlight/common.c
+++ b/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 ****************************************************************************/
diff --git a/lib/filehighlight/fhl.h b/lib/filehighlight/fhl.h
index 9fb16629a..d3e6b949f 100644
--- a/lib/filehighlight/fhl.h
+++ b/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 **********************************************/
diff --git a/lib/filehighlight/get-color.c b/lib/filehighlight/get-color.c
index a56811d0a..c323c1a0c 100644
--- a/lib/filehighlight/get-color.c
+++ b/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 ****************************************************************************/
diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c
index 4aee22a4e..5b2192340 100644
--- a/lib/filehighlight/ini-file-read.c
+++ b/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"
diff --git a/lib/search/glob.c b/lib/search/glob.c
index 18ed32226..1d07766c3 100644
--- a/lib/search/glob.c
+++ b/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"
diff --git a/lib/search/hex.c b/lib/search/hex.c
index 7675d0be1..a7eb3b357 100644
--- a/lib/search/hex.c
+++ b/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"
diff --git a/lib/search/lib.c b/lib/search/lib.c
index c38ef0cef..eba8390c9 100644
--- a/lib/search/lib.c
+++ b/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"
 
diff --git a/lib/search/normal.c b/lib/search/normal.c
index fb31f7159..5fcb1e392 100644
--- a/lib/search/normal.c
+++ b/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"
 
diff --git a/lib/search/regex.c b/lib/search/regex.c
index 149155c4c..f324d4990 100644
--- a/lib/search/regex.c
+++ b/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"
diff --git a/lib/search/search.c b/lib/search/search.c
index d741f3f4e..c69e74d12 100644
--- a/lib/search/search.c
+++ b/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"
 
diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c
index 165bfe045..46e9d3ee1 100644
--- a/lib/skin/colors-old.c
+++ b/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"
diff --git a/lib/skin/colors.c b/lib/skin/colors.c
index ff38735d8..5c6a766a5 100644
--- a/lib/skin/colors.c
+++ b/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"
 
diff --git a/lib/skin/lines.c b/lib/skin/lines.c
index 0472eec87..255ae3a7f 100644
--- a/lib/skin/lines.c
+++ b/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"
 
diff --git a/lib/skin/skin.h b/lib/skin/skin.h
index ae11ed4f2..e2440adf5 100644
--- a/lib/skin/skin.h
+++ b/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 **********************************************/
 
diff --git a/lib/tty/color-internal.c b/lib/tty/color-internal.c
index 11a4f43d1..99bb8c3d1 100644
--- a/lib/tty/color-internal.c
+++ b/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 ****************************************************************************/
 
diff --git a/lib/tty/color-internal.h b/lib/tty/color-internal.h
index 79e08814b..a8bd9739a 100644
--- a/lib/tty/color-internal.h
+++ b/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;
diff --git a/lib/tty/color-ncurses.c b/lib/tty/color-ncurses.c
index f31750ef2..9e5ab1792 100644
--- a/lib/tty/color-ncurses.c
+++ b/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 ****************************************************************************/
 
diff --git a/lib/tty/color-slang.c b/lib/tty/color-slang.c
index 3767fc7f9..f176b3f57 100644
--- a/lib/tty/color-slang.c
+++ b/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 */
 
diff --git a/lib/tty/color-slang.h b/lib/tty/color-slang.h
index 7b47d11df..b3c22e691 100644
--- a/lib/tty/color-slang.h
+++ b/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,
diff --git a/lib/tty/color.c b/lib/tty/color.c
index e9ccf1c7d..47198b9f1 100644
--- a/lib/tty/color.c
+++ b/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 ****************************************************************************/
 
diff --git a/lib/tty/color.h b/lib/tty/color.h
index 138e8dad3..ae8448953 100644
--- a/lib/tty/color.h
+++ b/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;
diff --git a/lib/tty/key.c b/lib/tty/key.c
index f69b60580..93629688f 100644
--- a/lib/tty/key.c
+++ b/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__
diff --git a/lib/tty/key.h b/lib/tty/key.h
index e3c678c96..16cba9e13 100644
--- a/lib/tty/key.h
+++ b/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);
 
diff --git a/lib/tty/keyxdef.c b/lib/tty/keyxdef.c
index b9f4a9425..c1e15c2cf 100644
--- a/lib/tty/keyxdef.c
+++ b/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
diff --git a/lib/tty/mouse.c b/lib/tty/mouse.c
index a811c05b4..12ed03f63 100644
--- a/lib/tty/mouse.c
+++ b/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;
diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
index 76b0f5fb9..5bc9b75b4 100644
--- a/lib/tty/tty-ncurses.c
+++ b/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 */
diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c
index e20ae6d3e..63a71e48a 100644
--- a/lib/tty/tty-slang.c
+++ b/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 */
 
diff --git a/lib/tty/tty.c b/lib/tty/tty.c
index 3d31b515b..bf39d88bd 100644
--- a/lib/tty/tty.c
+++ b/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"
 
diff --git a/lib/tty/tty.h b/lib/tty/tty.h
index a37e793e3..50d384e18 100644
--- a/lib/tty/tty.h
+++ b/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 }}} */
diff --git a/lib/tty/win.c b/lib/tty/win.c
index 86cf6a1e3..9030973e9 100644
--- a/lib/tty/win.c
+++ b/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 */
 
diff --git a/lib/tty/x11conn.c b/lib/tty/x11conn.c
index 3773a88cc..90c7a6d13 100644
--- a/lib/tty/x11conn.c
+++ b/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 **************************************/
 
diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c
index 9a41aa9ee..778d36326 100644
--- a/lib/vfs/mc-vfs/direntry.c
+++ b/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"
diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c
index efb7fc293..649c996ae 100644
--- a/lib/vfs/mc-vfs/fish.c
+++ b/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 */
diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c
index 6e4202343..a2fec45f6 100644
--- a/lib/vfs/mc-vfs/ftpfs.c
+++ b/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"
diff --git a/src/achown.c b/src/achown.c
index b94527c14..dd1e90df8 100644
--- a/src/achown.c
+++ b/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"
diff --git a/src/args.c b/src/args.c
index f845aed1a..791fc49f6 100644
--- a/src/args.c
+++ b/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"
diff --git a/src/background.c b/src/background.c
index c34a95ba3..769a9dfe0 100644
--- a/src/background.c
+++ b/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,
diff --git a/src/boxes.c b/src/boxes.c
index a4d24f663..82c5809ae 100644
--- a/src/boxes.c
+++ b/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 */
diff --git a/src/chmod.c b/src/chmod.c
index 4c3b8ee23..26d163657 100644
--- a/src/chmod.c
+++ b/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 */
diff --git a/src/chown.c b/src/chown.c
index 2247f4834..8f2d8aaa7 100644
--- a/src/chown.c
+++ b/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"
diff --git a/src/cmd.c b/src/cmd.c
index 83dd22d36..744023252 100644
--- a/src/cmd.c
+++ b/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"
diff --git a/src/command.c b/src/command.c
index 6ec4f626c..1e521152a 100644
--- a/src/command.c
+++ b/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"
 
diff --git a/src/complete.c b/src/complete.c
index 143d5c3c7..7a980c755 100644
--- a/src/complete.c
+++ b/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"
diff --git a/src/cons.handler.c b/src/cons.handler.c
index 37730e773..80e54af29 100644
--- a/src/cons.handler.c
+++ b/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"
 
diff --git a/src/cons.saver.c b/src/cons.saver.c
index 503e4961b..0f49aaa23 100644
--- a/src/cons.saver.c
+++ b/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)
diff --git a/src/dialog.c b/src/dialog.c
index 1231d40c9..e0f845d8d 100644
--- a/src/dialog.c
+++ b/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"
diff --git a/src/dialog.h b/src/dialog.h
index 4a83bfcc5..eaadcaa8c 100644
--- a/src/dialog.h
+++ b/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 */
diff --git a/src/dir.c b/src/dir.c
index e664e95de..2f7cbce03 100644
--- a/src/dir.c
+++ b/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"
diff --git a/src/editor/edit-widget.h b/src/editor/edit-widget.h
index 0e908824b..a4eeaeb7b 100644
--- a/src/editor/edit-widget.h
+++ b/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"
diff --git a/src/editor/edit.c b/src/editor/edit.c
index 93ea73083..6aef1e7db 100644
--- a/src/editor/edit.c
+++ b/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() */
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 16c0eb1ef..32ee59b8f 100644
--- a/src/editor/editcmd.c
+++ b/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() */
diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c
index 66abf77c0..d899fee02 100644
--- a/src/editor/editcmd_dialogs.c
+++ b/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"
diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c
index 9913c5d24..5471352ab 100644
--- a/src/editor/editdraw.c
+++ b/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"
diff --git a/src/editor/editkeys.c b/src/editor/editkeys.c
index 4d7ee6779..78a7f456d 100644
--- a/src/editor/editkeys.c
+++ b/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() */
diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c
index f3ddca7a6..3c286e991 100644
--- a/src/editor/editmenu.c
+++ b/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 */
diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index 33175d488..e0395cd2c 100644
--- a/src/editor/editwidget.c
+++ b/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"
diff --git a/src/editor/syntax.c b/src/editor/syntax.c
index b0ac660a4..c5b379d87 100644
--- a/src/editor/syntax.c
+++ b/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() */
diff --git a/src/execute.c b/src/execute.c
index 83559b5f6..827abd45e 100644
--- a/src/execute.c
+++ b/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"
diff --git a/src/ext.c b/src/ext.c
index 3ac395728..dac17eb0b 100644
--- a/src/ext.c
+++ b/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"
diff --git a/src/file.c b/src/file.c
index 04444d6fe..d802eceb6 100644
--- a/src/file.c
+++ b/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"
diff --git a/src/filegui.c b/src/filegui.c
index 053525466..790fad237 100644
--- a/src/filegui.c
+++ b/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() */
diff --git a/src/fileopctx.c b/src/fileopctx.c
index bf843eb45..20f8eb735 100644
--- a/src/fileopctx.c
+++ b/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)
diff --git a/src/find.c b/src/find.c
index afd7ead3e..611f27afa 100644
--- a/src/find.c
+++ b/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"
 
diff --git a/src/help.c b/src/help.c
index 75f575864..40d968633 100644
--- a/src/help.c
+++ b/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 */
diff --git a/src/hotlist.c b/src/hotlist.c
index 03eafbee5..aa6ff848e 100644
--- a/src/hotlist.c
+++ b/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() */
diff --git a/src/info.c b/src/info.c
index 2cbc76dd4..b2ddb8a10 100644
--- a/src/info.c
+++ b/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*/
diff --git a/src/keybind.c b/src/keybind.c
index a3dab0561..39cffeff3 100644
--- a/src/keybind.c
+++ b/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"
 
diff --git a/src/layout.c b/src/layout.c
index 1570fa650..5e12d5e12 100644
--- a/src/layout.c
+++ b/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"
diff --git a/src/learn.c b/src/learn.c
index f6a24921c..5918f88b2 100644
--- a/src/learn.c
+++ b/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"
diff --git a/src/logging.c b/src/logging.c
index f8ed3de41..2f34e6c4c 100644
--- a/src/logging.c
+++ b/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 **********************************************/
diff --git a/src/main.c b/src/main.c
index 27b62ce2e..cabc69806 100644
--- a/src/main.c
+++ b/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"
diff --git a/src/menu.c b/src/menu.c
index a64b60bf5..1c8ac8b3a 100644
--- a/src/menu.c
+++ b/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"
diff --git a/src/option.c b/src/option.c
index 724864225..d47aa7a9b 100644
--- a/src/option.c
+++ b/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 */
diff --git a/src/panelize.c b/src/panelize.c
index f2779c4df..3a83d0f5b 100644
--- a/src/panelize.c
+++ b/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() */
diff --git a/src/screen.c b/src/screen.c
index 265c591c8..6b4e064c3 100644
--- a/src/screen.c
+++ b/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 */
diff --git a/src/setup.c b/src/setup.c
index 769d8fe8f..24f65d87a 100644
--- a/src/setup.c
+++ b/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 */
diff --git a/src/subshell.c b/src/subshell.c
index a35e8bb87..f20befc86 100644
--- a/src/subshell.c
+++ b/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"
diff --git a/src/tree.c b/src/tree.c
index 3b02bace9..f5fc9e95e 100644
--- a/src/tree.c
+++ b/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"
diff --git a/src/treestore.c b/src/treestore.c
index 2358a3b85..50a78bc02 100644
--- a/src/treestore.c
+++ b/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"
diff --git a/src/user.c b/src/user.c
index 17293ad27..4bc86341c 100644
--- a/src/user.c
+++ b/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"
 
diff --git a/src/util.c b/src/util.c
index 89b289bae..6d5d63fc4 100644
--- a/src/util.c
+++ b/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"
diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c
index 6d6fb9020..3e63c36e3 100644
--- a/src/viewer/actions_cmd.c
+++ b/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"
diff --git a/src/viewer/coord_cache.c b/src/viewer/coord_cache.c
index 35acef38d..1fec69f90 100644
--- a/src/viewer/coord_cache.c
+++ b/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 ****************************************************************************/
diff --git a/src/viewer/display.c b/src/viewer/display.c
index 87a94a205..3974442af 100644
--- a/src/viewer/display.c
+++ b/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 */
diff --git a/src/viewer/hex.c b/src/viewer/hex.c
index c5fb2732e..8249e76c3 100644
--- a/src/viewer/hex.c
+++ b/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"
diff --git a/src/viewer/internal.h b/src/viewer/internal.h
index 22391c611..7b82606bc 100644
--- a/src/viewer/internal.h
+++ b/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"
diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c
index a2aecf408..9dc04c2b0 100644
--- a/src/viewer/mcviewer.c
+++ b/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"
diff --git a/src/viewer/move.c b/src/viewer/move.c
index ea6e5e035..8e8da7950 100644
--- a/src/viewer/move.c
+++ b/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 ****************************************************************************/
diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c
index 8602572f0..39d9e3dbe 100644
--- a/src/viewer/nroff.c
+++ b/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"
 
 
diff --git a/src/viewer/plain.c b/src/viewer/plain.c
index f9dd8302d..9a79fdc10 100644
--- a/src/viewer/plain.c
+++ b/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"
diff --git a/src/viewer/search.c b/src/viewer/search.c
index 63d639e44..751ab017d 100644
--- a/src/viewer/search.c
+++ b/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 ****************************************************************************/
diff --git a/src/widget.c b/src/widget.c
index 467fd5732..e2ddeb1fc 100644
--- a/src/widget.c
+++ b/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"
 
diff --git a/src/wtools.c b/src/wtools.c
index e430eddbf..de0faebea 100644
--- a/src/wtools.c
+++ b/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"