move inc/ and lib/ to src/. No code changes

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

79 files changed, 87 insertions, 88 deletions

diff --git a/Makefile.am b/Makefile.am
index 9447c975..a536b7c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = lib src inc po icons tests
+SUBDIRS = src po icons tests
 
 DISTCHECK_CONFIGURE_FLAGS = \
         --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
diff --git a/configure.ac b/configure.ac
index 5818b4b0..1ed908b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,8 +118,8 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
 	Makefile
 	abrt.pc
-	lib/Makefile
-	lib/utils/Makefile
+	src/include/Makefile
+	src/lib/Makefile
 	src/plugins/Makefile
 	src/Makefile
 	src/btparser/Makefile
@@ -128,7 +128,6 @@ AC_CONFIG_FILES([
 	src/applet/Makefile
 	src/gui/Makefile
 	src/cli/Makefile
-	inc/Makefile
 	po/Makefile.in
 	icons/Makefile
 	tests/btparser/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index 97b7b2b3..00000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = utils
diff --git a/scripts/dbg_rpminst b/scripts/dbg_rpminst
index 36caab19..b51dbbfc 100755
--- a/scripts/dbg_rpminst
+++ b/scripts/dbg_rpminst
@@ -8,7 +8,7 @@ exit
 
 while rpm -qa | grep abrt >/dev/null; do
     rpm -qa | grep abrt | while read package; do
-	echo "$package: rpm -e `basename "$package" .rpm`"
+        echo "$package: rpm -e `basename "$package" .rpm`"
         rpm -e "`basename "$package" .rpm`"
     done
 done
@@ -17,11 +17,11 @@ while true; do
     r=0
     for package in *.rpm; do
         test -f "$package" || continue
-	# Is it installed?
+        # Is it installed?
         rpm -q "`basename "$package" .rpm`" >/dev/null && continue
-	# Try to install, record failure
-	echo "$package: rpm -i `basename "$package" .rpm`"
-	rpm -i "$package" || r=1
+        # Try to install, record failure
+        echo "$package: rpm -i `basename "$package" .rpm`"
+        rpm -i "$package" || r=1
     done
     test $r = 0 && break
 done
diff --git a/scripts/dbg_rpmuninst b/scripts/dbg_rpmuninst
index 0d0d0736..4232440d 100755
--- a/scripts/dbg_rpmuninst
+++ b/scripts/dbg_rpmuninst
@@ -6,7 +6,7 @@ exit
 
 while rpm -qa | grep abrt >/dev/null; do
     rpm -qa | grep abrt | while read package; do
-	echo "$package: rpm -e `basename "$package" .rpm`"
+        echo "$package: rpm -e `basename "$package" .rpm`"
         rpm -e "`basename "$package" .rpm`"
     done
 done
diff --git a/src/Makefile.am b/src/Makefile.am
index f6117250..fb4cba28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = hooks btparser daemon applet gui cli plugins
+SUBDIRS = include lib hooks btparser daemon applet gui cli plugins
diff --git a/src/applet/Makefile.am b/src/applet/Makefile.am
index 55e28733..32d38b1f 100644
--- a/src/applet/Makefile.am
+++ b/src/applet/Makefile.am
@@ -5,8 +5,8 @@ abrt_applet_SOURCES = \
     applet_gtk.h applet_gtk.c
 abrt_applet_CPPFLAGS = \
     -Wall -Werror \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -I/usr/include/glib-2.0 \
     -I/usr/lib/glib-2.0/include \
     -DBIN_DIR=\"$(bindir)\" \
@@ -22,7 +22,7 @@ abrt_applet_CPPFLAGS = \
 #    $(LIBNOTIFY_CFLAGS)
 #    $(DBUS_GLIB_CFLAGS)
 abrt_applet_LDADD = \
-    ../../lib/utils/libABRTUtils.la \
+    ../lib/libABRTUtils.la \
     -lglib-2.0 \
     -lgthread-2.0 \
     $(DBUS_LIBS) \
diff --git a/src/btparser/Makefile.am b/src/btparser/Makefile.am
index b610f30c..d69a68ba 100644
--- a/src/btparser/Makefile.am
+++ b/src/btparser/Makefile.am
@@ -13,9 +13,9 @@ libbtparser_la_SOURCES = \
 	normalize_xorg.c \
 	thread.h thread.c \
 	utils.h utils.c
-libbtparser_la_CFLAGS = -Wall -Werror -D_GNU_SOURCE -I../../lib/utils
+libbtparser_la_CFLAGS = -Wall -Werror -D_GNU_SOURCE -I../lib
 libbtparser_la_LDFLAGS = -version-info 1:1:0
-libbtparser_la_LIBADD = ../../lib/utils/libABRTUtils.la
+libbtparser_la_LIBADD = ../lib/libABRTUtils.la
 
 # From http://www.seul.org/docs/autotut/
 # Version consists 3 numbers: CURRENT, REVISION, AGE.
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index be8e7d8e..bbfaa9d0 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -7,8 +7,8 @@ abrt_cli_SOURCES = \
     dbus.h dbus.cpp
 
 abrt_cli_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     $(ENABLE_SOCKET_OR_DBUS) \
     $(DBUS_CFLAGS) $(GLIB_CFLAGS) \
@@ -16,8 +16,8 @@ abrt_cli_CPPFLAGS = \
 #    $(GTK_CFLAGS)
 
 abrt_cli_LDADD = \
-    ../../lib/utils/libABRTUtils.la \
-    ../../lib/utils/libABRTdUtils.la \
+    ../lib/libABRTUtils.la \
+    ../lib/libABRTdUtils.la \
     $(GLIB_LIBS)
 
 man_MANS = abrt-cli.1
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 072f7f17..a63c014f 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -18,8 +18,8 @@ abrtd_SOURCES = \
     Settings.h Settings.cpp \
     Daemon.h Daemon.cpp
 abrtd_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -36,14 +36,14 @@ abrtd_CPPFLAGS = \
 abrtd_LDADD = \
     $(DL_LIBS) \
     $(DBUS_LIBS) \
-    ../../lib/utils/libABRTUtils.la \
-    ../../lib/utils/libABRTdUtils.la
+    ../lib/libABRTUtils.la \
+    ../lib/libABRTdUtils.la
 
 abrt_server_SOURCES = \
     abrt-server.c
 abrt_server_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -54,13 +54,13 @@ abrt_server_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_server_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_handle_crashdump_SOURCES = \
     abrt-handle-crashdump.c
 abrt_handle_crashdump_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -72,15 +72,15 @@ abrt_handle_crashdump_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_handle_crashdump_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_save_package_data_SOURCES = \
     rpm.h rpm.c \
     Settings.h Settings.cpp \
     abrt-action-save-package-data.cpp
 abrt_action_save_package_data_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -95,8 +95,8 @@ abrt_action_save_package_data_CPPFLAGS = \
 # polkit_check_authorization is in libABRTdUtils
 abrt_action_save_package_data_LDADD = \
     $(RPM_LIBS) \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
 dist_dbusabrtconf_DATA = dbus-abrt.conf
diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
index d20fad91..76fe84c9 100644
--- a/src/hooks/Makefile.am
+++ b/src/hooks/Makefile.am
@@ -5,21 +5,21 @@ bin_PROGRAMS = dumpoops
 abrt_hook_ccpp_SOURCES = \
     abrt-hook-ccpp.c
 abrt_hook_ccpp_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -D_GNU_SOURCE
 abrt_hook_ccpp_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 # dumpoops
 dumpoops_SOURCES = \
     dumpoops.cpp
 dumpoops_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -I$(srcdir)/../plugins \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
@@ -30,7 +30,7 @@ dumpoops_CPPFLAGS = \
     -D_GNU_SOURCE
 # build will succeed, but at runtime plugins do need ABRT*d*Utils
 dumpoops_LDADD = \
-    ../../lib/utils/libABRTUtils.la \
+    ../lib/libABRTUtils.la \
     $(GLIB_FLAGS)
 
 python_PYTHON = abrt.pth abrt_exception_handler.py
diff --git a/inc/Makefile.am b/src/include/Makefile.am
index 993fa62a..993fa62a 100644
--- a/inc/Makefile.am
+++ b/src/include/Makefile.am
diff --git a/inc/abrt_exception.h b/src/include/abrt_exception.h
index b826bfa8..b826bfa8 100644
--- a/inc/abrt_exception.h
+++ b/src/include/abrt_exception.h
diff --git a/inc/abrt_types.h b/src/include/abrt_types.h
index 38804895..38804895 100644
--- a/inc/abrt_types.h
+++ b/src/include/abrt_types.h
diff --git a/inc/abrtlib.h b/src/include/abrtlib.h
index 4d565644..4d565644 100644
--- a/inc/abrtlib.h
+++ b/src/include/abrtlib.h
diff --git a/inc/action.h b/src/include/action.h
index 21183366..21183366 100644
--- a/inc/action.h
+++ b/src/include/action.h
diff --git a/inc/analyzer.h b/src/include/analyzer.h
index 1d78d576..1d78d576 100644
--- a/inc/analyzer.h
+++ b/src/include/analyzer.h
diff --git a/inc/comm_layer_inner.h b/src/include/comm_layer_inner.h
index 2cca9add..2cca9add 100644
--- a/inc/comm_layer_inner.h
+++ b/src/include/comm_layer_inner.h
diff --git a/inc/crash_types.h b/src/include/crash_types.h
index de9f7bf2..de9f7bf2 100644
--- a/inc/crash_types.h
+++ b/src/include/crash_types.h
diff --git a/inc/database.h b/src/include/database.h
index 5eaceed7..5eaceed7 100644
--- a/inc/database.h
+++ b/src/include/database.h
diff --git a/inc/dbus_common.h b/src/include/dbus_common.h
index 63053cc9..63053cc9 100644
--- a/inc/dbus_common.h
+++ b/src/include/dbus_common.h
diff --git a/inc/dump_dir.h b/src/include/dump_dir.h
index aeaa3180..aeaa3180 100644
--- a/inc/dump_dir.h
+++ b/src/include/dump_dir.h
diff --git a/inc/observer.h b/src/include/observer.h
index 1c8f2355..1c8f2355 100644
--- a/inc/observer.h
+++ b/src/include/observer.h
diff --git a/inc/plugin.h b/src/include/plugin.h
index e0f45b6c..e0f45b6c 100644
--- a/inc/plugin.h
+++ b/src/include/plugin.h
diff --git a/inc/reporter.h b/src/include/reporter.h
index 469e828e..469e828e 100644
--- a/inc/reporter.h
+++ b/src/include/reporter.h
diff --git a/inc/xfuncs.h b/src/include/xfuncs.h
index 20284564..20284564 100644
--- a/inc/xfuncs.h
+++ b/src/include/xfuncs.h
diff --git a/lib/utils/ABRTException.cpp b/src/lib/ABRTException.cpp
index 0ae5d452..0ae5d452 100644
--- a/lib/utils/ABRTException.cpp
+++ b/src/lib/ABRTException.cpp
diff --git a/lib/utils/CommLayerInner.cpp b/src/lib/CommLayerInner.cpp
index 3c102d6e..3c102d6e 100644
--- a/lib/utils/CommLayerInner.cpp
+++ b/src/lib/CommLayerInner.cpp
diff --git a/lib/utils/CrashTypes.cpp b/src/lib/CrashTypes.cpp
index acacda5e..acacda5e 100644
--- a/lib/utils/CrashTypes.cpp
+++ b/src/lib/CrashTypes.cpp
diff --git a/lib/utils/Makefile.am b/src/lib/Makefile.am
index 37508ee7..153af2d0 100644
--- a/lib/utils/Makefile.am
+++ b/src/lib/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = \
     libABRTUtils.la \
     libABRTdUtils.la \
     libABRT_web_utils.la
-HEADER_DIR = $(srcdir)/../../inc
+HEADER_DIR = $(srcdir)/../include
 AM_CPPFLAGS = -I$(HEADER_DIR)
 
 # Not used just yet:
@@ -42,7 +42,7 @@ libABRTUtils_la_SOURCES = \
     parse_options.c parse_options.h
 libABRTUtils_la_CPPFLAGS = \
     -Wall -Werror \
-    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../include \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
@@ -66,7 +66,7 @@ libABRTdUtils_la_SOURCES = \
     Polkit.h Polkit.cpp
 libABRTdUtils_la_CPPFLAGS = \
     -Wall -Werror \
-    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../include \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
@@ -85,7 +85,7 @@ libABRT_web_utils_la_SOURCES = \
     abrt_xmlrpc.h abrt_xmlrpc.cpp
 libABRT_web_utils_la_CPPFLAGS = \
     -Wall -Werror \
-    -I$(srcdir)/../../inc \
+    -I$(srcdir)/../include \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
diff --git a/lib/utils/Plugin.cpp b/src/lib/Plugin.cpp
index bf237959..bf237959 100644
--- a/lib/utils/Plugin.cpp
+++ b/src/lib/Plugin.cpp
diff --git a/lib/utils/Polkit.cpp b/src/lib/Polkit.cpp
index a5e07760..a5e07760 100644
--- a/lib/utils/Polkit.cpp
+++ b/src/lib/Polkit.cpp
diff --git a/lib/utils/Polkit.h b/src/lib/Polkit.h
index d9e097ac..d9e097ac 100644
--- a/lib/utils/Polkit.h
+++ b/src/lib/Polkit.h
diff --git a/lib/utils/abrt_curl.c b/src/lib/abrt_curl.c
index f23d3949..f23d3949 100644
--- a/lib/utils/abrt_curl.c
+++ b/src/lib/abrt_curl.c
diff --git a/lib/utils/abrt_curl.h b/src/lib/abrt_curl.h
index 77b4605c..77b4605c 100644
--- a/lib/utils/abrt_curl.h
+++ b/src/lib/abrt_curl.h
diff --git a/lib/utils/abrt_dbus.c b/src/lib/abrt_dbus.c
index 6bc155e3..6bc155e3 100644
--- a/lib/utils/abrt_dbus.c
+++ b/src/lib/abrt_dbus.c
diff --git a/lib/utils/abrt_dbus.h b/src/lib/abrt_dbus.h
index cdc963ca..cdc963ca 100644
--- a/lib/utils/abrt_dbus.h
+++ b/src/lib/abrt_dbus.h
diff --git a/lib/utils/abrt_packages.c b/src/lib/abrt_packages.c
index bbf0e729..bbf0e729 100644
--- a/lib/utils/abrt_packages.c
+++ b/src/lib/abrt_packages.c
diff --git a/lib/utils/abrt_packages.h b/src/lib/abrt_packages.h
index 6a952f5e..6a952f5e 100644
--- a/lib/utils/abrt_packages.h
+++ b/src/lib/abrt_packages.h
diff --git a/lib/utils/abrt_xmlrpc.cpp b/src/lib/abrt_xmlrpc.cpp
index bf74f05b..bf74f05b 100644
--- a/lib/utils/abrt_xmlrpc.cpp
+++ b/src/lib/abrt_xmlrpc.cpp
diff --git a/lib/utils/abrt_xmlrpc.h b/src/lib/abrt_xmlrpc.h
index ad1a87d3..ad1a87d3 100644
--- a/lib/utils/abrt_xmlrpc.h
+++ b/src/lib/abrt_xmlrpc.h
diff --git a/lib/utils/append_to_malloced_string.c b/src/lib/append_to_malloced_string.c
index 430cef0b..430cef0b 100644
--- a/lib/utils/append_to_malloced_string.c
+++ b/src/lib/append_to_malloced_string.c
diff --git a/lib/utils/concat_path_file.c b/src/lib/concat_path_file.c
index 4c946628..4c946628 100644
--- a/lib/utils/concat_path_file.c
+++ b/src/lib/concat_path_file.c
diff --git a/lib/utils/copyfd.c b/src/lib/copyfd.c
index bfe0fa49..bfe0fa49 100644
--- a/lib/utils/copyfd.c
+++ b/src/lib/copyfd.c
diff --git a/lib/utils/daemon.c b/src/lib/daemon.c
index 944aef0c..944aef0c 100644
--- a/lib/utils/daemon.c
+++ b/src/lib/daemon.c
diff --git a/lib/utils/database.c b/src/lib/database.c
index 2b742ebf..2b742ebf 100644
--- a/lib/utils/database.c
+++ b/src/lib/database.c
diff --git a/lib/utils/dirsize.c b/src/lib/dirsize.c
index be927ad5..be927ad5 100644
--- a/lib/utils/dirsize.c
+++ b/src/lib/dirsize.c
diff --git a/lib/utils/dump_dir.c b/src/lib/dump_dir.c
index 0328bb26..0328bb26 100644
--- a/lib/utils/dump_dir.c
+++ b/src/lib/dump_dir.c
diff --git a/lib/utils/encbase64.c b/src/lib/encbase64.c
index 6a6f1f75..6a6f1f75 100644
--- a/lib/utils/encbase64.c
+++ b/src/lib/encbase64.c
diff --git a/lib/utils/hash_md5.c b/src/lib/hash_md5.c
index 8bfddd54..8bfddd54 100644
--- a/lib/utils/hash_md5.c
+++ b/src/lib/hash_md5.c
diff --git a/lib/utils/hash_md5.h b/src/lib/hash_md5.h
index cc1d2c43..cc1d2c43 100644
--- a/lib/utils/hash_md5.h
+++ b/src/lib/hash_md5.h
diff --git a/lib/utils/hash_sha1.c b/src/lib/hash_sha1.c
index 954e7bc8..954e7bc8 100644
--- a/lib/utils/hash_sha1.c
+++ b/src/lib/hash_sha1.c
diff --git a/lib/utils/hash_sha1.h b/src/lib/hash_sha1.h
index 02978ea4..02978ea4 100644
--- a/lib/utils/hash_sha1.h
+++ b/src/lib/hash_sha1.h
diff --git a/lib/utils/hooklib.c b/src/lib/hooklib.c
index 062e3ddb..062e3ddb 100644
--- a/lib/utils/hooklib.c
+++ b/src/lib/hooklib.c
diff --git a/lib/utils/hooklib.h b/src/lib/hooklib.h
index ba76efbc..ba76efbc 100644
--- a/lib/utils/hooklib.h
+++ b/src/lib/hooklib.h
diff --git a/lib/utils/logging.c b/src/lib/logging.c
index 815efb5e..815efb5e 100644
--- a/lib/utils/logging.c
+++ b/src/lib/logging.c
diff --git a/lib/utils/logging.h b/src/lib/logging.h
index 8a038bc7..8a038bc7 100644
--- a/lib/utils/logging.h
+++ b/src/lib/logging.h
diff --git a/lib/utils/make_descr.cpp b/src/lib/make_descr.cpp
index 79065100..79065100 100644
--- a/lib/utils/make_descr.cpp
+++ b/src/lib/make_descr.cpp
diff --git a/lib/utils/numtoa.cpp b/src/lib/numtoa.cpp
index 061da553..061da553 100644
--- a/lib/utils/numtoa.cpp
+++ b/src/lib/numtoa.cpp
diff --git a/lib/utils/overlapping_strcpy.c b/src/lib/overlapping_strcpy.c
index 41c1c1a1..41c1c1a1 100644
--- a/lib/utils/overlapping_strcpy.c
+++ b/src/lib/overlapping_strcpy.c
diff --git a/lib/utils/parse_options.c b/src/lib/parse_options.c
index c1a2c297..c1a2c297 100644
--- a/lib/utils/parse_options.c
+++ b/src/lib/parse_options.c
diff --git a/lib/utils/parse_options.h b/src/lib/parse_options.h
index 105f081c..105f081c 100644
--- a/lib/utils/parse_options.h
+++ b/src/lib/parse_options.h
diff --git a/lib/utils/parse_release.cpp b/src/lib/parse_release.cpp
index f9057bfe..f9057bfe 100644
--- a/lib/utils/parse_release.cpp
+++ b/src/lib/parse_release.cpp
diff --git a/lib/utils/read_write.c b/src/lib/read_write.c
index da067f78..da067f78 100644
--- a/lib/utils/read_write.c
+++ b/src/lib/read_write.c
diff --git a/lib/utils/read_write.h b/src/lib/read_write.h
index 054a1a9a..054a1a9a 100644
--- a/lib/utils/read_write.h
+++ b/src/lib/read_write.h
diff --git a/lib/utils/run_event.c b/src/lib/run_event.c
index 23517923..23517923 100644
--- a/lib/utils/run_event.c
+++ b/src/lib/run_event.c
diff --git a/lib/utils/skip_whitespace.c b/src/lib/skip_whitespace.c
index 816928bf..816928bf 100644
--- a/lib/utils/skip_whitespace.c
+++ b/src/lib/skip_whitespace.c
diff --git a/lib/utils/spawn.c b/src/lib/spawn.c
index 068f4ac7..068f4ac7 100644
--- a/lib/utils/spawn.c
+++ b/src/lib/spawn.c
diff --git a/lib/utils/stdio_helpers.c b/src/lib/stdio_helpers.c
index 81cf5d75..81cf5d75 100644
--- a/lib/utils/stdio_helpers.c
+++ b/src/lib/stdio_helpers.c
diff --git a/lib/utils/strbuf.c b/src/lib/strbuf.c
index 04a35998..04a35998 100644
--- a/lib/utils/strbuf.c
+++ b/src/lib/strbuf.c
diff --git a/lib/utils/strbuf.h b/src/lib/strbuf.h
index dc45a199..dc45a199 100644
--- a/lib/utils/strbuf.h
+++ b/src/lib/strbuf.h
diff --git a/lib/utils/stringops.cpp b/src/lib/stringops.cpp
index 7bc5413f..7bc5413f 100644
--- a/lib/utils/stringops.cpp
+++ b/src/lib/stringops.cpp
diff --git a/lib/utils/test.cpp b/src/lib/test.cpp
index a548dc21..a548dc21 100644
--- a/lib/utils/test.cpp
+++ b/src/lib/test.cpp
diff --git a/lib/utils/time.c b/src/lib/time.c
index 37ade2cc..37ade2cc 100644
--- a/lib/utils/time.c
+++ b/src/lib/time.c
diff --git a/lib/utils/xatonum.c b/src/lib/xatonum.c
index 3b22071f..3b22071f 100644
--- a/lib/utils/xatonum.c
+++ b/src/lib/xatonum.c
diff --git a/lib/utils/xconnect.c b/src/lib/xconnect.c
index 0d02b1a4..0d02b1a4 100644
--- a/lib/utils/xconnect.c
+++ b/src/lib/xconnect.c
diff --git a/lib/utils/xfuncs.c b/src/lib/xfuncs.c
index d5166037..d5166037 100644
--- a/lib/utils/xfuncs.c
+++ b/src/lib/xfuncs.c
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index f213804e..8a8a6f30 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,5 +1,5 @@
-INC_PATH=$(srcdir)/../../inc
-UTILS_PATH=$(srcdir)/../../lib/utils
+INC_PATH=$(srcdir)/../include
+UTILS_PATH=$(srcdir)/../lib
 AM_CPPFLAGS = -I$(INC_PATH) -I$(UTILS_PATH)
 pluginslibdir=$(PLUGINS_LIB_DIR)
 libexec_SCRIPTS = \
@@ -54,7 +54,8 @@ install-data-hook: $(DESTDIR)/$(DEBUG_INFO_DIR)
 libCCpp_la_SOURCES = CCpp.cpp CCpp.h
 libCCpp_la_LDFLAGS = -avoid-version
 libCCpp_la_CPPFLAGS = -Wall -Werror \
-    -I$(INC_PATH) -I$(UTILS_PATH) \
+    -I$(INC_PATH) \
+    -I$(UTILS_PATH) \
     -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
     -DLOCALSTATEDIR='"$(localstatedir)"'
@@ -86,8 +87,8 @@ libexec_PROGRAMS = \
 abrt_action_analyze_c_SOURCES = \
     abrt-action-analyze-c.c
 abrt_action_analyze_c_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -99,13 +100,13 @@ abrt_action_analyze_c_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_c_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_analyze_python_SOURCES = \
     abrt-action-analyze-python.c
 abrt_action_analyze_python_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -117,13 +118,13 @@ abrt_action_analyze_python_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_python_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_analyze_oops_SOURCES = \
     abrt-action-analyze-oops.c
 abrt_action_analyze_oops_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -135,13 +136,13 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_oops_LDADD = \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTUtils.la
 
 abrt_action_generate_backtrace_SOURCES = \
     abrt-action-generate-backtrace.c
 abrt_action_generate_backtrace_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -153,14 +154,14 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_generate_backtrace_LDADD = \
-    ../../lib/utils/libABRTUtils.la \
+    ../lib/libABRTUtils.la \
     ../btparser/libbtparser.la
 
 abrt_action_bugzilla_SOURCES = \
     abrt-action-bugzilla.cpp
 abrt_action_bugzilla_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -174,16 +175,16 @@ abrt_action_bugzilla_CPPFLAGS = \
     -Wall -Werror
 abrt_action_bugzilla_LDADD = \
     $(GLIB_LIBS) \
-    ../../lib/utils/libABRT_web_utils.la \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRT_web_utils.la \
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_rhtsupport_SOURCES = \
     abrt_rh_support.h abrt_rh_support.c \
     abrt-action-rhtsupport.cpp
 abrt_action_rhtsupport_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -200,15 +201,15 @@ abrt_action_rhtsupport_LDFLAGS = -ltar
 abrt_action_rhtsupport_LDADD = \
     $(GLIB_LIBS) \
     $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
-    ../../lib/utils/libABRT_web_utils.la \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRT_web_utils.la \
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_upload_SOURCES = \
     abrt-action-upload.cpp
 abrt_action_upload_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -226,14 +227,14 @@ abrt_action_upload_LDFLAGS = -ltar
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
     $(CURL_LIBS) \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_kerneloops_SOURCES = \
     abrt-action-kerneloops.cpp
 abrt_action_kerneloops_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -247,15 +248,15 @@ abrt_action_kerneloops_CPPFLAGS = \
     -Wall -Werror
 # libABRTdUtils is used only because of LoadPluginSettings:
 abrt_action_kerneloops_LDADD = \
-    ../../lib/utils/libABRT_web_utils.la \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRT_web_utils.la \
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_mailx_SOURCES = \
     abrt-action-mailx.cpp
 abrt_action_mailx_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -268,14 +269,14 @@ abrt_action_mailx_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_mailx_LDADD = \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 abrt_action_print_SOURCES = \
     abrt-action-print.cpp
 abrt_action_print_CPPFLAGS = \
-    -I$(srcdir)/../../inc \
-    -I$(srcdir)/../../lib/utils \
+    -I$(srcdir)/../include \
+    -I$(srcdir)/../lib \
     -DBIN_DIR=\"$(bindir)\" \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     -DCONF_DIR=\"$(CONF_DIR)\" \
@@ -289,7 +290,7 @@ abrt_action_print_CPPFLAGS = \
     -Wall -Werror
 # libABRTdUtils is used only because of make_description_logger:
 abrt_action_print_LDADD = \
-    ../../lib/utils/libABRTdUtils.la \
-    ../../lib/utils/libABRTUtils.la
+    ../lib/libABRTdUtils.la \
+    ../lib/libABRTUtils.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 62cba99d..f3649ccb 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -6,7 +6,7 @@ CC='@CC@'
 LIBTOOL="$abs_top_builddir/libtool"
 
 # We want no optimization.
-CFLAGS="@O0CFLAGS@ -I$abs_top_builddir/src/btparser -I$abs_top_builddir/lib/utils -D_GNU_SOURCE"
+CFLAGS="@O0CFLAGS@ -I$abs_top_builddir/src/btparser -I$abs_top_builddir/src/lib -D_GNU_SOURCE"
 
 # Are special link options needed?
 LDFLAGS="@LDFLAGS@ $abs_top_builddir/src/btparser/libbtparser.la"