diff --git a/Makefile.am b/Makefile.am
index c78a537..0626773 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,62 +35,8 @@
 endif
 
 ACLOCAL_AMFLAGS = -I m4
-AM_DEFAULT_SOURCE_EXT = .cpp
 
-noinst_LTLIBRARIES = libfirmwareblob_common.la
-libfirmwareblob_common_la_SOURCES = \
-	util.cpp \
-	firmware_handler.cpp \
-	file_handler.cpp \
-	internal/sys.cpp \
-	prepare_systemd.cpp \
-	verify_systemd.cpp \
-	update_systemd.cpp
-
-if ENABLE_LPC_BRIDGE
-libfirmwareblob_common_la_SOURCES += lpc_handler.cpp
-if ENABLE_ASPEED_LPC
-libfirmwareblob_common_la_SOURCES += lpc_aspeed.cpp
-endif
-if ENABLE_NUVOTON_LPC
-libfirmwareblob_common_la_SOURCES += lpc_nuvoton.cpp
-endif
-endif
-
-if ENABLE_PCI_BRIDGE
-if ENABLE_ASPEED_P2A
-libfirmwareblob_common_la_SOURCES += pci_handler.cpp
-endif
-endif
-
-libfirmwareblob_common_la_CXXFLAGS = \
-	$(SDBUSPLUS_CFLAGS) \
-        $(PHOSPHOR_LOGGING_CFLAGS) \
-        $(CODE_COVERAGE_CXXFLAGS) \
-        -flto
-libfirmwareblob_common_la_LDFLAGS = \
-        $(SDBUSPLUS_LIBS) \
-        $(PHOSPHOR_LOGGING_LIBS) \
-        $(CODE_COVERAGE_LIBS) \
-        -lstdc++fs
-
-libfirmwareblobdir = ${libdir}/ipmid-providers
-libfirmwareblob_LTLIBRARIES = libfirmwareblob.la
-libfirmwareblob_la_SOURCES = main.cpp
-libfirmwareblob_la_LIBADD = libfirmwareblob_common.la
-libfirmwareblob_la_LDFLAGS = \
-	$(SDBUSPLUS_LIBS) \
-	$(PHOSPHOR_LOGGING_LIBS) \
-	$(CODE_COVERAGE_LIBS) \
-	-lstdc++fs \
-	-version-info 0:0:0 -shared
-libfirmwareblob_la_CXXFLAGS = \
-	$(SDBUSPLUS_CFLAGS) \
-	$(PHOSPHOR_LOGGING_CFLAGS) \
-	$(CODE_COVERAGE_CXXFLAGS) \
-	-flto
-
-SUBDIRS = . test
+SUBDIRS = bmc
 
 if BUILD_HOST_TOOL
 SUBDIRS += tools
