diff --git a/qse/cmd/awk/Makefile.am b/qse/cmd/awk/Makefile.am
index 07d171b4..b609f999 100644
--- a/qse/cmd/awk/Makefile.am
+++ b/qse/cmd/awk/Makefile.am
@@ -1,5 +1,7 @@
+AUTOMAKE_OPTIONS = nostdinc
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/awk/Makefile.in b/qse/cmd/awk/Makefile.in
index b40a7526..4adf8a2c 100644
--- a/qse/cmd/awk/Makefile.in
+++ b/qse/cmd/awk/Makefile.in
@@ -52,7 +52,7 @@ qseawk_DEPENDENCIES = $(am__DEPENDENCIES_1)
 qseawk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qseawk_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse
+DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -202,7 +202,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/cut/Makefile.am b/qse/cmd/cut/Makefile.am
index 077b8f59..9b74c461 100644
--- a/qse/cmd/cut/Makefile.am
+++ b/qse/cmd/cut/Makefile.am
@@ -1,5 +1,7 @@
+AUTOMAKE_OPTIONS = nostdinc
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/cut/Makefile.in b/qse/cmd/cut/Makefile.in
index 2b7b921a..6ffaafd7 100644
--- a/qse/cmd/cut/Makefile.in
+++ b/qse/cmd/cut/Makefile.in
@@ -51,7 +51,7 @@ qsecut_DEPENDENCIES =
 qsecut_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsecut_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse
+DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -201,7 +201,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/scm/Makefile.am b/qse/cmd/scm/Makefile.am
index 4a176709..e9894b8f 100644
--- a/qse/cmd/scm/Makefile.am
+++ b/qse/cmd/scm/Makefile.am
@@ -1,5 +1,7 @@
+AUTOMAKE_OPTIONS = nostdinc
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/scm/Makefile.in b/qse/cmd/scm/Makefile.in
index 13bb9416..f3a966d2 100644
--- a/qse/cmd/scm/Makefile.in
+++ b/qse/cmd/scm/Makefile.in
@@ -52,7 +52,7 @@ qsescm_DEPENDENCIES = $(am__DEPENDENCIES_1)
 qsescm_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsescm_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse
+DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -202,7 +202,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/sed/Makefile.am b/qse/cmd/sed/Makefile.am
index 6c04a584..f53c36e8 100644
--- a/qse/cmd/sed/Makefile.am
+++ b/qse/cmd/sed/Makefile.am
@@ -1,5 +1,7 @@
+AUTOMAKE_OPTIONS = nostdinc
 
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/cmd/sed/Makefile.in b/qse/cmd/sed/Makefile.in
index 118ba9ea..9b7c619f 100644
--- a/qse/cmd/sed/Makefile.in
+++ b/qse/cmd/sed/Makefile.in
@@ -51,7 +51,7 @@ qsesed_DEPENDENCIES =
 qsesed_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(qsesed_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/qse
+DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -201,7 +201,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = nostdinc
 AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(includedir)
 
diff --git a/qse/configure b/qse/configure
index dcaddd90..14c99d44 100755
--- a/qse/configure
+++ b/qse/configure
@@ -29809,38 +29809,38 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_VERSION "${VERSION}"
+#define QSE_PACKAGE_VERSION "${VERSION}"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_VERSION_MAJOR $(echo ${VERSION} | cut -d. -f1)
+#define QSE_PACKAGE_VERSION_MAJOR $(echo ${VERSION} | cut -d. -f1)
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_VERSION_MINOR $(echo ${VERSION} | cut -d. -f2)
+#define QSE_PACKAGE_VERSION_MINOR $(echo ${VERSION} | cut -d. -f2)
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_VERSION_PATCH $(echo ${VERSION} | cut -d. -f3)
+#define QSE_PACKAGE_VERSION_PATCH $(echo ${VERSION} | cut -d. -f3)
 _ACEOF
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_PROJECT_AUTHOR "${PACKAGE_BUGREPORT}"
+#define QSE_PACKAGE_AUTHOR "${PACKAGE_BUGREPORT}"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_PROJECT_NAME "${PACKAGE_NAME}"
+#define QSE_PACKAGE_NAME "${PACKAGE_NAME}"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define QSE_PROJECT_URL "${PACKAGE_URL}"
+#define QSE_PACKAGE_URL "${PACKAGE_URL}"
 _ACEOF
 
 
diff --git a/qse/configure.ac b/qse/configure.ac
index ff6f043a..0df0e74e 100644
--- a/qse/configure.ac
+++ b/qse/configure.ac
@@ -159,14 +159,14 @@ AC_DEFINE_UNQUOTED(QSE_SIZEOF_WCHAR_T, ${ac_cv_sizeof_wchar_t}, [sizeof(wchar_t)
 AC_DEFINE_UNQUOTED(QSE_SIZEOF_OFF_T, ${ac_cv_sizeof_off_t}, [sizeof(off_t)])
 AC_DEFINE_UNQUOTED(QSE_SIZEOF_OFF64_T, ${ac_cv_sizeof_off64_t}, [sizeof(off64_t)])
 
-AC_DEFINE_UNQUOTED(QSE_VERSION, "${VERSION}", [Package version])
-AC_DEFINE_UNQUOTED(QSE_VERSION_MAJOR, $(echo ${VERSION} | cut -d. -f1), [Major version number])
-AC_DEFINE_UNQUOTED(QSE_VERSION_MINOR, $(echo ${VERSION} | cut -d. -f2), [Minor version number])
-AC_DEFINE_UNQUOTED(QSE_VERSION_PATCH, $(echo ${VERSION} | cut -d. -f3), [Patch level])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION, "${VERSION}", [Package version])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MAJOR, $(echo ${VERSION} | cut -d. -f1), [Major version number])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_MINOR, $(echo ${VERSION} | cut -d. -f2), [Minor version number])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_VERSION_PATCH, $(echo ${VERSION} | cut -d. -f3), [Patch level])
 
