diff --git a/lib/Makefile.am b/lib/Makefile.am
index 657b46465..85a88bfd5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,16 +2,21 @@ SUBDIRS = filehighlight mcconfig search skin tty vfs
 
 noinst_LTLIBRARIES = libmc.la
 
-libmc_la_SOURCES =
+libmc_la_SOURCES = \
+	fs.h \
+	glibcompat.c glibcompat.h \
+	global.h
 
-libmc_la_CFLAGS=
+
+libmc_la_CFLAGS= $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 
 libmc_la_LIBADD = \
 	filehighlight/libmcfilehighlight.la \
 	mcconfig/libmcconfig.la \
 	search/libsearch.la \
 	skin/libmcskin.la \
-	tty/libmctty.la
+	tty/libmctty.la \
+	$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
 
 if ENABLE_VFS
 libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.la
diff --git a/lib/filehighlight/common.c b/lib/filehighlight/common.c
index 76a2901b6..bbd937ca9 100644
--- a/lib/filehighlight/common.c
+++ b/lib/filehighlight/common.c
@@ -28,8 +28,8 @@
 #include <config.h>
 
 
-#include "src/global.h"
-#include "../lib/filehighlight/fhl.h"
+#include "lib/global.h"
+#include "lib/filehighlight/fhl.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/
diff --git a/lib/filehighlight/fhl.h b/lib/filehighlight/fhl.h
index 1b39f3a91..59a53282e 100644
--- a/lib/filehighlight/fhl.h
+++ b/lib/filehighlight/fhl.h
@@ -1,8 +1,8 @@
 #ifndef MC__FILEHIGHLIGHT_H
 #define MC__FILEHIGHLIGHT_H
 
-#include "../../lib/mcconfig/mcconfig.h"
-#include "../../lib/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 e88d155d0..6e988bdc0 100644
--- a/lib/filehighlight/get-color.c
+++ b/lib/filehighlight/get-color.c
@@ -29,10 +29,9 @@
 #include <string.h>
 
 
-#include "src/global.h"
-#include "src/util.h"
-#include "../lib/skin/skin.h"
-#include "../lib/filehighlight/fhl.h"
+#include "lib/global.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 a440175d0..e27243da4 100644
--- a/lib/filehighlight/ini-file-read.c
+++ b/lib/filehighlight/ini-file-read.c
@@ -28,12 +28,11 @@
 #include <config.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/main.h"
 #include "src/fileloc.h"
 #include "src/strescape.h"
-#include "../lib/skin/skin.h"
-#include "src/util.h"
+#include "lib/skin/skin.h"
 #include "fhl.h"
 #include "internal.h"
 
diff --git a/src/fs.h b/lib/fs.h
similarity index 100%
rename from src/fs.h
rename to lib/fs.h
diff --git a/src/glibcompat.c b/lib/glibcompat.c
similarity index 100%
rename from src/glibcompat.c
rename to lib/glibcompat.c
diff --git a/src/glibcompat.h b/lib/glibcompat.h
similarity index 100%
rename from src/glibcompat.h
rename to lib/glibcompat.h
diff --git a/src/global.h b/lib/global.h
similarity index 99%
rename from src/global.h
rename to lib/global.h
index 18873f3fb..1107ea693 100644
--- a/src/global.h
+++ b/lib/global.h
@@ -84,7 +84,7 @@
 #endif /* !ENABLE_NLS */
 
 #include "fs.h"
-#include "util.h"
+#include "src/util.h"
 
 #ifdef USE_MAINTAINER_MODE
 #include "src/logging.h"
diff --git a/lib/mcconfig/common.c b/lib/mcconfig/common.c
index ca06632b7..2cd060139 100644
--- a/lib/mcconfig/common.c
+++ b/lib/mcconfig/common.c
@@ -26,10 +26,9 @@
 #include <errno.h> /* extern int errno */
 
 
-#include "src/global.h"
+#include "lib/global.h"
 
-#include "../../lib/vfs/mc-vfs/vfs.h"      /* mc_stat */
-#include "src/util.h"
+#include "lib/vfs/mc-vfs/vfs.h"      /* mc_stat */
 
 #include "mcconfig.h"
 
diff --git a/lib/mcconfig/get.c b/lib/mcconfig/get.c
index 724a54fd6..881484666 100644
--- a/lib/mcconfig/get.c
+++ b/lib/mcconfig/get.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "mcconfig.h"
 #include "src/strutil.h"
diff --git a/lib/mcconfig/set.c b/lib/mcconfig/set.c
index 0e8549408..d546b84dd 100644
--- a/lib/mcconfig/set.c
+++ b/lib/mcconfig/set.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "mcconfig.h"
 #include "src/strutil.h"
diff --git a/lib/search/glob.c b/lib/search/glob.c
index 54b98921e..b669e2f62 100644
--- a/lib/search/glob.c
+++ b/lib/search/glob.c
@@ -28,7 +28,7 @@
 #include <config.h>
 
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"
diff --git a/lib/search/hex.c b/lib/search/hex.c
index 24c791b41..d8259a09c 100644
--- a/lib/search/hex.c
+++ b/lib/search/hex.c
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"
diff --git a/lib/search/lib.c b/lib/search/lib.c
index 9e8b0bc2d..09371fa28 100644
--- a/lib/search/lib.c
+++ b/lib/search/lib.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"
diff --git a/lib/search/normal.c b/lib/search/normal.c
index 8b3120b48..20e73ba7e 100644
--- a/lib/search/normal.c
+++ b/lib/search/normal.c
@@ -28,7 +28,7 @@
 #include <config.h>
 
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"
diff --git a/lib/search/regex.c b/lib/search/regex.c
index 2fd39234b..128f5435d 100644
--- a/lib/search/regex.c
+++ b/lib/search/regex.c
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"
diff --git a/lib/search/search.c b/lib/search/search.c
index 2425fbffc..318137693 100644
--- a/lib/search/search.c
+++ b/lib/search/search.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "search.h"
 #include "internal.h"
 #include "src/strutil.h"
diff --git a/lib/search/search.h b/lib/search/search.h
index 1f2f54796..5b89a950e 100644
--- a/lib/search/search.h
+++ b/lib/search/search.h
@@ -3,7 +3,7 @@
 
 #include <config.h>
 
-#include "src/global.h"      /* <glib.h> */
+#include "lib/global.h"      /* <glib.h> */
 
 #include <sys/types.h>
 
diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c
index 44a72b2b1..2aef469e6 100644
--- a/lib/skin/colors-old.c
+++ b/lib/skin/colors-old.c
@@ -28,9 +28,9 @@
 #include <config.h>
 #include <stdlib.h>
 #include <sys/types.h>          /* size_t */
-#include "../tty/color.h"
+#include "lib/tty/color.h"
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/setup.h"
 #include "skin.h"
 #include "internal.h"
diff --git a/lib/skin/colors.c b/lib/skin/colors.c
index 6949913f8..ed3a17c7c 100644
--- a/lib/skin/colors.c
+++ b/lib/skin/colors.c
@@ -28,9 +28,9 @@
 #include <config.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/args.h"
-#include "../tty/color.h"
+#include "lib/tty/color.h"
 #include "skin.h"
 #include "internal.h"
 
diff --git a/lib/skin/common.c b/lib/skin/common.c
index cc9a18e4c..1a4cf4326 100644
--- a/lib/skin/common.c
+++ b/lib/skin/common.c
@@ -28,7 +28,7 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/args.h"
 #include "skin.h"
 #include "internal.h"
diff --git a/lib/skin/hc-skins.c b/lib/skin/hc-skins.c
index 61f0c9127..93c3102cc 100644
--- a/lib/skin/hc-skins.c
+++ b/lib/skin/hc-skins.c
@@ -26,7 +26,7 @@
  */
 
 #include <config.h>
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "skin.h"
 #include "internal.h"
diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c
index cd154230c..4eb78420b 100644
--- a/lib/skin/ini-file.c
+++ b/lib/skin/ini-file.c
@@ -28,10 +28,9 @@
 #include <config.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/main.h"
 #include "src/fileloc.h"
-#include "src/util.h"
 #include "skin.h"
 #include "internal.h"
 
diff --git a/lib/skin/internal.h b/lib/skin/internal.h
index 520018500..63ffead7a 100644
--- a/lib/skin/internal.h
+++ b/lib/skin/internal.h
@@ -1,7 +1,7 @@
 #ifndef MC__SKIN_INTERNAL_H
 #define MC__SKIN_INTERNAL_H
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "skin.h"
 
diff --git a/lib/skin/lines.c b/lib/skin/lines.c
index 98d548acc..6812d59a6 100644
--- a/lib/skin/lines.c
+++ b/lib/skin/lines.c
@@ -28,9 +28,9 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/args.h"
-#include "../tty/tty.h"
+#include "lib/tty/tty.h"
 #include "skin.h"
 #include "internal.h"
 
diff --git a/lib/skin/skin.h b/lib/skin/skin.h
index ca49a3340..a61a21fd4 100644
--- a/lib/skin/skin.h
+++ b/lib/skin/skin.h
@@ -1,11 +1,11 @@
 #ifndef MC__SKIN_H
 #define MC__SKIN_H
 
-#include "src/global.h"
+#include "lib/global.h"
 
-#include "../../lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig/mcconfig.h"
 
-#include "../lib/tty/color.h"
+#include "lib/tty/color.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
diff --git a/lib/tty/color-internal.h b/lib/tty/color-internal.h
index 9df1db0d3..5a32a2aa4 100644
--- a/lib/tty/color-internal.h
+++ b/lib/tty/color-internal.h
@@ -8,7 +8,7 @@
 
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #ifdef HAVE_SLANG
 #   include "tty-slang.h"
diff --git a/lib/tty/color-ncurses.c b/lib/tty/color-ncurses.c
index 3b4d538c3..c662acfbc 100644
--- a/lib/tty/color-ncurses.c
+++ b/lib/tty/color-ncurses.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty-ncurses.h"
 #include "color.h"        /* variables */
diff --git a/lib/tty/color-slang.c b/lib/tty/color-slang.c
index 048a0933b..279c26239 100644
--- a/lib/tty/color-slang.c
+++ b/lib/tty/color-slang.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty-slang.h"
 #include "color.h"        /* variables */
diff --git a/lib/tty/color.c b/lib/tty/color.c
index f56c85d3a..87fce3039 100644
--- a/lib/tty/color.c
+++ b/lib/tty/color.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <sys/types.h>          /* size_t */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "color.h"
diff --git a/lib/tty/color.h b/lib/tty/color.h
index 8a8ed8c70..0f2593276 100644
--- a/lib/tty/color.h
+++ b/lib/tty/color.h
@@ -12,7 +12,7 @@
 #ifndef MC_COLOR_H
 #define MC_COLOR_H
 
-#include "src/global.h"   /* glib.h */
+#include "lib/global.h"   /* glib.h */
 
 #ifdef HAVE_SLANG
 #   include "color-slang.h"
diff --git a/lib/tty/key.c b/lib/tty/key.c
index 89c8a9d70..5df743b80 100644
--- a/lib/tty/key.c
+++ b/lib/tty/key.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "tty-internal.h" /* mouse_enabled */
diff --git a/lib/tty/key.h b/lib/tty/key.h
index 507664815..6a1b32975 100644
--- a/lib/tty/key.h
+++ b/lib/tty/key.h
@@ -6,7 +6,7 @@
 #ifndef MC_KEY_H
 #define MC_KEY_H
 
-#include "src/global.h"   /* <glib.h> */
+#include "lib/global.h"   /* <glib.h> */
 #include "src/dialog.h"   /* cb_ret_t */
 
 #include "tty.h"  /* KEY_F macro */
diff --git a/lib/tty/keyxdef.c b/lib/tty/keyxdef.c
index 673e23f95..832da7c72 100644
--- a/lib/tty/keyxdef.c
+++ b/lib/tty/keyxdef.c
@@ -41,7 +41,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "mouse.h"        /* required before key.h */
diff --git a/lib/tty/mouse.c b/lib/tty/mouse.c
index 66e115527..e710396a2 100644
--- a/lib/tty/mouse.c
+++ b/lib/tty/mouse.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "tty-internal.h" /* mouse_enabled */
diff --git a/lib/tty/tty-internal.h b/lib/tty/tty-internal.h
index 738a3ad69..a63899b47 100644
--- a/lib/tty/tty-internal.h
+++ b/lib/tty/tty-internal.h
@@ -6,7 +6,7 @@
 #ifndef MC_TTY_INTERNAL_H
 #define MC_TTY_INTERNAL_H
 
-#include "src/global.h"   /* include <glib.h> */
+#include "lib/global.h"   /* include <glib.h> */
 
 /* If true lines are shown by spaces */
 extern gboolean slow_tty;
diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
index 825ea6a44..2a1526caf 100644
--- a/lib/tty/tty-ncurses.c
+++ b/lib/tty/tty-ncurses.c
@@ -36,7 +36,7 @@
 #include <stdarg.h>
 #include <signal.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #ifndef WANT_TERM_H
 #   define WANT_TERM_H
diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c
index f52aaf4ff..667542a69 100644
--- a/lib/tty/tty-slang.c
+++ b/lib/tty/tty-slang.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty-internal.h" /* slow_tty */
 #include "tty.h"
diff --git a/lib/tty/tty.c b/lib/tty/tty.c
index 40079affd..34d628e70 100644
--- a/lib/tty/tty.c
+++ b/lib/tty/tty.c
@@ -34,7 +34,7 @@
 #include <signal.h>
 #include <stdarg.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "tty.h"
 #include "tty-internal.h"
diff --git a/lib/tty/tty.h b/lib/tty/tty.h
index 509c1839d..e3133e3b7 100644
--- a/lib/tty/tty.h
+++ b/lib/tty/tty.h
@@ -11,7 +11,7 @@
 #ifndef MC_TTY_H
 #define MC_TTY_H
 
-#include "src/global.h"   /* include <glib.h> */
+#include "lib/global.h"   /* include <glib.h> */
 
 #ifdef HAVE_SLANG
 #   include "tty-slang.h"
diff --git a/lib/tty/win.c b/lib/tty/win.c
index 6d6a54df6..d07b722d4 100644
--- a/lib/tty/win.c
+++ b/lib/tty/win.c
@@ -32,9 +32,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "lib/global.h"
 #include "tty.h"  /* tty_gotoyx, tty_print_char */
 #include "win.h"
-#include "src/util.h"
 #include "src/cons.saver.h"       /* console_flag */
 
 /*** global variables **************************************************/
diff --git a/lib/tty/win.h b/lib/tty/win.h
index afc16e4b6..1b9b00183 100644
--- a/lib/tty/win.h
+++ b/lib/tty/win.h
@@ -6,7 +6,7 @@
 #ifndef MC_WIN_H
 #define MC_WIN_H
 
-#include "src/global.h"   /* <glib.h> */
+#include "lib/global.h"   /* <glib.h> */
 
 extern int xterm_flag;
 
diff --git a/lib/tty/x11conn.c b/lib/tty/x11conn.c
index 96c57701d..18de0570c 100644
--- a/lib/tty/x11conn.c
+++ b/lib/tty/x11conn.c
@@ -39,7 +39,7 @@ typedef int dummy;              /* C99 forbids empty compilation unit */
 #  include <gmodule.h>
 #endif
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "x11conn.h"
 
 /*** file scope type declarations **************************************/
diff --git a/lib/vfs/mc-vfs/cpio.c b/lib/vfs/mc-vfs/cpio.c
index d405a332a..ccdfcdf46 100644
--- a/lib/vfs/mc-vfs/cpio.c
+++ b/lib/vfs/mc-vfs/cpio.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "src/unixcompat.h"
diff --git a/lib/vfs/mc-vfs/direntry.c b/lib/vfs/mc-vfs/direntry.c
index a688e7782..37f73afcc 100644
--- a/lib/vfs/mc-vfs/direntry.c
+++ b/lib/vfs/mc-vfs/direntry.c
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <sys/time.h>		/* gettimeofday() */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"	/* enable/disable interrupt key */
 
diff --git a/lib/vfs/mc-vfs/extfs.c b/lib/vfs/mc-vfs/extfs.c
index 2511f13c2..a92d8d540 100644
--- a/lib/vfs/mc-vfs/extfs.c
+++ b/lib/vfs/mc-vfs/extfs.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c
index 3ad315db4..0233dbb91 100644
--- a/lib/vfs/mc-vfs/fish.c
+++ b/lib/vfs/mc-vfs/fish.c
@@ -52,16 +52,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "src/global.h"
-
+#include "lib/global.h"
+#include "lib/fs.h"
 #include "lib/tty/tty.h"	/* enable/disable interrupt key */
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
-#include "src/util.h"
 #include "src/strescape.h"
 #include "src/unixcompat.h"
-#include "src/fs.h"
 #include "utilvfs.h"
 #include "xdirentry.h"
 #include "vfs.h"
diff --git a/lib/vfs/mc-vfs/ftpfs.c b/lib/vfs/mc-vfs/ftpfs.c
index 1d972bc5b..beff80d18 100644
--- a/lib/vfs/mc-vfs/ftpfs.c
+++ b/lib/vfs/mc-vfs/ftpfs.c
@@ -83,7 +83,7 @@ What to do with this?
 #include <fcntl.h>
 #include <sys/time.h>		/* gettimeofday() */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"	/* enable/disable interrupt key */
 
diff --git a/lib/vfs/mc-vfs/gc.c b/lib/vfs/mc-vfs/gc.c
index 0a8ad482f..81728ac38 100644
--- a/lib/vfs/mc-vfs/gc.c
+++ b/lib/vfs/mc-vfs/gc.c
@@ -42,7 +42,7 @@
 #include <ctype.h>		/* is_digit() */
 #include <sys/time.h>		/* gettimeofday() */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/local.c b/lib/vfs/mc-vfs/local.c
index f088662e2..4b4db3edb 100644
--- a/lib/vfs/mc-vfs/local.c
+++ b/lib/vfs/mc-vfs/local.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/mcfs.c b/lib/vfs/mc-vfs/mcfs.c
index 09d5cb35e..22636020e 100644
--- a/lib/vfs/mc-vfs/mcfs.c
+++ b/lib/vfs/mc-vfs/mcfs.c
@@ -57,7 +57,7 @@
 #endif
 #endif
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "utilvfs.h"
diff --git a/lib/vfs/mc-vfs/mcfsutil.c b/lib/vfs/mc-vfs/mcfsutil.c
index b9e7347f5..3d976d6c9 100644
--- a/lib/vfs/mc-vfs/mcfsutil.c
+++ b/lib/vfs/mc-vfs/mcfsutil.c
@@ -50,7 +50,7 @@
 
 #include <errno.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "utilvfs.h"
