diff --git a/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp b/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
index 839a1189..b228c016 100644
--- a/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
+++ b/repertory/librepertory/src/drives/fuse/fuse_drive_base.cpp
@@ -23,7 +23,9 @@
 
 #include "drives/fuse/fuse_drive_base.hpp"
 
+#include "platform/platform.hpp"
 #include "providers/i_provider.hpp"
+#include "utils/common.hpp"
 
 namespace repertory {
 auto fuse_drive_base::access_impl(std::string api_path, int mask) -> api_error {
diff --git a/repertory/librepertory/src/providers/base_provider.cpp b/repertory/librepertory/src/providers/base_provider.cpp
index 1b011419..31b348ff 100644
--- a/repertory/librepertory/src/providers/base_provider.cpp
+++ b/repertory/librepertory/src/providers/base_provider.cpp
@@ -25,6 +25,7 @@
 #include "events/event_system.hpp"
 #include "events/events.hpp"
 #include "file_manager/i_file_manager.hpp"
+#include "platform/platform.hpp"
 #include "utils/file_utils.hpp"
 #include "utils/path.hpp"
 #include "utils/polling.hpp"
diff --git a/repertory/repertory_test/src/remote_winfsp_test.cpp b/repertory/repertory_test/src/remote_winfsp_test.cpp
index 8c0b7b74..ccdcc908 100644
--- a/repertory/repertory_test/src/remote_winfsp_test.cpp
+++ b/repertory/repertory_test/src/remote_winfsp_test.cpp
@@ -21,7 +21,6 @@
 */
 #include "test_common.hpp"
 
-#include "drives/winfsp/i_winfsp_drive.hpp"
 #include "drives/winfsp/remotewinfsp/remote_client.hpp"
 #include "events/consumers/console_consumer.hpp"
 #if defined(_WIN32)
@@ -31,9 +30,9 @@
 #include "drives/fuse/remotefuse/remote_server.hpp"
 #include "mocks/mock_fuse_drive.hpp"
 #endif
+#include "platform/platform.hpp"
 #include "types/repertory.hpp"
-#include "utils/time.hpp"
-#include "utils/utils.hpp"
+#include "utils/common.hpp"
 
 using namespace repertory;
 using namespace repertory::remote_winfsp;
diff --git a/repertory/repertory_test/src/utils_test.cpp b/repertory/repertory_test/src/utils_test.cpp
index 7927cf4f..7cdda42c 100644
--- a/repertory/repertory_test/src/utils_test.cpp
+++ b/repertory/repertory_test/src/utils_test.cpp
@@ -21,8 +21,9 @@
 */
 #include "test_common.hpp"
 
+#include "platform/platform.hpp"
+#include "utils/common.hpp"
 #include "utils/file_utils.hpp"
-#include "utils/path.hpp"
 #include "utils/string.hpp"
 #include "utils/utils.hpp"
 
diff --git a/repertory/repertory_test/src/version_test.cpp b/repertory/repertory_test/src/version_test.cpp
index 0f5dca64..04a24e3a 100644
--- a/repertory/repertory_test/src/version_test.cpp
+++ b/repertory/repertory_test/src/version_test.cpp
@@ -21,7 +21,7 @@
 */
 #include "test_common.hpp"
 
-#include "utils/utils.hpp"
+#include "utils/common.hpp"
 
 namespace repertory {
 TEST(version, equal) {
diff --git a/support/3rd_party/src/utils/file.cpp b/support/3rd_party/src/utils/file.cpp
index 5d6ee4c5..1a20d51e 100644
--- a/support/3rd_party/src/utils/file.cpp
+++ b/support/3rd_party/src/utils/file.cpp
@@ -254,6 +254,10 @@ auto read_json_file(std::string_view path, nlohmann::json &data) -> bool {
 
   try {
     auto abs_path = utils::path::absolute(path);
+    if (not is_file(abs_path)) {
+      return true;
+    }
+
     std::ifstream file_stream{
         abs_path.c_str(),
         std::ios_base::binary | std::ios::in,