diff --git a/inc/srvcfg_manager.hpp b/inc/srvcfg_manager.hpp
index cd453b0..adfa89a 100644
--- a/inc/srvcfg_manager.hpp
+++ b/inc/srvcfg_manager.hpp
@@ -70,11 +70,11 @@
     std::shared_ptr<sdbusplus::asio::dbus_interface> iface;
     bool internalSet = false;
     std::string objPath;
-    std::string instanceName;
     std::string baseUnitName;
+    std::string instanceName;
     std::string instantiatedUnitName;
-    std::string socketObjectPath;
     std::string serviceObjectPath;
+    std::string socketObjectPath;
     std::string overrideConfDir;
 
     // Properties
diff --git a/inc/utils.hpp b/inc/utils.hpp
index 9a1ff02..e4a31bb 100644
--- a/inc/utils.hpp
+++ b/inc/utils.hpp
@@ -21,7 +21,7 @@
 
 #include <chrono>
 #include <ctime>
-#include <experimental/filesystem>
+#include <filesystem>
 #include <string>
 
 static constexpr const char* sysdStartUnit = "StartUnit";