diff --git a/bmc/Makefile.am b/bmc/Makefile.am
new file mode 100644
index 0000000..c46a8cd
--- /dev/null
+++ b/bmc/Makefile.am
@@ -0,0 +1,58 @@
+AM_DEFAULT_SOURCE_EXT = .cpp
+
+noinst_LTLIBRARIES = libfirmwareblob_common.la
+libfirmwareblob_common_la_SOURCES = \
+	$(top_srcdir)/util.cpp \
+	firmware_handler.cpp \
+	file_handler.cpp \
+	$(top_srcdir)/internal/sys.cpp \
+	prepare_systemd.cpp \
+	verify_systemd.cpp \
+	update_systemd.cpp
+
+if ENABLE_LPC_BRIDGE
+libfirmwareblob_common_la_SOURCES += lpc_handler.cpp
+if ENABLE_ASPEED_LPC
+libfirmwareblob_common_la_SOURCES += lpc_aspeed.cpp
+endif
+if ENABLE_NUVOTON_LPC
+libfirmwareblob_common_la_SOURCES += lpc_nuvoton.cpp
+endif
+endif
+
+if ENABLE_PCI_BRIDGE
+if ENABLE_ASPEED_P2A
+libfirmwareblob_common_la_SOURCES += pci_handler.cpp
+endif
+endif
+
+libfirmwareblob_common_la_CXXFLAGS = \
+	-I$(top_srcdir) \
+	$(SDBUSPLUS_CFLAGS) \
+        $(PHOSPHOR_LOGGING_CFLAGS) \
+        $(CODE_COVERAGE_CXXFLAGS) \
+        -flto
+libfirmwareblob_common_la_LDFLAGS = \
+        $(SDBUSPLUS_LIBS) \
+        $(PHOSPHOR_LOGGING_LIBS) \
+        $(CODE_COVERAGE_LIBS) \
+        -lstdc++fs
+
+libfirmwareblobdir = ${libdir}/ipmid-providers
+libfirmwareblob_LTLIBRARIES = libfirmwareblob.la
+libfirmwareblob_la_SOURCES = main.cpp
+libfirmwareblob_la_LIBADD = libfirmwareblob_common.la
+libfirmwareblob_la_LDFLAGS = \
+	$(SDBUSPLUS_LIBS) \
+	$(PHOSPHOR_LOGGING_LIBS) \
+	$(CODE_COVERAGE_LIBS) \
+	-lstdc++fs \
+	-version-info 0:0:0 -shared
+libfirmwareblob_la_CXXFLAGS = \
+	-I$(top_srcdir) \
+	$(SDBUSPLUS_CFLAGS) \
+	$(PHOSPHOR_LOGGING_CFLAGS) \
+	$(CODE_COVERAGE_CXXFLAGS) \
+	-flto
+
+SUBDIRS = . test
diff --git a/data_handler.hpp b/bmc/data_handler.hpp
similarity index 100%
rename from data_handler.hpp
rename to bmc/data_handler.hpp
diff --git a/file_handler.cpp b/bmc/file_handler.cpp
similarity index 100%
rename from file_handler.cpp
rename to bmc/file_handler.cpp
diff --git a/file_handler.hpp b/bmc/file_handler.hpp
similarity index 100%
rename from file_handler.hpp
rename to bmc/file_handler.hpp
diff --git a/firmware_handler.cpp b/bmc/firmware_handler.cpp
similarity index 100%
rename from firmware_handler.cpp
rename to bmc/firmware_handler.cpp
diff --git a/firmware_handler.hpp b/bmc/firmware_handler.hpp
similarity index 100%
rename from firmware_handler.hpp
rename to bmc/firmware_handler.hpp
diff --git a/image_handler.hpp b/bmc/image_handler.hpp
similarity index 100%
rename from image_handler.hpp
rename to bmc/image_handler.hpp
diff --git a/lpc_aspeed.cpp b/bmc/lpc_aspeed.cpp
similarity index 100%
rename from lpc_aspeed.cpp
rename to bmc/lpc_aspeed.cpp
diff --git a/lpc_aspeed.hpp b/bmc/lpc_aspeed.hpp
similarity index 100%
rename from lpc_aspeed.hpp
rename to bmc/lpc_aspeed.hpp
diff --git a/lpc_handler.cpp b/bmc/lpc_handler.cpp
similarity index 100%
rename from lpc_handler.cpp
rename to bmc/lpc_handler.cpp
diff --git a/lpc_handler.hpp b/bmc/lpc_handler.hpp
similarity index 100%
rename from lpc_handler.hpp
rename to bmc/lpc_handler.hpp
diff --git a/lpc_nuvoton.cpp b/bmc/lpc_nuvoton.cpp
similarity index 100%
rename from lpc_nuvoton.cpp
rename to bmc/lpc_nuvoton.cpp
diff --git a/lpc_nuvoton.hpp b/bmc/lpc_nuvoton.hpp
similarity index 100%
rename from lpc_nuvoton.hpp
rename to bmc/lpc_nuvoton.hpp
diff --git a/main.cpp b/bmc/main.cpp
similarity index 100%
rename from main.cpp
rename to bmc/main.cpp
diff --git a/mapper_errors.hpp b/bmc/mapper_errors.hpp
similarity index 100%
rename from mapper_errors.hpp
rename to bmc/mapper_errors.hpp
diff --git a/pci_handler.cpp b/bmc/pci_handler.cpp
similarity index 100%
rename from pci_handler.cpp
rename to bmc/pci_handler.cpp
diff --git a/pci_handler.hpp b/bmc/pci_handler.hpp
similarity index 100%
rename from pci_handler.hpp
rename to bmc/pci_handler.hpp
diff --git a/prepare_systemd.cpp b/bmc/prepare_systemd.cpp
similarity index 100%
rename from prepare_systemd.cpp
rename to bmc/prepare_systemd.cpp
diff --git a/prepare_systemd.hpp b/bmc/prepare_systemd.hpp
similarity index 100%
rename from prepare_systemd.hpp
rename to bmc/prepare_systemd.hpp
diff --git a/test/Makefile.am b/bmc/test/Makefile.am
similarity index 71%
rename from test/Makefile.am
rename to bmc/test/Makefile.am
index 523d8d5..1dcc3ae 100644
--- a/test/Makefile.am
+++ b/bmc/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)
@@ -44,58 +45,58 @@
 TESTS = $(check_PROGRAMS)
 
 firmware_createhandler_unittest_SOURCES = firmware_createhandler_unittest.cpp
