diff --git a/src/platform_win.cc b/src/platform_win.cc
index 32bbe5ed..88370a58 100644
--- a/src/platform_win.cc
+++ b/src/platform_win.cc
@@ -135,15 +135,7 @@ std::vector<std::string> GetPlatformClangArguments() {
 
   // clang-format off
   return {
-    "-isystem","C:/Program Files/Microsoft Visual Studio 10.0/VC/include",
-    "-isystem","C:/Program Files/Microsoft Visual Studio 9.0/VC/include",
-    "-isystem","C:/Program Files/Microsoft Visual Studio 9.0/VC/PlatformSDK/Include",
-    "-isystem","C:/Program Files/Microsoft Visual Studio 8/VC/include",
-    "-isystem","C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK/Include",
-    "-isystem","C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.10.25017/include",
-    "-isystem","C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
-    "-isystem","C:/Program Files/LLVM/lib/clang/5.0.1/include",
-    "-fms-extensions", "-fms-compatibility", "-fms-compatibility-version=18", "-fdelayed-template-parsing"
+    "-fms-extensions", "-fms-compatibility", "-fdelayed-template-parsing"
   };
   // clang-format on
 }
diff --git a/src/test.cc b/src/test.cc
index 4fc1381b..cb6d7ba5 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -196,6 +196,7 @@ void RunIndexTests(const std::string& filter_path) {
 
       // Get output from index operation.
       IndexFile* db = FindDbForPathEnding(expected_path, dbs);
+      assert(db);
       if (!db->diagnostics_.empty()) {
         std::cout << "For " << path << std::endl;
         for (const lsDiagnostic& diagnostic : db->diagnostics_) {
diff --git a/src/utils.cc b/src/utils.cc
index bbe9390b..f165a572 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -508,11 +508,7 @@ std::string GetDefaultResourceDirectory() {
     result = resource_directory;
   }
 
-  result = NormalizePath(result);
-#if defined(_WIN32)
-  std::replace(result.begin(), result.end(), '/', '\\');
-#endif
-  return result;
+  return NormalizePath(result);
 }
 
 std::string UpdateToRnNewlines(std::string output) {