diff --git a/lib/vfs/mc-vfs/mcserv.c b/lib/vfs/mc-vfs/mcserv.c
index d0d4e8b88..18b79f29d 100644
--- a/lib/vfs/mc-vfs/mcserv.c
+++ b/lib/vfs/mc-vfs/mcserv.c
@@ -110,7 +110,7 @@
  * a native printf(3) capable of all POSIX features.
  */
 #undef ENABLE_NLS
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/netutil.c b/lib/vfs/mc-vfs/netutil.c
index 82bca535e..0054f6b18 100644
--- a/lib/vfs/mc-vfs/netutil.c
+++ b/lib/vfs/mc-vfs/netutil.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "utilvfs.h"
 #include "netutil.h"
 
diff --git a/lib/vfs/mc-vfs/sfs.c b/lib/vfs/mc-vfs/sfs.c
index d7fc992f5..e39640182 100644
--- a/lib/vfs/mc-vfs/sfs.c
+++ b/lib/vfs/mc-vfs/sfs.c
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/smbfs.c b/lib/vfs/mc-vfs/smbfs.c
index eb7403784..d32a85816 100644
--- a/lib/vfs/mc-vfs/smbfs.c
+++ b/lib/vfs/mc-vfs/smbfs.c
@@ -38,7 +38,7 @@
 #undef USE_NCURSES	/* Don't include *curses.h */
 #undef  USE_NCURSESW
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/tar.c b/lib/vfs/mc-vfs/tar.c
index e9b1397bb..817194c3c 100644
--- a/lib/vfs/mc-vfs/tar.c
+++ b/lib/vfs/mc-vfs/tar.c
@@ -40,7 +40,7 @@
 #include <sys/mknod.h>
 #endif
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/undelfs.c b/lib/vfs/mc-vfs/undelfs.c
index 109d7a5d8..bff97c9a4 100644
--- a/lib/vfs/mc-vfs/undelfs.c
+++ b/lib/vfs/mc-vfs/undelfs.c
@@ -56,7 +56,7 @@
 #include <ext2fs/ext2fs.h>
 #include <ctype.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
 #include "utilvfs.h"
diff --git a/lib/vfs/mc-vfs/utilvfs.c b/lib/vfs/mc-vfs/utilvfs.c
index dc7a42fd7..1fc04fe80 100644
--- a/lib/vfs/mc-vfs/utilvfs.c
+++ b/lib/vfs/mc-vfs/utilvfs.c
@@ -33,7 +33,7 @@
 #include <grp.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/lib/vfs/mc-vfs/utilvfs.h b/lib/vfs/mc-vfs/utilvfs.h
index 8628a80ab..f7876e993 100644
--- a/lib/vfs/mc-vfs/utilvfs.h
+++ b/lib/vfs/mc-vfs/utilvfs.h
@@ -11,7 +11,7 @@
 
 #include <sys/stat.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 /** Bit flags for vfs_split_url()
  *
diff --git a/lib/vfs/mc-vfs/vfs-impl.h b/lib/vfs/mc-vfs/vfs-impl.h
index c7ab18770..02e552017 100644
--- a/lib/vfs/mc-vfs/vfs-impl.h
+++ b/lib/vfs/mc-vfs/vfs-impl.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <utime.h>
 
-#include "src/fs.h"		/* MC_MAXPATHLEN */
+#include "lib/fs.h"		/* MC_MAXPATHLEN */
 
 typedef void *vfsid;
 struct vfs_stamping;
diff --git a/lib/vfs/mc-vfs/vfs.c b/lib/vfs/mc-vfs/vfs.c
index 83875b5c3..3533b3f4d 100644
--- a/lib/vfs/mc-vfs/vfs.c
+++ b/lib/vfs/mc-vfs/vfs.c
@@ -50,7 +50,7 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
 #include "src/main.h"	/* print_vfs_message */
diff --git a/src/Makefile.am b/src/Makefile.am
index 96be9bc23..059d91e21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,16 +24,16 @@ AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" \
 endif
 
 noinst_PROGRAMS = man2hlp
-man2hlp_LDADD = $(GLIB_LIBS)
 
 mcmfmt_SOURCES = mfmt.c
 
 cons_saver_SOURCES = cons.saver.c
 
-man2hlp_SOURCES = man2hlp.c glibcompat.c
+man2hlp_SOURCES = man2hlp.c
+man2hlp_LDADD = $(GLIB_LIBS) ../lib/libmc.la
 
 if USE_EDIT
-EDITLIB = editor/libedit.a
+EDITLIB = editor/libedit.la
 endif
 
 SRC_maintainer=logging.c logging.h
@@ -87,9 +87,9 @@ SRC_mc_keybind = \
 	cmddef.h
 
 SRC_mc_utils = \
-	util.c util.h \
 	utilunix.c \
-	unixcompat.h
+	unixcompat.h \
+	util.c util.h
 
 SRC_mc_extended_charset = \
 	ecs.c ecs.h
@@ -122,9 +122,6 @@ mc_SOURCES = \
 	filenot.c \
 	fileopctx.c fileopctx.h \
 	find.c find.h \
-	fs.h \
-	glibcompat.c glibcompat.h \
-	global.h \
 	help.c help.h \
 	history.h \
 	hotlist.c hotlist.h \
diff --git a/src/achown.c b/src/achown.c
index 8e066d496..729c7c974 100644
--- a/src/achown.c
+++ b/src/achown.c
@@ -33,7 +33,7 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* XCTRL and ALT macros */
diff --git a/src/args.c b/src/args.c
index 3a1a9137a..053b37d6e 100644
--- a/src/args.c
+++ b/src/args.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "src/args.h"
 #include "src/strutil.h"
diff --git a/src/background.c b/src/background.c
index 3112fb2e0..18fa11bfd 100644
--- a/src/background.c
+++ b/src/background.c
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "background.h"
 #include "wtools.h"
 #include "layout.h"	/* repaint_screen() */
diff --git a/src/boxes.c b/src/boxes.c
index 96979bf6b..b6205ca1a 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"		/* INPUT_COLOR */
diff --git a/src/charsets.c b/src/charsets.c
index b37453924..e3dfdf980 100644
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "charsets.h"
 #include "strutil.h"		/* utf-8 functions */
 #include "main.h"
diff --git a/src/chmod.c b/src/chmod.c
index a38056f65..523b1f4dd 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/chown.c b/src/chown.c
index 5b4456636..f17788e52 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/cmd.c b/src/cmd.c
index ed8ad22c7..4615e02c3 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -45,7 +45,7 @@
 #include <grp.h>
 #include <sys/time.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"		/* LINES, tty_touch_screen() */
 #include "lib/tty/key.h"		/* ALT() macro */
