diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d291cc..2e4cd89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,7 +51,7 @@
 
 add_executable(${PROJECT_NAME} ${SRC_FILES})
 target_link_libraries(${PROJECT_NAME} ${DBUSINTERFACE_LIBRARIES} )
-target_link_libraries(${PROJECT_NAME} "${SDBUSPLUSPLUS_LIBRARIES} -lstdc++fs -lphosphor_dbus")
+target_link_libraries(${PROJECT_NAME} "${SDBUSPLUSPLUS_LIBRARIES} -lphosphor_dbus")
 
 install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 target_compile_definitions (
diff --git a/inc/post_code.hpp b/inc/post_code.hpp
index 08b1cc5..7ae515f 100644
--- a/inc/post_code.hpp
+++ b/inc/post_code.hpp
@@ -24,7 +24,7 @@
 #include <cereal/types/tuple.hpp>
 #include <cereal/types/vector.hpp>
 #include <chrono>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <phosphor-logging/elog-errors.hpp>
@@ -78,7 +78,7 @@
 using primarycode_t = uint64_t;
 using secondarycode_t = std::vector<uint8_t>;
 using postcode_t = std::tuple<primarycode_t, secondarycode_t>;
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 namespace StateServer = sdbusplus::xyz::openbmc_project::State::server;
 
 using post_code =