diff --git a/configure.ac b/configure.ac
index ce8e755..7ee59d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,13 @@
 
 #CHIPS can be passed in a from a recipe, or it will default to P9 and openfsi
 AC_ARG_VAR(CHIPS, [The list of chips to build the procedures for])
+
+AC_ARG_ENABLE([p9], AS_HELP_STRING([--enable-p9], [Use internal host initialisation procedures for POWER9 processors]))
+AS_IF([test "$enable_p9" == "yes"], [CHIPS+=" p9"])
+
+AC_ARG_ENABLE([openfsi], AS_HELP_STRING([--enable-openfsi], [Support Openfsi]))
+AS_IF([test "$enable_openfsi" == "yes"], [CHIPS+=" openfsi"])
+
 AS_IF([test "x$CHIPS" == "x"], [CHIPS="p9 openfsi"])
 
 AC_CONFIG_FILES([Makefile.generated],
diff --git a/procedures/openfsi/scan.cpp b/procedures/openfsi/scan.cpp
index c7ae797..51f173f 100644
--- a/procedures/openfsi/scan.cpp
+++ b/procedures/openfsi/scan.cpp
@@ -18,6 +18,7 @@
 #include <experimental/filesystem>
 #include <fstream>
 #include <org/open_power/Proc/FSI/error.hpp>
+#include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/log.hpp>
 
 namespace openpower