Move all interface includes from subdirs lib/*/*.h into lib/*.h

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

lib/Makefile.am

@@ -2,6 +2,11 @@ SUBDIRS = filehighlight mcconfig search skin tty vfs strutil
 
 noinst_LTLIBRARIES = libmc.la
 
+SUBLIB_includes = \
+	filehighlight.h \
+	mcconfig.h \
+	search.h \
+	strutil.h
 
 SRC_mc_utils = \
 	utilunix.c \
@@ -10,6 +15,7 @@ SRC_mc_utils = \
 
 
 libmc_la_SOURCES = \
+	$(SUBLIB_includes) \
 	$(SRC_mc_utils) \
 	fileloc.h \
 	fs.h \

lib/filehighlight/Makefile.am

@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = libmcfilehighlight.la
 
 libmcfilehighlight_la_SOURCES = \
 	common.c \
-	fhl.h \
 	get-color.c \
 	ini-file-read.c \
 	internal.h

lib/filehighlight/common.c

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

lib/filehighlight/get-color.c

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

lib/filehighlight/ini-file-read.c

@@ -32,8 +32,8 @@
 #include "src/main.h"
 #include "lib/fileloc.h"
 #include "src/strescape.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
-#include "fhl.h"
+#include "lib/filehighlight.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/mcconfig/Makefile.am

@@ -2,7 +2,6 @@
 noinst_LTLIBRARIES = libmcconfig.la
 
 libmcconfig_la_SOURCES = \
-	mcconfig.h \
 	common.c \
 	get.c \
 	set.c

lib/mcconfig/common.c

@@ -25,12 +25,9 @@
 #include <fcntl.h>
 #include <errno.h> /* extern int errno */
 
-
 #include "lib/global.h"
-
 #include "lib/vfs/mc-vfs/vfs.h"      /* mc_stat */
-
+#include "lib/mcconfig.h"
-#include "mcconfig.h"
 
 /*** global variables **************************************************/
 

lib/mcconfig/get.c

@@ -21,8 +21,7 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
-
+#include "lib/mcconfig.h"
-#include "mcconfig.h"
 
 /*** global variables **************************************************/
 

lib/mcconfig/set.c

@@ -21,8 +21,7 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
-
+#include "lib/mcconfig.h"
-#include "mcconfig.h"
 
 /*** global variables **************************************************/
 

lib/search/Makefile.am

@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = libsearch.la
 
 libsearch_la_SOURCES = \
 	search.c \
-	search.h \
 	internal.h \
 	lib.c \
 	normal.c \

lib/search/glob.c

@@ -30,11 +30,11 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/search.h"
 
 #include "src/strescape.h"
 #include "src/charsets.h"
 
-#include "search.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/search/hex.c

@@ -31,11 +31,11 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/search.h"
 
 #include "src/strescape.h"
 #include "src/charsets.h"
 
-#include "search.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/search/lib.c

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

lib/search/normal.c

@@ -27,13 +27,12 @@
 
 #include <config.h>
 
-
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/search.h"
 
 #include "src/charsets.h"
 
-#include "search.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/search/regex.c

@@ -31,11 +31,11 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/search.h"
 
 #include "src/strescape.h"
 #include "src/charsets.h"
 
-#include "search.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/search/search.c

@@ -32,10 +32,10 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/search.h"
 
 #include "src/charsets.h"
 
-#include "search.h"
 #include "internal.h"
 
 /*** global variables ****************************************************************************/

lib/skin.h

@@ -3,7 +3,7 @@
 
 #include "lib/global.h"
 
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 
 #include "lib/tty/color.h"
 

lib/skin/Makefile.am

@@ -7,7 +7,6 @@ libmcskin_la_SOURCES = \
 	hc-skins.c \
 	ini-file.c \
 	lines.c \
-	skin.h \
 	internal.h
 
 libmcskin_la_CFLAGS = -I$(top_srcdir) \

lib/skin/colors-old.c

@@ -30,11 +30,10 @@
 #include <sys/types.h>          /* size_t */
 #include "lib/tty/color.h"
 
-#include "lib/global.h"
-#include "src/setup.h"
-#include "skin.h"
 #include "internal.h"
 
+#include "src/setup.h"
+
 
 /*** global variables ****************************************************************************/
 

lib/skin/colors.c

@@ -28,11 +28,10 @@
 #include <config.h>
 #include <string.h>
 
-#include "lib/global.h"
-#include "src/args.h"
-#include "lib/tty/color.h"
-#include "skin.h"
 #include "internal.h"
+#include "lib/tty/color.h"
+
+#include "src/args.h"
 
 /*** global variables ****************************************************************************/
 

lib/skin/common.c

@@ -28,11 +28,10 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "lib/global.h"
-#include "src/args.h"
-#include "skin.h"
 #include "internal.h"
 
+#include "src/args.h"
+
 /*** global variables ****************************************************************************/
 
 mc_skin_t mc_skin__default;

lib/skin/hc-skins.c

@@ -26,9 +26,7 @@
  */
 
 #include <config.h>
-#include "lib/global.h"
 
