diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4fefe6e..96f8a7e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,11 +2,19 @@
 
 burn_my_bmc_SOURCES = main.cpp
 burn_my_bmc_LDADD = libupdater.la $(CODE_COVERAGE_LIBS)
-burn_my_bmc_CXXFLAGS = -I$(top_srcdir) $(CODE_COVERAGE_CXXFLAGS)
+burn_my_bmc_CXXFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/bmc/ \
+	$(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LTLIBRARIES = libupdater.la
 libupdater_la_LDFLAGS = -static $(CODE_COVERAGE_LIBS) $(IPMIBLOB_LIBS) $(PCILIB_LIBS)
-libupdater_la_CXXFLAGS = -I$(top_srcdir) $(CODE_COVERAGE_CXXFLAGS) $(IPMIBLOB_CFLAGS) $(PCILIB_CFLAGS)
+libupdater_la_CXXFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/bmc/ \
+	$(CODE_COVERAGE_CXXFLAGS) \
+	$(IPMIBLOB_CFLAGS) \
+	$(PCILIB_CFLAGS)
 libupdater_la_SOURCES = \
 	$(top_srcdir)/util.cpp \
 	updater.cpp \
diff --git a/tools/test/Makefile.am b/tools/test/Makefile.am
index c05654b..a0e2912 100644
--- a/tools/test/Makefile.am
+++ b/tools/test/Makefile.am
@@ -3,6 +3,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/ \
 	-I$(top_srcdir)/tools/ \
+	-I$(top_srcdir)/bmc \
 	$(GTEST_CFLAGS) \
 	$(GMOCK_CFLAGS) \
 	$(CODE_COVERAGE_CPPFLAGS)