diff --git a/API/hermes/CMakeLists.txt b/API/hermes/CMakeLists.txt
index 16ab217d2f7..3838be429e8 100644
--- a/API/hermes/CMakeLists.txt
+++ b/API/hermes/CMakeLists.txt
@@ -84,9 +84,9 @@ if(HERMES_THREAD_SAFETY_ANALYSIS)
     AsyncDebuggerAPI.cpp
     ${CDP_API_SOURCES}
   )
-  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # warning instead for struggle with std:mutex capabilities annotation
     set_property(SOURCE ${TSA_SOURCES} APPEND_STRING PROPERTY
-      COMPILE_FLAGS "-Wthread-safety -Werror=thread-safety-analysis -Werror=thread-safety-precise -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS")
+      COMPILE_FLAGS "-Wthread-safety -Wthread-safety-analysis -Werror=thread-safety-precise -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS")
   endif()
 endif()
 
diff --git a/API/hermes/cdp/DomainState.cpp b/API/hermes/cdp/DomainState.cpp
index cfdd816e8c6..32558487db0 100644
--- a/API/hermes/cdp/DomainState.cpp
+++ b/API/hermes/cdp/DomainState.cpp
@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <string>
+#include <functional>
+#include <iostream>
 #include "DomainState.h"
 
 #include <cassert>
diff --git a/external/llvh/lib/Support/raw_ostream.cpp b/external/llvh/lib/Support/raw_ostream.cpp
index 7873384e516..a61cf0e169c 100644
--- a/external/llvh/lib/Support/raw_ostream.cpp
+++ b/external/llvh/lib/Support/raw_ostream.cpp
@@ -736,10 +736,11 @@ uint64_t raw_fd_ostream::seek(uint64_t off) {
   flush();
 #ifdef _WIN32
   pos = ::_lseeki64(FD, off, SEEK_SET);
-#elif defined(HAVE_LSEEK64)
+# FIXME: https://reviews.llvm.org/D139752?id=484363
+#elif defined(NOT_HAVE_LSEEK64)
   pos = ::lseek64(FD, off, SEEK_SET);
 #else
-  pos = ::lseek(FD, off, SEEK_SET);
+  pos = lseek(FD, off, SEEK_SET);  
 #endif
   if (pos == (uint64_t)-1)
     error_detected(std::error_code(errno, std::generic_category()));