-firmware_createhandler_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_createhandler_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_handler_unittest_SOURCES = firmware_handler_unittest.cpp
-firmware_handler_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_handler_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_stat_unittest_SOURCES = firmware_stat_unittest.cpp
-firmware_stat_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_stat_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_canhandle_unittest_SOURCES = firmware_canhandle_unittest.cpp
-firmware_canhandle_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_canhandle_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_write_unittest_SOURCES = firmware_write_unittest.cpp
-firmware_write_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_write_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_writemeta_unittest_SOURCES = firmware_writemeta_unittest.cpp
-firmware_writemeta_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_writemeta_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_close_unittest_SOURCES = firmware_close_unittest.cpp
-firmware_close_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_close_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_sessionstat_unittest_SOURCES = firmware_sessionstat_unittest.cpp
-firmware_sessionstat_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_sessionstat_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_commit_unittest_SOURCES = firmware_commit_unittest.cpp
-firmware_commit_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_commit_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 file_handler_unittest_SOURCES = file_handler_unittest.cpp
-file_handler_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la -lstdc++fs
+file_handler_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la -lstdc++fs
 
 firmware_state_notyetstarted_unittest_SOURCES = firmware_state_notyetstarted_unittest.cpp
-firmware_state_notyetstarted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_notyetstarted_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_uploadinprogress_unittest_SOURCES = firmware_state_uploadinprogress_unittest.cpp
-firmware_state_uploadinprogress_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_uploadinprogress_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_verificationpending_unittest_SOURCES = firmware_state_verificationpending_unittest.cpp
-firmware_state_verificationpending_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_verificationpending_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_verificationstarted_unittest_SOURCES = firmware_state_verificationstarted_unittest.cpp
-firmware_state_verificationstarted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_verificationstarted_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_verificationcompleted_unittest_SOURCES = firmware_state_verificationcompleted_unittest.cpp
-firmware_state_verificationcompleted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_verificationcompleted_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_updatepending_unittest_SOURCES = firmware_state_updatepending_unittest.cpp
-firmware_state_updatepending_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_updatepending_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_updatestarted_unittest_SOURCES = firmware_state_updatestarted_unittest.cpp
-firmware_state_updatestarted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_updatestarted_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_updatecompleted_unittest_SOURCES = firmware_state_updatecompleted_unittest.cpp
-firmware_state_updatecompleted_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_updatecompleted_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
 
 firmware_state_notyetstarted_tarball_unittest_SOURCES = firmware_state_notyetstarted_tarball_unittest.cpp
