diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6a9801..c6c34ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@
 link_directories(${DBUSINTERFACE_LIBRARY_DIRS})
 
 add_executable(${PROJECT_NAME} ${SRC_FILES} )
-target_link_libraries(${PROJECT_NAME} "${SDBUSPLUSPLUS_LIBRARIES} -lphosphor_dbus  -lstdc++fs")
+target_link_libraries(${PROJECT_NAME} "${SDBUSPLUSPLUS_LIBRARIES} -lphosphor_dbus")
 
 add_executable(button-handler ${HANDLER_SRC_FILES})
 target_link_libraries(button-handler "${SDBUSPLUSPLUS_LIBRARIES} -lphosphor_dbus")
diff --git a/src/gpio.cpp b/src/gpio.cpp
index 1caae54..bb7f79b 100644
--- a/src/gpio.cpp
+++ b/src/gpio.cpp
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <experimental/filesystem>
+#include <filesystem>
 #include <fstream>
 #include <gpioplus/utility/aspeed.hpp>
 #include <nlohmann/json.hpp>
@@ -30,7 +30,7 @@
 const std::string gpioDev = "/sys/class/gpio";
 
 using namespace phosphor::logging;
-namespace fs = std::experimental::filesystem;
+namespace fs = std::filesystem;
 
 void closeGpio(int fd)
 {