diff --git a/Makefile.am b/Makefile.am
index 3bb5e7b..3649ca8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,7 @@
 		$(SYSTEMD_LIBS) \
 		$(SDBUSPLUS_LIBS) \
 		$(SDEVENTPLUS_LIBS) \
+		$(STDPLUS_LIBS) \
 		$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
 		$(PHOSPHOR_LOGGING_LIBS) \
 		-lstdc++fs
@@ -95,6 +96,7 @@
 		$(SYSTEMD_CFLAGS) \
 		$(SDBUSPLUS_CFLAGS) \
 		$(SDEVENTPLUS_CFLAGS) \
+		$(STDPLUS_CFLAGS) \
 		$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
 		$(PHOSPHOR_LOGGING_CFLAGS) \
 		-flto