-#include "skin.h"
 #include "internal.h"
 
 

lib/skin/ini-file.c

@@ -28,11 +28,11 @@
 #include <config.h>
 #include <string.h>
 
-#include "lib/global.h"
-#include "src/main.h"
-#include "lib/fileloc.h"
-#include "skin.h"
 #include "internal.h"
+#include "lib/fileloc.h"
+
+#include "src/main.h"
+
 
 /*** global variables ****************************************************************************/
 

lib/skin/internal.h

@@ -2,8 +2,7 @@
 #define MC__SKIN_INTERNAL_H
 
 #include "lib/global.h"
-
+#include "lib/skin.h"
-#include "skin.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

lib/skin/lines.c

@@ -28,11 +28,11 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "lib/global.h"
-#include "src/args.h"
-#include "lib/tty/tty.h"
-#include "skin.h"
 #include "internal.h"
+#include "lib/tty/tty.h"
+
+#include "src/args.h"
+
 
 
 /*** global variables ****************************************************************************/

lib/util.c

@@ -42,8 +42,8 @@
 
 #include "lib/global.h"
 #include "lib/tty/win.h"		/* xterm_flag */
-#include "lib/search/search.h"
+#include "lib/search.h"
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 #include "lib/timefmt.h"
 #include "lib/fileloc.h"
 #include "lib/vfs/mc-vfs/vfs.h"

lib/vfs/mc-vfs/ftpfs.c

@@ -91,7 +91,7 @@ What to do with this?
 #include "src/main.h"	/* print_vfs_message */
 #include "src/history.h"
 #include "src/setup.h"	/* for load_anon_passwd */
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 
 #include "utilvfs.h"
 #include "xdirentry.h"

src/achown.c

@@ -37,7 +37,7 @@
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* XCTRL and ALT macros */
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 

src/boxes.c

@@ -37,9 +37,9 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"		/* INPUT_COLOR */
+#include "lib/skin.h"		/* INPUT_COLOR */
 #include "lib/tty/key.h"		/* XCTRL and ALT macros  */
-#include "lib/mcconfig/mcconfig.h"	/* Load/save user formats */
+#include "lib/mcconfig.h"	/* Load/save user formats */
 #include "lib/strutil.h"
 
 #ifdef USE_NETCODE

src/chmod.c

@@ -34,7 +34,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 

src/chown.c

@@ -35,7 +35,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 

src/cmd.c

@@ -50,10 +50,10 @@
 #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/mcconfig.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "src/viewer/mcviewer.h"
-#include "lib/filehighlight/fhl.h"	/* MC_FHL_INI_FILE */
+#include "lib/filehighlight.h"	/* MC_FHL_INI_FILE */
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"

src/command.c

@@ -44,7 +44,7 @@
 #include "user.h"		/* expand_format */
 #include "subshell.h"		/* SUBSHELL_EXIT */
 #include "tree.h"		/* for tree_chdir */
-#include "lib/skin/skin.h"		/* DEFAULT_COLOR */
+#include "lib/skin.h"		/* DEFAULT_COLOR */
 #include "execute.h"		/* shell_execute */
 #include "src/strescape.h"
 

src/cons.handler.c

@@ -37,7 +37,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"		/* tty_set_normal_attrs */
+#include "lib/skin.h"		/* tty_set_normal_attrs */
 #include "lib/tty/win.h"
 
 #include "cons.saver.h"

src/dialog.c

@@ -32,7 +32,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/mouse.h"
 #include "lib/tty/key.h"
 #include "lib/strutil.h"

src/dir.c

@@ -29,7 +29,7 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fs.h"
 #include "lib/strutil.h"

src/editor/edit-widget.h

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

src/editor/edit.c

@@ -44,7 +44,7 @@
 #include "lib/tty/color.h"	
 #include "lib/tty/tty.h"	/* attrset() */
 #include "lib/tty/key.h"	/* is_idle() */
-#include "lib/skin/skin.h"	/* EDITOR_NORMAL_COLOR */
+#include "lib/skin.h"	/* EDITOR_NORMAL_COLOR */
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"	/* utf string functions */
 

src/editor/editcmd.c

@@ -48,8 +48,8 @@
 #include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"	/* XCTRL */
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/strutil.h"	/* utf string functions */
 
 #include "src/history.h"

src/editor/editcmd_dialogs.c

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

src/editor/editdraw.c

@@ -40,7 +40,7 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"		/* tty_printf() */
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/key.h"		/* is_idle() */
 #include "lib/strutil.h"		/* utf string functions */
 

src/editor/syntax.c

@@ -47,8 +47,8 @@
 #include <stdlib.h>
 
 #include "lib/global.h"
-#include "lib/search/search.h"	/* search engine */
+#include "lib/search.h"	/* search engine */
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/strutil.h"		/* utf string functions */
 
 #include "src/main.h"		/* mc_home */

src/ext.c

@@ -42,7 +42,7 @@
 #include "history.h"
 #include "cons.saver.h"
 #include "layout.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "src/viewer/mcviewer.h"
 
 #include "lib/vfs/mc-vfs/vfs.h"

