diff --git a/include/Utils.hpp b/include/Utils.hpp
index 39e3794..176f7ef 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -15,13 +15,13 @@
 */
 
 #pragma once
-#include <experimental/filesystem>
+#include "filesystem.hpp"
 #include <nlohmann/json.hpp>
 #include <sdbusplus/exception.hpp>
 
-bool findFiles(const std::experimental::filesystem::path &dirPath,
+bool findFiles(const std::filesystem::path &dirPath,
                const std::string &matchString,
-               std::vector<std::experimental::filesystem::path> &foundPaths);
+               std::vector<std::filesystem::path> &foundPaths);
 
 bool validateJson(const nlohmann::json &schemaFile,
                   const nlohmann::json &input);
diff --git a/include/filesystem.hpp b/include/filesystem.hpp
new file mode 100644
index 0000000..ead619e
--- /dev/null
+++ b/include/filesystem.hpp
@@ -0,0 +1,14 @@
+// this file splices filesystem in depending on the implementation
+
+#if __has_include(<filesystem>)
+#include <filesystem.hpp>
+#elif __has_include(<experimental/filesystem>)
+#include <experimental/filesystem>
+namespace std
+{
+// splice experimental::filesystem into std
+namespace filesystem = std::experimental::filesystem;
+} // namespace std
+#else
+#error filesystem not available
+#endif
\ No newline at end of file