diff --git a/src/command.c b/src/command.c
index 925467406..113a66e79 100644
--- a/src/command.c
+++ b/src/command.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "global.h"		/* home_dir */
+#include "lib/global.h"		/* home_dir */
 #include "lib/tty/tty.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "widget.h"		/* WInput */
diff --git a/src/complete.c b/src/complete.c
index 5c4aa97b1..714304636 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -36,7 +36,7 @@
 #include <pwd.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* XCTRL and ALT macros */
diff --git a/src/cons.handler.c b/src/cons.handler.c
index 6c0a0e37e..f92c1bfd9 100644
--- a/src/cons.handler.c
+++ b/src/cons.handler.c
@@ -34,7 +34,7 @@
 #endif
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"		/* tty_set_normal_attrs */
diff --git a/src/dialog.c b/src/dialog.c
index 1dc740fdc..3559348ab 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/dialog.h b/src/dialog.h
index e5c0e3652..a31323a06 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -24,7 +24,6 @@
 #define MC_DIALOG_H
 
 #include "lib/tty/mouse.h"
-#include "util.h" /* Hook */
 
 /* Common return values */
 #define B_EXIT		0
diff --git a/src/dir.c b/src/dir.c
index 831c1acf4..6511c7f0d 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -30,12 +30,12 @@
 #include "lib/tty/tty.h"
 #include "lib/search/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/fs.h"
 
-#include "global.h"
+#include "lib/global.h"
 #include "wtools.h"
 #include "treestore.h"
 #include "strutil.h"
-#include "fs.h"
 #include "util.h"		/* canonicalize_pathname () */
 #include "dir.h"
 
diff --git a/src/dir.h b/src/dir.h
index dee5dd708..bcdf69620 100644
--- a/src/dir.h
+++ b/src/dir.h
@@ -8,7 +8,7 @@
 
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #define MIN_FILES 128
 #define RESIZE_STEPS 128
diff --git a/src/ecs-test.c b/src/ecs-test.c
index b3e6b45ac..ed52675c6 100644
--- a/src/ecs-test.c
+++ b/src/ecs-test.c
@@ -33,7 +33,7 @@
 #include <locale.h>
 #include <stdio.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "ecs.h"
 
 #ifdef EXTCHARSET_ENABLED
diff --git a/src/ecs.c b/src/ecs.c
index b0cacc355..5892f4732 100644
--- a/src/ecs.c
+++ b/src/ecs.c
@@ -31,7 +31,7 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "ecs.h"
 
 /*
diff --git a/src/ecs.h b/src/ecs.h
index fbb15fe89..7910a9ae5 100644
--- a/src/ecs.h
+++ b/src/ecs.h
@@ -37,7 +37,7 @@
 
 #include <sys/types.h>		/* size_t */
 
-#include "global.h"		/* include <glib.h> */
+#include "lib/global.h"		/* include <glib.h> */
 
 /* Use the macros ECS_CHAR and ECS_STR to bring character and string
  * literals to the correct form required by the C compiler. */
diff --git a/src/editor/Makefile.am b/src/editor/Makefile.am
index b28c33bb2..ad9bde33a 100644
--- a/src/editor/Makefile.am
+++ b/src/editor/Makefile.am
@@ -1,15 +1,16 @@
-AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
+EXTRA_DIST =
 
 if USE_EDIT
-noinst_LIBRARIES = libedit.a
+noinst_LTLIBRARIES = libedit.la
 else
-noinst_LIBRARIES =
+noinst_LTLIBRARIES = 
 endif
 
-libedit_a_SOURCES = \
+libedit_la_SOURCES = \
 	bookmark.c edit.c editcmd.c editwidget.c editdraw.c editkeys.c \
 	editmenu.c editoptions.c edit-impl.h edit.h edit-widget.h \
 	editlock.c editlock.h syntax.c wordproc.c \
 	choosesyntax.c etags.c etags.h editcmd_dialogs.c editcmd_dialogs.h
 
-EXTRA_DIST =
+libedit_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
+
diff --git a/src/editor/bookmark.c b/src/editor/bookmark.c
index 2270d8006..0d6f8b03a 100644
--- a/src/editor/bookmark.c
+++ b/src/editor/bookmark.c
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"
diff --git a/src/editor/choosesyntax.c b/src/editor/choosesyntax.c
index 08660d384..db94a3544 100644
--- a/src/editor/choosesyntax.c
+++ b/src/editor/choosesyntax.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"
 
 #include "edit-impl.h"
diff --git a/src/editor/edit.c b/src/editor/edit.c
index a351f7a70..ab7e6b7f6 100644
--- a/src/editor/edit.c
+++ b/src/editor/edit.c
@@ -39,7 +39,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/color.h"	
 #include "lib/tty/tty.h"	/* attrset() */
diff --git a/src/editor/edit.h b/src/editor/edit.h
index f32a3b764..2db632b34 100644
--- a/src/editor/edit.h
+++ b/src/editor/edit.h
@@ -32,7 +32,7 @@
 #ifndef MC_EDIT_H
 #define MC_EDIT_H
 
-#include "src/global.h"	/* PATH_SEP_STR */
+#include "lib/global.h"	/* PATH_SEP_STR */
 #include "src/fileloc.h"
 
 /* Editor widget */
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 56d72b302..41974f80e 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"	/* XCTRL */
diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c
index f01564e4b..6482a039b 100644
--- a/src/editor/editcmd_dialogs.c
+++ b/src/editor/editcmd_dialogs.c
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"		/* INPUT_COLOR */
diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c
index f502981b7..09ff84eda 100644
--- a/src/editor/editdraw.c
+++ b/src/editor/editdraw.c
@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"
diff --git a/src/editor/editkeys.c b/src/editor/editkeys.c
index 028f94510..5b2f52d9a 100644
--- a/src/editor/editkeys.c
+++ b/src/editor/editkeys.c
@@ -39,7 +39,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"	/* edit->macro_i */
diff --git a/src/editor/editlock.c b/src/editor/editlock.c
index 40b5f497c..07575a4f8 100644
--- a/src/editor/editlock.c
+++ b/src/editor/editlock.c
@@ -52,7 +52,7 @@
 #include <pwd.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "editlock.h"
diff --git a/src/editor/editmenu.c b/src/editor/editmenu.c
index 818f24a4c..518061276 100644
--- a/src/editor/editmenu.c
+++ b/src/editor/editmenu.c
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"	/* KEY_F */
 #include "lib/tty/key.h"	/* XCTRL */