src/file.c

@@ -59,7 +59,7 @@
 #include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs-impl.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"

src/filegui.c

@@ -79,7 +79,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/key.h"		/* tty_get_event */
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 

src/fileopctx.c

@@ -34,7 +34,7 @@
 
 #include "lib/global.h"
 #include "fileopctx.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 
 /**

src/find.c

@@ -36,9 +36,9 @@
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 

src/help.c

@@ -54,7 +54,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/mouse.h"
 #include "lib/tty/key.h"
 #include "lib/strutil.h"

src/hotlist.c

@@ -43,9 +43,9 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"		/* COLS */
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/key.h"		/* KEY_M_CTRL */
-#include "lib/mcconfig/mcconfig.h"	/* Load/save directories hotlist */
+#include "lib/mcconfig.h"	/* Load/save directories hotlist */
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
 

src/info.c

@@ -29,7 +29,7 @@
 #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 "lib/skin.h"
 #include "lib/unixcompat.h"
 #include "lib/strutil.h"
 

src/layout.c

@@ -46,11 +46,11 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/key.h"
 #include "lib/tty/mouse.h"
 #include "lib/tty/win.h"	/* do_enter_ca_mode() */
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"		/* For vfs_translate_url() */
 #include "lib/strutil.h"
 

src/learn.c

@@ -38,7 +38,7 @@
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
-#include "lib/mcconfig/mcconfig.h"	/* Save profile */
+#include "lib/mcconfig.h"	/* Save profile */
 #include "lib/strutil.h"
 
 #include "dialog.h"

src/logging.c

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

src/main.c

@@ -42,13 +42,13 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/mouse.h"
 #include "lib/tty/key.h"		/* For init_key() */
 #include "lib/tty/win.h"		/* xterm_flag */
 
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
-#include "lib/filehighlight/fhl.h"
+#include "lib/filehighlight.h"
 #include "lib/fileloc.h"		/* MC_USERCONF_DIR */
 
 #include "lib/vfs/mc-vfs/vfs.h"		/* vfs_translate_url() */

src/menu.c

@@ -29,7 +29,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/mouse.h"
 #include "lib/tty/key.h"	/* key macros */
 #include "lib/strutil.h"

src/option.c

@@ -32,7 +32,7 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"
-#include "lib/mcconfig/mcconfig.h"	/* For mc_config_save_file */
+#include "lib/mcconfig.h"	/* For mc_config_save_file */
 #include "lib/strutil.h"
 
 #include "dialog.h"

src/panelize.c

@@ -35,9 +35,9 @@
 
 #include "lib/global.h"
 
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
-#include "lib/mcconfig/mcconfig.h"	/* Load/save directories panelize */
+#include "lib/mcconfig.h"	/* Load/save directories panelize */
 #include "lib/strutil.h"
 
 #include "dialog.h"

src/screen.c

@@ -34,11 +34,11 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/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 "lib/filehighlight.h"
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/unixcompat.h"
 

src/setup.c

@@ -34,7 +34,7 @@
 #include "lib/tty/key.h"
 #include "lib/tty/mouse.h"		/* To make view.h happy */
 #include "lib/vfs/mc-vfs/vfs.h"
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 #include "lib/fileloc.h"
 
 #ifdef ENABLE_VFS

src/tree.c

@@ -42,7 +42,7 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/mouse.h"
 #include "lib/tty/key.h"
 #include "lib/vfs/mc-vfs/vfs.h"

src/treestore.c

@@ -48,7 +48,7 @@
 #include <unistd.h>
 
 #include "lib/global.h"
-#include "lib/mcconfig/mcconfig.h"
+#include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 

src/user.c

@@ -30,8 +30,8 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 

src/viewer/dialogs.c

@@ -41,7 +41,7 @@
 #include <sys/types.h>
 
 #include "lib/global.h"
-#include "lib/search/search.h"
+#include "lib/search.h"
 #include "lib/strutil.h"
 
 #include "src/wtools.h"

src/viewer/display.c

@@ -38,7 +38,7 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/strutil.h"

src/viewer/hex.c

@@ -42,7 +42,7 @@
 
 #include "lib/global.h"
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "src/main.h"
 #include "src/wtools.h"
 #include "src/charsets.h"

src/viewer/internal.h

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

src/viewer/nroff.c

@@ -41,7 +41,7 @@
 #include "src/main.h"
 #include "src/charsets.h"
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/skin.h"
 #include "internal.h"
 
 

src/viewer/plain.c

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

src/widget.c

@@ -43,10 +43,10 @@
 #include "lib/global.h"
 
 #include "lib/tty/tty.h"
-#include "lib/skin/skin.h"
+#include "lib/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/mcconfig.h"	/* for history loading and saving */
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"

src/wtools.c

@@ -36,7 +36,7 @@
 #include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"		/* tty_getch() */
-#include "lib/skin/skin.h"		/* INPUT_COLOR */
+#include "lib/skin.h"		/* INPUT_COLOR */
 #include "lib/strutil.h"
 
 #include "dialog.h"