-AC_DEFINE_UNQUOTED(QSE_PROJECT_AUTHOR,"${PACKAGE_BUGREPORT}", [Author's contact])
-AC_DEFINE_UNQUOTED(QSE_PROJECT_NAME,"${PACKAGE_NAME}", [package name])
-AC_DEFINE_UNQUOTED(QSE_PROJECT_URL, "${PACKAGE_URL}", [Project URL])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_AUTHOR,"${PACKAGE_BUGREPORT}", [Author's contact])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_NAME,"${PACKAGE_NAME}", [package name])
+AC_DEFINE_UNQUOTED(QSE_PACKAGE_URL, "${PACKAGE_URL}", [Project URL])
 
 AC_C_BIGENDIAN(
 	[AC_DEFINE([QSE_ENDIAN_BIG],[],[Big Endian])],
diff --git a/qse/include/qse/config.h.in b/qse/include/qse/config.h.in
index de302334..ad8f9f8e 100644
--- a/qse/include/qse/config.h.in
+++ b/qse/include/qse/config.h.in
@@ -244,13 +244,25 @@
 #undef QSE_ENDIAN_UNKNOWN
 
 /* Author's contact */
-#undef QSE_PROJECT_AUTHOR
+#undef QSE_PACKAGE_AUTHOR
 
 /* package name */
-#undef QSE_PROJECT_NAME
+#undef QSE_PACKAGE_NAME
 
 /* Project URL */
-#undef QSE_PROJECT_URL
+#undef QSE_PACKAGE_URL
+
+/* Package version */
+#undef QSE_PACKAGE_VERSION
+
+/* Major version number */
+#undef QSE_PACKAGE_VERSION_MAJOR
+
+/* Minor version number */
+#undef QSE_PACKAGE_VERSION_MINOR
+
+/* Patch level */
+#undef QSE_PACKAGE_VERSION_PATCH
 
 /* sizeof(char) */
 #undef QSE_SIZEOF_CHAR
@@ -306,18 +318,6 @@
 /* use the syscall() function to invoke a system call */
 #undef QSE_USE_SYSCALL
 
-/* Package version */
-#undef QSE_VERSION
-
-/* Major version number */
-#undef QSE_VERSION_MAJOR
-
-/* Minor version number */
-#undef QSE_VERSION_MINOR
-
-/* Patch level */
-#undef QSE_VERSION_PATCH
-
 /* The size of `char', as computed by sizeof. */
 #undef SIZEOF_CHAR
 
diff --git a/qse/lib/awk/Makefile.am b/qse/lib/awk/Makefile.am
index 130f6b7e..59c9d9da 100644
--- a/qse/lib/awk/Makefile.am
+++ b/qse/lib/awk/Makefile.am
@@ -1,7 +1,10 @@
 
 AUTOMAKE_OPTIONS = nostdinc
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
 lib_LTLIBRARIES = libqseawk.la
 libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c fnc.c misc.c rio.c std.c awk.h err.h rio.h val.h fnc.h misc.h parse.h run.h tree.h 
diff --git a/qse/lib/cmn/Makefile.am b/qse/lib/cmn/Makefile.am
index 8f0cdd1a..875f7412 100644
--- a/qse/lib/cmn/Makefile.am
+++ b/qse/lib/cmn/Makefile.am
@@ -1,6 +1,9 @@
 
 AUTOMAKE_OPTIONS = nostdinc
-AM_CPPFLAGS = -I$(top_srcdir)/include  -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
 lib_LTLIBRARIES = libqsecmn.la
 libqsecmn_la_SOURCES = \
diff --git a/qse/lib/cmn/Makefile.in b/qse/lib/cmn/Makefile.in
index da9f4364..20fe4af9 100644
--- a/qse/lib/cmn/Makefile.in
+++ b/qse/lib/cmn/Makefile.in
@@ -230,7 +230,11 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
-AM_CPPFLAGS = -I$(top_srcdir)/include  -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
+
 lib_LTLIBRARIES = libqsecmn.la $(am__append_1)
 libqsecmn_la_SOURCES = \
 	syscall.h mem.h \
diff --git a/qse/lib/cut/Makefile.am b/qse/lib/cut/Makefile.am
index e0bcf373..cf4cd9af 100644
--- a/qse/lib/cut/Makefile.am
+++ b/qse/lib/cut/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
 lib_LTLIBRARIES = libqsecut.la
 libqsecut_la_SOURCES = cut.c err.c cut.h std.c
diff --git a/qse/lib/scm/Makefile.am b/qse/lib/scm/Makefile.am
index cc0a4c67..b591ce63 100644
--- a/qse/lib/scm/Makefile.am
+++ b/qse/lib/scm/Makefile.am
@@ -1,7 +1,10 @@
 
 AUTOMAKE_OPTIONS = nostdinc
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
 lib_LTLIBRARIES = libqsescm.la 
 
diff --git a/qse/lib/sed/Makefile.am b/qse/lib/sed/Makefile.am
index a13ebe04..63e87dd0 100644
--- a/qse/lib/sed/Makefile.am
+++ b/qse/lib/sed/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
 lib_LTLIBRARIES = libqsesed.la
 libqsesed_la_SOURCES = sed.c err.c sed.h std.c
diff --git a/qse/lib/utl/Makefile.am b/qse/lib/utl/Makefile.am
index e89d908e..a5f227f6 100644
--- a/qse/lib/utl/Makefile.am
+++ b/qse/lib/utl/Makefile.am
@@ -1,5 +1,9 @@
+AUTOMAKE_OPTIONS = nostdinc
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
 
 lib_LTLIBRARIES = libqseutl.la
 libqseutl_la_SOURCES = \
diff --git a/qse/lib/utl/Makefile.in b/qse/lib/utl/Makefile.in
index 8ddca3d2..1851ad11 100644
--- a/qse/lib/utl/Makefile.in
+++ b/qse/lib/utl/Makefile.in
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+#AUTOMAKE_OPTIONS = nostdinc
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -206,7 +208,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(includedir)
+AM_CPPFLAGS = \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/include \
+	-I$(includedir)
+
 lib_LTLIBRARIES = libqseutl.la
 libqseutl_la_SOURCES = \
 	http.c