diff --git a/src/editor/editoptions.c b/src/editor/editoptions.c
index c6efcc342..4e9cc512a 100644
--- a/src/editor/editoptions.c
+++ b/src/editor/editoptions.c
@@ -31,7 +31,7 @@
 
 #include <stdlib.h> /* atoi(), NULL */
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "src/dialog.h"	/* B_CANCEL */
diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index 34c34fba9..4500c9766 100644
--- a/src/editor/editwidget.c
+++ b/src/editor/editwidget.c
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"		/* LINES, COLS */
 #include "lib/tty/key.h"		/* is_idle() */
diff --git a/src/editor/etags.c b/src/editor/etags.c
index 7ce28a304..f3a27e3b5 100644
--- a/src/editor/etags.c
+++ b/src/editor/etags.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/util.h"	/* canonicalize_pathname() */
 #include "src/editor/etags.h"
 
diff --git a/src/editor/etags.h b/src/editor/etags.h
index 86c7643be..ec9804187 100644
--- a/src/editor/etags.h
+++ b/src/editor/etags.h
@@ -2,7 +2,7 @@
 #define MC_EDIT_ETAGS_H 1
 
 #include <sys/types.h>		/* size_t */
-#include "src/global.h"	/* include <glib.h> */
+#include "lib/global.h"	/* include <glib.h> */
 
 #define MAX_WIDTH_DEF_DIALOG 60	/* max width def dialog */
 #define MAX_DEFINITIONS 60	/* count found entries show */
diff --git a/src/editor/syntax.c b/src/editor/syntax.c
index 9b36d2272..b4eb70e98 100644
--- a/src/editor/syntax.c
+++ b/src/editor/syntax.c
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/search/search.h"	/* search engine */
 
diff --git a/src/editor/wordproc.c b/src/editor/wordproc.c
index 127ef04ea..ed4db5a3f 100644
--- a/src/editor/wordproc.c
+++ b/src/editor/wordproc.c
@@ -37,7 +37,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "edit-impl.h"
 #include "edit-widget.h"
diff --git a/src/execute.c b/src/execute.c
index 0f508c768..dc819c0e2 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/ext.c b/src/ext.c
index 4ad98d5bd..c4b6484fa 100644
--- a/src/ext.c
+++ b/src/ext.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "user.h"
 #include "main.h"
diff --git a/src/file.c b/src/file.c
index 2bd59fdf5..18543df9d 100644
--- a/src/file.c
+++ b/src/file.c
@@ -56,7 +56,7 @@
 #include <fcntl.h>
 #include <sys/time.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/file.h b/src/file.h
index 9309e5575..a25dad822 100644
--- a/src/file.h
+++ b/src/file.h
@@ -8,7 +8,7 @@
 
 #include <sys/types.h>		/* off_t */
 
-#include "global.h"
+#include "lib/global.h"
 #include "dialog.h"		/* Dlg_head */
 #include "widget.h"		/* WLabel */
 #include "fileopctx.h"
diff --git a/src/filegui.c b/src/filegui.c
index 123154e1d..3a4e4f25c 100644
--- a/src/filegui.c
+++ b/src/filegui.c
@@ -76,7 +76,7 @@
 
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/key.h"		/* tty_get_event */
 #include "lib/search/search.h"
diff --git a/src/filegui.h b/src/filegui.h
index b1ca2e5ed..f61fb88b3 100644
--- a/src/filegui.h
+++ b/src/filegui.h
@@ -6,7 +6,7 @@
 #ifndef MC_FILEGUI_H
 #define MC_FILEGUI_H
 
