diff --git a/ZAPDTR/ZAPD/OutputFormatter.cpp b/ZAPDTR/ZAPD/OutputFormatter.cpp
index aed57d48f..362ef98fc 100644
--- a/ZAPDTR/ZAPD/OutputFormatter.cpp
+++ b/ZAPDTR/ZAPD/OutputFormatter.cpp
@@ -96,7 +96,7 @@ int OutputFormatter::Write(const std::string& buf)
 	return Write(buf.data(), buf.size());
 }
 
-__thread OutputFormatter* OutputFormatter::Instance;
+thread_local OutputFormatter* OutputFormatter::Instance;
 
 int OutputFormatter::WriteStatic(const char* buf, int count)
 {
diff --git a/ZAPDTR/ZAPD/OutputFormatter.h b/ZAPDTR/ZAPD/OutputFormatter.h
index 2d05765fb..03abfdb96 100644
--- a/ZAPDTR/ZAPD/OutputFormatter.h
+++ b/ZAPDTR/ZAPD/OutputFormatter.h
@@ -25,7 +25,7 @@ private:
 
 	void Flush();
 
-	static __thread OutputFormatter* Instance;
+	static thread_local OutputFormatter* Instance;
 	static int WriteStatic(const char* buf, int count);
 
 public:
diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj
index 2bd4380b9..418fdd057 100644
--- a/soh/soh.vcxproj
+++ b/soh/soh.vcxproj
@@ -278,6 +278,7 @@
     <ClCompile Include="src\code\z_actor_dlftbls.c" />
     <ClCompile Include="src\code\z_bgcheck.c" />
     <ClCompile Include="src\code\z_camera.c" />
+    <ClCompile Include="src\code\z_cheap_proc.c" />
     <ClCompile Include="src\code\z_collision_btltbls.c" />
     <ClCompile Include="src\code\z_collision_check.c" />
     <ClCompile Include="src\code\z_common_data.c" />