diff --git a/Makefile.am b/Makefile.am
index 68cbd87..84e11a7 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,5 +32,4 @@
 phosphor_settings_manager_LDADD = \
 	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
 	$(SDBUSPLUS_LIBS) \
-	$(PHOSPHOR_LOGGING_LIBS) \
-	-lstdc++fs
+	$(PHOSPHOR_LOGGING_LIBS)
diff --git a/settings_manager.mako.hpp b/settings_manager.mako.hpp
index 13bdc93..a1ee9ce 100644
--- a/settings_manager.mako.hpp
+++ b/settings_manager.mako.hpp
@@ -37,7 +37,7 @@
 #include <cereal/types/vector.hpp>
 #include <fstream>
 #include <utility>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <regex>
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/elog-errors.hpp>
@@ -55,7 +55,7 @@
 namespace settings
 {
 
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 namespace persistent
 {