-#include "global.h"
+#include "lib/global.h"
 #include "fileopctx.h"
 
 char *file_mask_dialog (FileOpContext *ctx, FileOperation operation,
diff --git a/src/filenot.c b/src/filenot.c
index 756abb142..c7c24b32e 100644
--- a/src/filenot.c
+++ b/src/filenot.c
@@ -34,12 +34,14 @@
 #include <errno.h>
 #include <string.h>
 
-#include "global.h"
-#include "fs.h"
-#include "util.h"
+#include "lib/global.h"
+#include "lib/fs.h"
 
 #include "lib/vfs/mc-vfs/vfs.h"
 
+#include "util.h"
+
+
 static char *
 get_absolute_name (const char *file)
 {
diff --git a/src/fileopctx.c b/src/fileopctx.c
index 8d9749f7a..9937b5b98 100644
--- a/src/fileopctx.c
+++ b/src/fileopctx.c
@@ -32,7 +32,7 @@
 
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "fileopctx.h"
 #include "lib/search/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
diff --git a/src/find.c b/src/find.c
index b85aa3a4d..8812e95bb 100644
--- a/src/find.c
+++ b/src/find.c
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/help.c b/src/help.c
index 088bd5b2c..478a54b22 100644
--- a/src/help.c
+++ b/src/help.c
@@ -51,7 +51,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/hotlist.c b/src/hotlist.c
index d31e2fdc5..41de3d3b2 100644
--- a/src/hotlist.c
+++ b/src/hotlist.c
@@ -40,7 +40,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"		/* COLS */
 #include "lib/skin/skin.h"
diff --git a/src/info.c b/src/info.c
index d5805ee75..ae3e996f3 100644
--- a/src/info.c
+++ b/src/info.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* is_idle() */
diff --git a/src/keybind.c b/src/keybind.c
index b472e4c23..8859e5f5e 100644
--- a/src/keybind.c
+++ b/src/keybind.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "cmddef.h"		/* CK_ cmd name const */
 #include "lib/tty/win.h"
diff --git a/src/keybind.h b/src/keybind.h
index 43dddc833..b7779e5e8 100644
--- a/src/keybind.h
+++ b/src/keybind.h
@@ -2,7 +2,7 @@
 #ifndef MC_KEYBIND_H
 #define MC_KEYBIND_H
 
-#include "global.h"
+#include "lib/global.h"
 
 typedef struct name_keymap_t {
     const char *name;
diff --git a/src/layout.c b/src/layout.c
index 64395e610..f311a910d 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -44,7 +44,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/learn.c b/src/learn.c
index dea9266e2..cb35c3e0d 100644
--- a/src/learn.c
+++ b/src/learn.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/listmode.c b/src/listmode.c
index 02de81308..802fdaffe 100644
--- a/src/listmode.c
+++ b/src/listmode.c
@@ -35,7 +35,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "tty.h"
 #include "key.h"
 #include "color.h"
diff --git a/src/logging.c b/src/logging.c
index c23772ea1..e8775ac5a 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -32,7 +32,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "logging.h"
 #include "setup.h"
 #include "lib/mcconfig/mcconfig.h"
diff --git a/src/main.c b/src/main.c
index d5385bb23..247f3162a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <pwd.h>		/* for username in xterm title */
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/main.h b/src/main.h
index 9c843fa82..aeb71d561 100644
--- a/src/main.h
+++ b/src/main.h
@@ -6,7 +6,7 @@
 #ifndef MC_MAIN_H
 #define MC_MAIN_H
 
-#include "global.h"
+#include "lib/global.h"
 #include "keybind.h"
 
 /* Toggling functions */
diff --git a/src/menu.c b/src/menu.c
index 3ee5b9bb4..f2d4b1ac2 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/menu.h b/src/menu.h
index 1ef90d88a..3a075c4a2 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -24,7 +24,7 @@
 #ifndef MC_MENU_H
 #define MC_MENU_H
 
-#include "global.h"
+#include "lib/global.h"
 #include "widget.h"
 
 extern int menubar_visible;
diff --git a/src/mountlist.c b/src/mountlist.c
index 847bf3986..aa4a12b42 100644
--- a/src/mountlist.c
+++ b/src/mountlist.c
@@ -109,7 +109,7 @@
 #include <sys/statvfs.h>
 #endif
 
-#include "global.h"
+#include "lib/global.h"
 #include "mountlist.h"
 #include "util.h"
 
diff --git a/src/option.c b/src/option.c
index f3e49d76c..bbc211f43 100644
--- a/src/option.c
+++ b/src/option.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 
diff --git a/src/panel.h b/src/panel.h
index b32dabcff..047052522 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -8,7 +8,7 @@
 
 #include "dir.h"		/* dir_list */
 #include "dialog.h"		/* Widget */
-#include "fs.h"			/* MC_MAXPATHLEN */
+#include "lib/fs.h"			/* MC_MAXPATHLEN */
 #include "strutil.h"
 
 #define selection(p) (&(p->dir.list[p->selected]))
diff --git a/src/panelize.c b/src/panelize.c
index a2ba91128..76d798419 100644
--- a/src/panelize.c
+++ b/src/panelize.c
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/skin/skin.h"
 
diff --git a/src/screen.c b/src/screen.c
index 6a1be116d..d841da6ba 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/selcodepage.c b/src/selcodepage.c
index a3be1a1d4..607b993d3 100644
--- a/src/selcodepage.c
+++ b/src/selcodepage.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "dialog.h"
 #include "widget.h"
 #include "wtools.h"
diff --git a/src/selcodepage.h b/src/selcodepage.h
index 8b02102f1..dc9bc57c2 100644
--- a/src/selcodepage.h
+++ b/src/selcodepage.h
@@ -8,7 +8,7 @@
 
 #ifdef HAVE_CHARSET
 
-#include "global.h"
+#include "lib/global.h"
 
 int select_charset (int center_y, int center_x, int current_charset, gboolean seldisplay);
 gboolean do_select_codepage (void);
diff --git a/src/setup.c b/src/setup.c
index 794a9afab..543aefdf7 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/strescape.h b/src/strescape.h
index 22847e5e1..cdc14829a 100644
--- a/src/strescape.h
+++ b/src/strescape.h
@@ -3,7 +3,7 @@
 
 #include <config.h>
 
-#include "src/global.h"      /* <glib.h> */
+#include "lib/global.h"      /* <glib.h> */
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
diff --git a/src/strutil.c b/src/strutil.c
index 5755548e5..2c5bd464d 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <stdarg.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "strutil.h"
 
 /*names, that are used for utf-8 */
diff --git a/src/strutil.h b/src/strutil.h
index e379b553f..264d30fcb 100644
--- a/src/strutil.h
+++ b/src/strutil.h
@@ -1,7 +1,7 @@
 #ifndef MC_STRUTIL_H
 #define MC_STRUTIL_H
 
-#include "global.h"	/* include glib.h */
+#include "lib/global.h"	/* include glib.h */
 
 /* Header file for strutil.c, strutilascii.c, strutil8bit.c, strutilutf8.c.
  * There are two sort of functions:
diff --git a/src/strutil8bit.c b/src/strutil8bit.c
index 4acd0d3d8..23c922536 100644
--- a/src/strutil8bit.c
+++ b/src/strutil8bit.c
@@ -27,9 +27,8 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "strutil.h"
-#include "fs.h"
 
 /* functions for singlebyte encodings, all characters have width 1
  * using standard system functions
diff --git a/src/strutilascii.c b/src/strutilascii.c
index ec6af9ec7..ce4697bcf 100644
--- a/src/strutilascii.c
+++ b/src/strutilascii.c
@@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <config.h>
 #include <errno.h>
-#include "global.h"
+#include "lib/global.h"
 #include "strutil.h"
 
 /* using g_ascii function from glib
diff --git a/src/strutilutf8.c b/src/strutilutf8.c
index 90bd54241..5f7ecde43 100644
--- a/src/strutilutf8.c
+++ b/src/strutilutf8.c
@@ -30,7 +30,7 @@
 #include <langinfo.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "strutil.h"
 
 /* using function for utf-8 from glib */
diff --git a/src/subshell.c b/src/subshell.c
index 0b7442243..f9ebcb33f 100644
--- a/src/subshell.c
+++ b/src/subshell.c
@@ -47,7 +47,7 @@
 #  include <stropts.h> /* For I_PUSH */
 #endif /* HAVE_STROPTS_H */
 
-#include "global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"	/* LINES */
 #include "panel.h"	/* current_panel */
 #include "wtools.h"	/* query_dialog() */
diff --git a/src/textconf.c b/src/textconf.c
index bb97009d2..b2aaf99ed 100644
--- a/src/textconf.c
+++ b/src/textconf.c
@@ -29,7 +29,7 @@
 
 #include <sys/types.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "ecs.h"
 #include "src/textconf.h"
 
diff --git a/src/tree.c b/src/tree.c
index 6bf20d1bd..df9f5a922 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/treestore.c b/src/treestore.c
index efa540be2..6b569c882 100644
--- a/src/treestore.c
+++ b/src/treestore.c
@@ -47,7 +47,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "treestore.h"
 #include "lib/mcconfig/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"
diff --git a/src/user.c b/src/user.c
index 662611be8..f4d1489d0 100644
--- a/src/user.c
+++ b/src/user.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
 #include "dir.h"
diff --git a/src/util.c b/src/util.c
index eba4385dc..f6956cf55 100644
--- a/src/util.c
+++ b/src/util.c
@@ -40,13 +40,13 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/win.h"		/* xterm_flag */
 
 #include "lib/search/search.h"
 
-#include "main.h"		/* mc_home */
+#include "main.h"              /* mc_home */
 #include "cmd.h"		/* guess_message_value */
 #include "mountlist.h"
 #include "timefmt.h"
diff --git a/src/util.h b/src/util.h
index 829a32c69..fa662a737 100644
--- a/src/util.h
+++ b/src/util.h
@@ -6,7 +6,7 @@
 #ifndef MC_UTIL_H
 #define MC_UTIL_H
 
-#include "global.h"		/* include <glib.h> */
+#include "lib/global.h"		/* include <glib.h> */
 
 #include <string.h>
 #include <assert.h>
diff --git a/src/utilunix.c b/src/utilunix.c
index 00db9d5ea..c8610bc31 100644
--- a/src/utilunix.c
+++ b/src/utilunix.c
@@ -48,7 +48,7 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include "global.h"
+#include "lib/global.h"
 #include "execute.h"
 #include "wtools.h"		/* message() */
 
diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
index 5ce47b69a..7bec2fd91 100644
--- a/src/viewer/Makefile.am
+++ b/src/viewer/Makefile.am
@@ -23,3 +23,4 @@ libmcviewer_la_CFLAGS = -I$(top_srcdir) \
 	$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
 	-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
 
+libmcviewer_la_LIBADD = ../../lib/libmc.la
\ No newline at end of file
diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c
index 3c8e6d810..c8ce32a22 100644
--- a/src/viewer/actions_cmd.c
+++ b/src/viewer/actions_cmd.c
@@ -49,7 +49,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/viewer/coord_cache.c b/src/viewer/coord_cache.c
index e77530a95..479b32092 100644
--- a/src/viewer/coord_cache.c
+++ b/src/viewer/coord_cache.c
@@ -53,7 +53,7 @@
 
 #include <string.h>		/* for g_memmove() */
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "internal.h"
 
diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c
index 5a7b0b10b..9f1ec8c53 100644
--- a/src/viewer/datasource.c
+++ b/src/viewer/datasource.c
@@ -56,7 +56,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 
diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c
index 70bb250cc..1b86e4b14 100644
--- a/src/viewer/dialogs.c
+++ b/src/viewer/dialogs.c
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/search/search.h"
 
diff --git a/src/viewer/display.c b/src/viewer/display.c
index bb49439c7..3b6323afb 100644
--- a/src/viewer/display.c
+++ b/src/viewer/display.c
@@ -37,7 +37,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/skin/skin.h"
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
diff --git a/src/viewer/growbuf.c b/src/viewer/growbuf.c
index 067280afe..689b7b3a1 100644
--- a/src/viewer/growbuf.c
+++ b/src/viewer/growbuf.c
@@ -38,7 +38,7 @@
 #include <config.h>
 #include <errno.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"
 
 #include "lib/vfs/mc-vfs/vfs.h"
diff --git a/src/viewer/hex.c b/src/viewer/hex.c
index 31eaa9a4e..86f791e62 100644
--- a/src/viewer/hex.c
+++ b/src/viewer/hex.c
@@ -40,7 +40,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
 #include "src/main.h"
diff --git a/src/viewer/internal.h b/src/viewer/internal.h
index 15b0b436e..81fc1ce46 100644
--- a/src/viewer/internal.h
+++ b/src/viewer/internal.h
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 
 #include "lib/search/search.h"
 
diff --git a/src/viewer/lib.c b/src/viewer/lib.c
index 502964321..00dc7ad06 100644
--- a/src/viewer/lib.c
+++ b/src/viewer/lib.c
@@ -39,7 +39,7 @@
 
 #include <limits.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/wtools.h"
 #include "src/strutil.h"
 #include "src/main.h"
diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c
index 7d7c090f6..eed39955c 100644
--- a/src/viewer/mcviewer.c
+++ b/src/viewer/mcviewer.c
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "src/strutil.h"
 #include "src/main.h"
diff --git a/src/viewer/move.c b/src/viewer/move.c
index 47c5531ee..2951d1337 100644
--- a/src/viewer/move.c
+++ b/src/viewer/move.c
@@ -53,7 +53,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "internal.h"
 
diff --git a/src/viewer/nroff.c b/src/viewer/nroff.c
index 47aa3f9f0..d36706b06 100644
--- a/src/viewer/nroff.c
+++ b/src/viewer/nroff.c
@@ -37,7 +37,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/main.h"
 #include "src/charsets.h"
 #include "lib/tty/tty.h"
diff --git a/src/viewer/plain.c b/src/viewer/plain.c
index eab7cd434..f6dd6d52b 100644
--- a/src/viewer/plain.c
+++ b/src/viewer/plain.c
@@ -42,7 +42,7 @@
 
 #include "lib/skin/skin.h"
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/main.h"
 #include "src/charsets.h"
 #include "src/util.h"	/* is_printable() */
diff --git a/src/viewer/search.c b/src/viewer/search.c
index 776470ede..c22025874 100644
--- a/src/viewer/search.c
+++ b/src/viewer/search.c
@@ -37,7 +37,7 @@
 
 #include <config.h>
 
-#include "src/global.h"
+#include "lib/global.h"
 #include "src/setup.h"
 #include "src/wtools.h"
 #include "lib/tty/tty.h"
diff --git a/src/widget.c b/src/widget.c
index e5fc0b347..a95580b23 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -40,7 +40,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/skin/skin.h"
diff --git a/src/widget.h b/src/widget.h
index 825352738..b65901d6c 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -6,7 +6,7 @@
 #ifndef MC_WIDGET_H
 #define MC_WIDGET_H
 
-#include "global.h"
+#include "lib/global.h"
 #include "dialog.h"		/* Widget */
 
 /* Completion stuff */
diff --git a/src/wtools.c b/src/wtools.c
index 7373b40ef..43dfb125d 100644
--- a/src/wtools.c
+++ b/src/wtools.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "global.h"
+#include "lib/global.h"
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* tty_getch() */
diff --git a/src/wtools.h b/src/wtools.h
index d9f7b8b69..ba6b4c06e 100644
--- a/src/wtools.h
+++ b/src/wtools.h
@@ -6,7 +6,7 @@
 #ifndef MC_WTOOLS_H
 #define MC_WTOOLS_H
 
-#include "global.h"
+#include "lib/global.h"
 #include "dialog.h"
 #include "widget.h"