-firmware_state_notyetstarted_tarball_unittest_LDADD = $(top_builddir)/libfirmwareblob_common.la
+firmware_state_notyetstarted_tarball_unittest_LDADD = $(top_builddir)/bmc/libfirmwareblob_common.la
diff --git a/test/crc_mock.hpp b/bmc/test/crc_mock.hpp
similarity index 100%
rename from test/crc_mock.hpp
rename to bmc/test/crc_mock.hpp
diff --git a/test/data_mock.hpp b/bmc/test/data_mock.hpp
similarity index 100%
rename from test/data_mock.hpp
rename to bmc/test/data_mock.hpp
diff --git a/test/file_handler_unittest.cpp b/bmc/test/file_handler_unittest.cpp
similarity index 100%
rename from test/file_handler_unittest.cpp
rename to bmc/test/file_handler_unittest.cpp
diff --git a/test/firmware_canhandle_unittest.cpp b/bmc/test/firmware_canhandle_unittest.cpp
similarity index 100%
rename from test/firmware_canhandle_unittest.cpp
rename to bmc/test/firmware_canhandle_unittest.cpp
diff --git a/test/firmware_close_unittest.cpp b/bmc/test/firmware_close_unittest.cpp
similarity index 100%
rename from test/firmware_close_unittest.cpp
rename to bmc/test/firmware_close_unittest.cpp
diff --git a/test/firmware_commit_unittest.cpp b/bmc/test/firmware_commit_unittest.cpp
similarity index 100%
rename from test/firmware_commit_unittest.cpp
rename to bmc/test/firmware_commit_unittest.cpp
diff --git a/test/firmware_createhandler_unittest.cpp b/bmc/test/firmware_createhandler_unittest.cpp
similarity index 100%
rename from test/firmware_createhandler_unittest.cpp
rename to bmc/test/firmware_createhandler_unittest.cpp
diff --git a/test/firmware_handler_unittest.cpp b/bmc/test/firmware_handler_unittest.cpp
similarity index 100%
rename from test/firmware_handler_unittest.cpp
rename to bmc/test/firmware_handler_unittest.cpp
diff --git a/test/firmware_sessionstat_unittest.cpp b/bmc/test/firmware_sessionstat_unittest.cpp
similarity index 100%
rename from test/firmware_sessionstat_unittest.cpp
rename to bmc/test/firmware_sessionstat_unittest.cpp
diff --git a/test/firmware_stat_unittest.cpp b/bmc/test/firmware_stat_unittest.cpp
similarity index 100%
rename from test/firmware_stat_unittest.cpp
rename to bmc/test/firmware_stat_unittest.cpp
diff --git a/test/firmware_state_notyetstarted_tarball_unittest.cpp b/bmc/test/firmware_state_notyetstarted_tarball_unittest.cpp
similarity index 100%
rename from test/firmware_state_notyetstarted_tarball_unittest.cpp
rename to bmc/test/firmware_state_notyetstarted_tarball_unittest.cpp
diff --git a/test/firmware_state_notyetstarted_unittest.cpp b/bmc/test/firmware_state_notyetstarted_unittest.cpp
similarity index 100%
rename from test/firmware_state_notyetstarted_unittest.cpp
rename to bmc/test/firmware_state_notyetstarted_unittest.cpp
diff --git a/test/firmware_state_updatecompleted_unittest.cpp b/bmc/test/firmware_state_updatecompleted_unittest.cpp
similarity index 100%
rename from test/firmware_state_updatecompleted_unittest.cpp
rename to bmc/test/firmware_state_updatecompleted_unittest.cpp
diff --git a/test/firmware_state_updatepending_unittest.cpp b/bmc/test/firmware_state_updatepending_unittest.cpp
similarity index 100%
rename from test/firmware_state_updatepending_unittest.cpp
rename to bmc/test/firmware_state_updatepending_unittest.cpp
diff --git a/test/firmware_state_updatestarted_unittest.cpp b/bmc/test/firmware_state_updatestarted_unittest.cpp
similarity index 100%
rename from test/firmware_state_updatestarted_unittest.cpp
rename to bmc/test/firmware_state_updatestarted_unittest.cpp
diff --git a/test/firmware_state_uploadinprogress_unittest.cpp b/bmc/test/firmware_state_uploadinprogress_unittest.cpp
similarity index 100%
rename from test/firmware_state_uploadinprogress_unittest.cpp
rename to bmc/test/firmware_state_uploadinprogress_unittest.cpp
diff --git a/test/firmware_state_verificationcompleted_unittest.cpp b/bmc/test/firmware_state_verificationcompleted_unittest.cpp
similarity index 100%
rename from test/firmware_state_verificationcompleted_unittest.cpp
rename to bmc/test/firmware_state_verificationcompleted_unittest.cpp
diff --git a/test/firmware_state_verificationpending_unittest.cpp b/bmc/test/firmware_state_verificationpending_unittest.cpp
similarity index 100%
rename from test/firmware_state_verificationpending_unittest.cpp
rename to bmc/test/firmware_state_verificationpending_unittest.cpp
diff --git a/test/firmware_state_verificationstarted_unittest.cpp b/bmc/test/firmware_state_verificationstarted_unittest.cpp
similarity index 100%
rename from test/firmware_state_verificationstarted_unittest.cpp
rename to bmc/test/firmware_state_verificationstarted_unittest.cpp
diff --git a/test/firmware_unittest.hpp b/bmc/test/firmware_unittest.hpp
similarity index 100%
rename from test/firmware_unittest.hpp
rename to bmc/test/firmware_unittest.hpp
diff --git a/test/firmware_write_unittest.cpp b/bmc/test/firmware_write_unittest.cpp
similarity index 100%
rename from test/firmware_write_unittest.cpp
rename to bmc/test/firmware_write_unittest.cpp
diff --git a/test/firmware_writemeta_unittest.cpp b/bmc/test/firmware_writemeta_unittest.cpp
similarity index 100%
rename from test/firmware_writemeta_unittest.cpp
rename to bmc/test/firmware_writemeta_unittest.cpp
diff --git a/test/image_mock.hpp b/bmc/test/image_mock.hpp
similarity index 100%
rename from test/image_mock.hpp
rename to bmc/test/image_mock.hpp
diff --git a/test/triggerable_mock.hpp b/bmc/test/triggerable_mock.hpp
similarity index 100%
rename from test/triggerable_mock.hpp
rename to bmc/test/triggerable_mock.hpp
diff --git a/test/window_mapper_mock.hpp b/bmc/test/window_mapper_mock.hpp
similarity index 100%
rename from test/window_mapper_mock.hpp
rename to bmc/test/window_mapper_mock.hpp
diff --git a/update_systemd.cpp b/bmc/update_systemd.cpp
similarity index 100%
rename from update_systemd.cpp
rename to bmc/update_systemd.cpp
diff --git a/update_systemd.hpp b/bmc/update_systemd.hpp
similarity index 100%
rename from update_systemd.hpp
rename to bmc/update_systemd.hpp
diff --git a/verify_systemd.cpp b/bmc/verify_systemd.cpp
similarity index 100%
rename from verify_systemd.cpp
rename to bmc/verify_systemd.cpp
diff --git a/verify_systemd.hpp b/bmc/verify_systemd.hpp
similarity index 100%
rename from verify_systemd.hpp
rename to bmc/verify_systemd.hpp
diff --git a/window_hw_interface.hpp b/bmc/window_hw_interface.hpp
similarity index 100%
rename from window_hw_interface.hpp
rename to bmc/window_hw_interface.hpp
diff --git a/configure.ac b/configure.ac
index e931713..929413a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,7 +408,8 @@
 )
 
 # Create configured output
-AC_CONFIG_FILES([Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([bmc/Makefile bmc/test/Makefile])
 AC_CONFIG_FILES([tools/Makefile tools/test/Makefile])
 AC_CONFIG_FILES([cleanup/Makefile cleanup/test/Makefile])
 AC_OUTPUT
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)