diff --git a/Makefile.am b/Makefile.am
index 1559188..3a33d12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,14 +9,11 @@
 libsyscmds_LTLIBRARIES = libsyscmds.la
 libsyscmds_la_SOURCES = main.cpp cable.cpp cpld.cpp eth.cpp psu.cpp
 
-libsyscmds_la_LDFLAGS = $(SYSTEMD_LIBS) \
-                          $(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-                          $(PHOSPHOR_LOGGING_LIBS) \
-                          -lstdc++fs \
-                          -version-info 0:0:0 -shared
+libsyscmds_la_LDFLAGS = $(SDBUSPLUS_LIBS) \
+                        $(PHOSPHOR_LOGGING_LIBS) \
+                        -lstdc++fs \
+                        -version-info 0:0:0 -shared
 
-libsyscmds_la_CXXFLAGS = $(SYSTEMD_CFLAGS) \
-                           $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-                           $(PHOSPHOR_LOGGING_CFLAGS)
+libsyscmds_la_CXXFLAGS = $(SDBUSPLUS_CFLAGS) \
+                         $(PHOSPHOR_LOGGING_CFLAGS)
 
-SUBDIRS = .
diff --git a/configure.ac b/configure.ac
index 606ec17..6e4aa16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,9 @@
 AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CXXFLAGS])
 
 # Checks for libraries.
-PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 221], [], [AC_MSG_ERROR(["systemd required and not found"])])
 PKG_CHECK_MODULES([SDBUSPLUS], [sdbusplus], ,[AC_MSG_ERROR([The openbmc/sdbusplus package is required])])
 PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging], ,[AC_MSG_ERROR([The openbmc/phosphor-logging package is required])])
-PKG_CHECK_MODULES([PHOSPHOR_DBUS_INTERFACES], [phosphor-dbus-interfaces], [], [AC_MSG_ERROR(["phosphor-dbus-interfaces required and not found."])])
-AC_CHECK_HEADER(experimental/any, ,[AC_MSG_ERROR([Could not find experimental/any...libstdc++fs developement package required])])
+AC_CHECK_HEADER(experimental/filesystem, ,[AC_MSG_ERROR([Could not find experimental/filesystem...libstdc++fs developement package required])])
 AC_CHECK_HEADER([host-ipmid], [AC_MSG_ERROR(["phosphor-host-ipmid required and not found."])])
 
 # Checks for library functions.