diff --git a/src/common/file_system.cpp b/src/common/file_system.cpp
index 20e757cb1..c888cc8af 100644
--- a/src/common/file_system.cpp
+++ b/src/common/file_system.cpp
@@ -2788,6 +2788,10 @@ bool FileSystem::SetPathCompression(const char* path, bool enable)
   return false;
 }
 
+#endif
+
+#ifndef _WIN32
+
 static bool SetLock(int fd, bool lock, bool block, Error* error)
 {
   // We want to lock the whole file.
diff --git a/src/util/gpu_device.cpp b/src/util/gpu_device.cpp
index de710f6e3..cdea7c07a 100644
--- a/src/util/gpu_device.cpp
+++ b/src/util/gpu_device.cpp
@@ -1396,7 +1396,7 @@ bool dyn_libs::OpenSpirvCross(Error* error)
   if (s_spirv_cross_library.IsOpen())
     return true;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__ANDROID__)
   // SPVC's build on Windows doesn't spit out a versioned DLL.
   const std::string libname = DynamicLibrary::GetVersionedFilename("spirv-cross-c-shared");
 #else