diff --git a/Makefile.am b/Makefile.am
index 2ec41f4f7..59f89e0b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,7 @@ INCLUDES = \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/popt \
-	@INCPATH@ \
-	-I/usr/include \
-	-I$(top_srcdir)/misc
+	@INCPATH@
 
 mylibs=	$(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la \
diff --git a/build/Makefile.am b/build/Makefile.am
index e2566e2a5..9efe29c07 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -6,9 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/popt \
-	@INCPATH@ \
-	-I/usr/include \
-	-I$(top_srcdir)/misc
+	@INCPATH@
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = rpmbuild.h rpmspec.h
diff --git a/configure.in b/configure.in
index d9f9ebed3..ca4e4d504 100644
--- a/configure.in
+++ b/configure.in
@@ -890,6 +890,9 @@ testdir="`pwd`/tests"
 dnl AC_DEFINE_UNQUOTED(testdir, "$testdir")
 AC_SUBST(testdir)
 
+if test -n "$LIBOBJS"; then
+    INCPATH="$INCPATH -I\$(top_builddir)/misc"
+fi
 AC_SUBST(INCPATH)
 
 AC_SUBST(LIBS)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cee7a8a4a..fd6104019 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,9 +6,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/popt \
-	@INCPATH@ \
-	-I/usr/include \
-	-I$(top_srcdir)/misc
+	@INCPATH@
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
diff --git a/misc/Makefile.am b/misc/Makefile.am
index dba84c960..c939526a2 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 INCLUDES = \
 	-I$(top_srcdir) \
-	@INCPATH@ \
-	-I$(top_srcdir}/misc
+	@INCPATH@
 
 EXTRA_DIST = \
 	alloca.c	basename.c	err.c		error.c		\
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c06577248..cc8b98aef 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -165,7 +165,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 750e0c25d..a28eed017 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,9 +7,7 @@ INCLUDES = \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/popt \
-	@INCPATH@ \
-	-I/usr/include \
-	-I$(top_srcdir)/misc
+	@INCPATH@
 
 EXTRA_DIST =	fstrcmp.c message.c str-list.c rpmchecksig.c
 mylibs=	$(top_builddir)/build/.libs/librpmbuild.a \