diff --git a/build/Makefile.am b/build/Makefile.am
index d02bdb71c..83d2dee9e 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -10,10 +10,10 @@ INCLUDES = -I. \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
 	@WITH_BEECRYPT_INCLUDE@ \
-	-I$(top_srcdir)/file/src \
-	-I$(top_srcdir)/popt \
-	-I$(top_srcdir)/misc \
+	@WITH_MAGIC_INCLUDE@ \
+	@WITH_POPT_INCLUDE@ \
 	@WITH_LIBELF_INCLUDE@ \
+	-I$(top_srcdir)/misc \
 	@INCPATH@
 
 LIBS =
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 596c1b902..6c33af1e8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = -I. \
 	@WITH_POPT_INCLUDE@ \
 	@WITH_LIBELF_INCLUDE@ \
 	@WITH_LIBDWARF_INCLUDE@ \
-	-I$(top_srcdir)/file/src \
+	@WITH_MAGIC_INCLUDE@ \
 	-I$(top_srcdir)/misc \
 	@INCPATH@
 
@@ -28,7 +28,7 @@ staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
 noinst_PROGRAMS = dumpdb
 
 pkgbindir = @RPMCONFIGDIR@
-pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps @WITH_RPMFILE@
+pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
 MAGIC	= $(pkgbindir)/magic
 
 bin_PROGRAMS =	rpmgraph
@@ -54,7 +54,7 @@ rpmfile.c: $(top_srcdir)/file/src/file.c
 	ln -s $< $@
 
 rpmfile_SOURCES =	rpmfile.c
-rpmfile_CFLAGS =	-DMAGIC='"$(MAGIC)"'
+rpmfile_CFLAGS =	-DMAGIC='"$(MAGIC)"' $(INCLUDES)
 rpmfile_LDADD =		$(top_builddir)/rpmio/librpmio.la
 #rpmfile_LDFLAGS =	$(staticLDFLAGS)