diff --git a/PGOHelper/PGOHelper.cpp b/PGOHelper/PGOHelper.cpp
index 33feca2..13f903b 100644
--- a/PGOHelper/PGOHelper.cpp
+++ b/PGOHelper/PGOHelper.cpp
@@ -1,11 +1,15 @@
-#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
 #include <vector>
 #include <string>
 #include <algorithm>
 #include <unordered_set>
-#include <filesystem>
+#if __has_include(<filesystem>)
+	#include <filesystem>
+	namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+	#include <experimental/filesystem>
+	namespace fs = std::experimental::filesystem;
+#endif
 
-namespace fs = std::filesystem;
 using std::string;
 using std::vector;
 
diff --git a/Utilities/FolderUtilities.cpp b/Utilities/FolderUtilities.cpp
index 47a648c..60d9b29 100644
--- a/Utilities/FolderUtilities.cpp
+++ b/Utilities/FolderUtilities.cpp
@@ -1,10 +1,13 @@
 #include "stdafx.h"
 
-//TODO: Use non-experimental namespace (once it is officially supported by VC & GCC)
 #ifndef LIBRETRO
-#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
-#include <filesystem>
-namespace fs = std::filesystem;
+#if __has_include(<filesystem>)
+	#include <filesystem>
+	namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+	#include <experimental/filesystem>
+	namespace fs = std::experimental::filesystem;
+#endif
 #endif
 
 #include <unordered_set>